Changeset 17586 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

06/04/20 15:55:13 (4 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.Designer.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.Designer.cs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

@@ -36 +36 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   public partial class PartialDependencePlot : UserControl, IPartialDependencePlot {
-    private ModifiableDataset sharedFixedVariables; // used for syncronising variable values between charts
+    private ModifiableDataset sharedFixedVariables; // used for synchronizing variable values between charts
     private ModifiableDataset internalDataset; // holds the x values for each point drawn
 
@@ -351 +351 @@
 
     private void RecalculateTrainingLimits(bool initializeAxisRanges) {
-      trainingMin = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Min()).Max();
-      trainingMax = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Max()).Min();
+      //Set min and max to the interval ranges
+      trainingMin = solutions.Select(s => s.ProblemData.VariableRanges.GetInterval(freeVariable).LowerBound).Max();
+      trainingMax = solutions.Select(s => s.ProblemData.VariableRanges.GetInterval(freeVariable).UpperBound).Min();
 
       if (initializeAxisRanges) {
@@ -438 +439 @@
       chart.Palette = ChartColorPalette.None;
 
-      // Add confidence interval series before its coresponding series for correct z index
+      // Add confidence interval series before its corresponding series for correct z index
       foreach (var solution in solutions) {
         Series ciSeries;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -222 +222 @@
     <Compile Include="Interfaces\IDataPreprocessorStarter.cs" />
     <Compile Include="Interfaces\IPartialDependencePlot.cs" />
+    <Compile Include="IntervalCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="IntervalCollectionView.Designer.cs">
+      <DependentUpon>IntervalCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="MenuItems\ChangeDataOfOptimizersMenuItem.cs" />
     <Compile Include="MenuItems\ShrinkDataAnalysisRunsMenuItem.cs" />