Changeset 8139 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

Timestamp:

06/27/12 17:34:17 (12 years ago)

Author:

mkommend

Message:

#1722: Renamed indizes to indices in the whole trunk solution.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

Files:

• InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (3 diffs)
• SymbolicRegressionSolutionResponseFunctionView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

@@ -66 +66 @@
       var interpreter = Content.Model.Interpreter;
       var dataset = Content.ProblemData.Dataset;
-      var rows = Content.ProblemData.TrainingIndizes;
+      var rows = Content.ProblemData.TrainingIndices;
       string targetVariable = Content.ProblemData.TargetVariable;
       Dictionary<ISymbolicExpressionTreeNode, double> impactValues = new Dictionary<ISymbolicExpressionTreeNode, double>();
@@ -106 +106 @@
       start.AddSubtree((ISymbolicExpressionTreeNode)node.Clone());
       var interpreter = Content.Model.Interpreter;
-      var rows = Content.ProblemData.TrainingIndizes;
+      var rows = Content.ProblemData.TrainingIndices;
       return interpreter.GetSymbolicExpressionTreeValues(tempTree, Content.ProblemData.Dataset, rows).Median();
     }
@@ -122 +122 @@
 
     protected override void btnOptimizeConstants_Click(object sender, EventArgs e) {
-      SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(Content.Model.Interpreter, Content.Model.SymbolicExpressionTree, Content.ProblemData, Content.ProblemData.TrainingIndizes, 0.001, 0, 0.0001);
+      SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(Content.Model.Interpreter, Content.Model.SymbolicExpressionTree, Content.ProblemData, Content.ProblemData.TrainingIndices, 0.001, 0, 0.0001);
       UpdateModel(Content.Model.SymbolicExpressionTree);
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.cs

@@ -142 +142 @@
       };
 
-      var mainTrainingIndizes = (from row in Content.ProblemData.TrainingIndizes
+      var mainTrainingIndices = (from row in Content.ProblemData.TrainingIndices
                                  where NearMedianValue(row)
                                  select row)
         .ToArray();
-      var mainTestIndizes = (from row in Content.ProblemData.TestIndizes
+      var mainTestIndices = (from row in Content.ProblemData.TestIndices
                              where NearMedianValue(row)
                              select row)
         .ToArray();
 
-      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTrainingIndizes).ToArray();
+      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTrainingIndices).ToArray();
       var trainingValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     mainTrainingIndizes).ToArray();
+                                                                     mainTrainingIndices).ToArray();
       Array.Sort(freeVariableValues, trainingValues);
       responseChart.Series["Training Data"].Points.DataBindXY(freeVariableValues, trainingValues);
 
-      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTestIndizes).ToArray();
+      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTestIndices).ToArray();
       var testValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     mainTestIndizes).ToArray();
+                                                                     mainTestIndices).ToArray();
       Array.Sort(freeVariableValues, testValues);
       responseChart.Series["Test Data"].Points.DataBindXY(freeVariableValues, testValues);
 
       // draw scatter plots of remaining values
-      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndizes).ToArray();
+      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndices).ToArray();
       trainingValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     Content.ProblemData.TrainingIndizes).ToArray();
+                                                                     Content.ProblemData.TrainingIndices).ToArray();
       Array.Sort(freeVariableValues, trainingValues);
       responseChart.Series["Training Data (edge)"].Points.DataBindXY(freeVariableValues, trainingValues);
 
-      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TestIndizes).ToArray();
+      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TestIndices).ToArray();
       testValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     Content.ProblemData.TestIndizes).ToArray();
+                                                                     Content.ProblemData.TestIndices).ToArray();
       Array.Sort(freeVariableValues, testValues);
       responseChart.Series["Test Data (edge)"].Points.DataBindXY(freeVariableValues, testValues);
@@ -187 +187 @@
       string freeVariable = (string)comboBox.SelectedItem;
 
-      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndizes).ToArray();
+      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndices).ToArray();
       var responseValues = Content.Model.Interpreter.GetSymbolicExpressionTreeValues(clonedTree,
                                                                               Content.ProblemData.Dataset,
-                                                                              Content.ProblemData.TrainingIndizes)
+                                                                              Content.ProblemData.TrainingIndices)
                                                                               .ToArray();
       Array.Sort(freeVariableValues, responseValues);