Context Navigation

Changeset 14498 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

12/17/16 15:42:19 (8 years ago)

Author:

gkronber

Message:

#2650: merged r14457:14494 from trunk to branch (resolving conflicts)

Location:

branches/symbreg-factors-2650

Files:

branches/symbreg-factors-2650
- Property svn:mergeinfo changed
  /trunk/sources merged: 14457-14458,14463-14465,14468-14469,14475-14476,14478-14479,14481-14483,14486,14493-14494
branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 14464,14468-14469,14483,14486

-                      r14185
+                      r14498
       IList<string> doubleVariableNames = dataset.DoubleVariables.ToList();
+      OnlineCalculatorError error = OnlineCalculatorError.None;
       int length = doubleVariableNames.Count;
       double[,] elements = new double[length, length];
 …
           var var2 = dataset.GetDoubleValues(doubleVariableNames[j], indices);
+          OnlineCalculatorError error = OnlineCalculatorError.None;
           if (bwInfo.IgnoreMissingValues) {
             var filtered = FilterNaNValues(var1, var2);
 …
+          }
           elements[j, i] = elements[i, j];
         });
         worker.ReportProgress((int)(((double)counter) / length * 100));
+      }
       e.Result = elements;
       worker.ReportProgress(100);

-                      r14449
+                      r14498
     <Compile Include="Regression\RegressionFeatureCorrelationView.Designer.cs">
       <DependentUpon>RegressionFeatureCorrelationView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionLineChartViewBase.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionLineChartViewBase.Designer.cs">
+      <DependentUpon>RegressionSolutionLineChartViewBase.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionResidualsLineChartView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionResidualsLineChartView.Designer.cs">
+      <DependentUpon>RegressionSolutionResidualsLineChartView.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\RegressionSolutionVariableImpactsView.cs">

-                      r14330
+                      r14498
       limitView.Content.Upper = axisMax;
+      // create dataset
+      var allowedInputVariables = Content.ProblemData.AllowedInputVariables;
+      // create dataset of problemData input variables and model input variables
+      // necessary workaround to have the variables in the occuring order
+      var inputvariables =
+        new HashSet<string>(Content.ProblemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
+      var allowedInputVariables =
+        Content.ProblemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).ToList();
       var doubleVariables = allowedInputVariables.Where(problemData.Dataset.VariableHasType<double>);
       var doubleVariableValues = (IEnumerable<IList>)doubleVariables.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() });

-                      r14449
+                      r14498
+    }
+    protected override void GetTestSeries(out int[] x, out double[] y) {
+    protected override void GetTrainingSeries(out int[] idx, out double[] y) {
+      idx = Content.ProblemData.TrainingIndices.ToArray();
+      y = Content.EstimatedTrainingValues.ToArray();
+    }
+    protected override void GetTestSeries(out int[] idx, out double[] y) {
       // treat the whole test partition as prognosis horizon
       x = Content.ProblemData.TestIndices.ToArray();
+      idx = Content.ProblemData.TestIndices.ToArray();
       y = Content.PrognosedTestValues.ToArray();
+    }
     protected override void GetAllValuesSeries(out int[] x, out double[] y) {
+    protected override void GetAllValuesSeries(out int[] idx, out double[] y) {
       // not supported
       x = new int[0];
+      idx = new int[0];
       y = new double[0];
+    }

Note: See TracChangeset for help on using the changeset viewer.