Changeset 4194 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionEvaluator.cs

Timestamp:

08/11/10 13:00:53 (14 years ago)

Author:

gkronber

Message:

Created a feature/exploration branch for new data analysis features #1142

Location:

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression)
• 3.3/Symbolic/Evaluators/SymbolicVectorRegressionEvaluator.cs (modified) (2 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/Evaluators/SymbolicVectorRegressionEvaluator.cs

@@ -105 +105 @@
     #endregion
 
+    public SymbolicVectorRegressionEvaluator(bool deserializing) : base(deserializing) { }
     public SymbolicVectorRegressionEvaluator()
       : base() {
@@ -118 +119 @@
     }
 
-    public override IOperation Apply() {
-      var interpreter = SymbolicExpressionTreeInterpreter;
-      var tree = SymbolicExpressionTree;
-      var problemData = MultiVariateDataAnalysisProblemData;
-
-      IEnumerable<string> selectedTargetVariables =
-        problemData.TargetVariables.CheckedItems
-        .Select(x => x.Value.Value);
-
-      // check if there is a vector component for each target variable
-      if (selectedTargetVariables.Count() != tree.Root.SubTrees[0].SubTrees.Count)
-        throw new ArgumentException("The dimension of the output-vector of the tree doesn't match the number of selected target variables.");
-      int start = SamplesStart.Value;
-      int end = SamplesEnd.Value;
-
-      IEnumerable<int> rows = GenerateRowsToEvaluate((uint)Random.Next(), RelativeNumberOfEvaluatedSamples.Value, start, end);
-
-      Evaluate(tree, interpreter, problemData, selectedTargetVariables, rows, LowerEstimationLimit, UpperEstimationLimit);
-
-      return base.Apply();
-    }
-
-    public abstract void Evaluate(SymbolicExpressionTree tree, ISymbolicExpressionTreeInterpreter interpreter, MultiVariateDataAnalysisProblemData problemData, IEnumerable<string> targetVariables, IEnumerable<int> rows, DoubleArray lowerEstimationBound, DoubleArray upperEstimationBound);
-
-    private static IEnumerable<int> GenerateRowsToEvaluate(uint seed, double relativeAmount, int start, int end) {
+    public static IEnumerable<int> GenerateRowsToEvaluate(uint seed, double relativeAmount, int start, int end) {
       if (end < start) throw new ArgumentException("Start value is larger than end value.");
       int count = (int)((end - start) * relativeAmount);