Changeset 2352 for trunk/sources/HeuristicLab.SupportVectorMachines/3.2

Timestamp:

09/14/09 17:35:31 (15 years ago)

Author:

gkronber

Message:

Using simple version of TheilInequalityCoefficientEvaluator in both, SVR and GP (for time-series).
Deleted GP-specific version of TheilInequalityCoefficientEvaluator. #705

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/TimeSeriesSupportVectorRegression.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/TimeSeriesSupportVectorRegression.cs

@@ -63 +63 @@
       ProblemInjector probInjector = new ProblemInjector();
       seq.AddSubOperator(probInjector);
-      seq.AddSubOperator(new RandomInjector());
-
       return seq;
     }
@@ -83 +81 @@
       SequentialProcessor seqProc = new SequentialProcessor();
 
+      SupportVectorEvaluator trainingEvaluator = new SupportVectorEvaluator();
+      trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingEvaluator.GetVariableInfo("Values").ActualName = "TrainingValues";
+
       SimpleTheilInequalityCoefficientEvaluator trainingTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
+      trainingTheilUCalculator.Name = "TrainingTheilInequalityEvaluator";
       trainingTheilUCalculator.GetVariableInfo("Values").ActualName = "TrainingValues";
       trainingTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TrainingTheilInequalityCoefficient";
       SimpleTheilInequalityCoefficientEvaluator validationTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
+      validationTheilUCalculator.Name = "ValidationTheilInequalityEvaluator";
       validationTheilUCalculator.GetVariableInfo("Values").ActualName = "ValidationValues";
       validationTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "ValidationTheilInequalityCoefficient";
       SimpleTheilInequalityCoefficientEvaluator testTheilUCalculator = new SimpleTheilInequalityCoefficientEvaluator();
+      testTheilUCalculator.Name = "TestTheilInequalityEvaluator";
       testTheilUCalculator.GetVariableInfo("Values").ActualName = "TestValues";
       testTheilUCalculator.GetVariableInfo("TheilInequalityCoefficient").ActualName = "TestTheilInequalityCoefficient";
 
+      seqProc.AddSubOperator(trainingEvaluator);
       seqProc.AddSubOperator(trainingTheilUCalculator);
       seqProc.AddSubOperator(validationTheilUCalculator);