Changeset 17928 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls

Timestamp:

04/06/21 13:13:32 (4 years ago)

Author:

dpiringe

Message:

#3026

• merged trunk into branch

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (7 diffs)

branches/3026_IntegrationIntoSymSpace/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;
@@ -529 +530 @@
 
     public async Task AddSolutionAsync(IRegressionSolution solution) {
+      if (solutions.Contains(solution))
+        return;
       if (!SolutionsCompatible(solutions.Concat(new[] { solution })))
         throw new ArgumentException("The solution is not compatible with the problem data.");
-      if (solutions.Contains(solution))
-        return;
 
       solutions.Add(solution);
@@ -567 +568 @@
       var refSolution = solutions.First();
       var refSolVars = refSolution.ProblemData.Dataset.VariableNames;
+      var refFactorVars = refSolVars.Where(refSolution.ProblemData.Dataset.VariableHasType<string>);
+      var distinctVals = refFactorVars.ToDictionary(fv => fv, fv => refSolution.ProblemData.Dataset.GetStringValues(fv).Distinct().ToArray());
       foreach (var solution in solutions.Skip(1)) {
         var variables1 = solution.ProblemData.Dataset.VariableNames;
@@ -573 +576 @@
 
         foreach (var factorVar in variables1.Where(solution.ProblemData.Dataset.VariableHasType<string>)) {
-          var distinctVals = refSolution.ProblemData.Dataset.GetStringValues(factorVar).Distinct();
-          if (solution.ProblemData.Dataset.GetStringValues(factorVar).Any(val => !distinctVals.Contains(val))) return false;
+          var refValues = distinctVals[factorVar];
+          if (solution.ProblemData.Dataset.GetStringValues(factorVar).Distinct().Any(val => !refValues.Contains(val))) return false;
         }
       }
@@ -645 +648 @@
 
     private void sharedFixedVariables_Reset(object sender, EventArgs e) {
+      RecalculateInternalDataset();
       var newValue = sharedFixedVariables.GetDoubleValue(FreeVariable, 0);
       VerticalLineAnnotation.X = newValue;
-      UpdateCursor(); // triggers update of InternalDataset
+      UpdateCursor();
     }