Changeset 1115 for branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification

Timestamp:

01/12/09 19:09:40 (16 years ago)

Author:

gkronber

Message:

Removed calculation of R2 for the best (validation) model and added calculation of MAPE for training in the hard-coded StandardGP.
Changed Executer to store all model attributes. Changed parameters for StandardGP CEDMA runs for testing. (#419)

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGP.cs (modified) (2 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGP.cs

@@ -332 +332 @@
       solutionStorer.GetVariableInfo("BestSolution").ActualName = "BestValidationSolution";
       SequentialProcessor bestSolutionProcessor = new SequentialProcessor();
-      MeanAbsolutePercentageErrorEvaluator mapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();
-      mapeEvaluator.Name = "ValidationMapeEvaluator";
-      mapeEvaluator.GetVariableInfo("MAPE").ActualName = "ValidationMAPE";
-      mapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
-      mapeEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
-      CoefficientOfDeterminationEvaluator r2Evaluator = new CoefficientOfDeterminationEvaluator();
-      r2Evaluator.Name = "ValidationR2Evaluator";
-      r2Evaluator.GetVariableInfo("R2").ActualName = "ValidationR2";
-      r2Evaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
-      r2Evaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+      MeanAbsolutePercentageErrorEvaluator trainingMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();
+      trainingMapeEvaluator.Name = "ValidationMapeEvaluator";
+      trainingMapeEvaluator.GetVariableInfo("MAPE").ActualName = "TrainingMAPE";
+      trainingMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      trainingMapeEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      MeanAbsolutePercentageErrorEvaluator validationMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();
+      validationMapeEvaluator.Name = "ValidationMapeEvaluator";
+      validationMapeEvaluator.GetVariableInfo("MAPE").ActualName = "ValidationMAPE";
+      validationMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      validationMapeEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
       ProgrammableOperator progOperator = new ProgrammableOperator();
       progOperator.RemoveVariableInfo("Result");
@@ -350 +350 @@
 ";
       solutionStorer.AddSubOperator(bestSolutionProcessor);
-      bestSolutionProcessor.AddSubOperator(mapeEvaluator);
-      bestSolutionProcessor.AddSubOperator(r2Evaluator);
+      bestSolutionProcessor.AddSubOperator(trainingMapeEvaluator);
+      bestSolutionProcessor.AddSubOperator(validationMapeEvaluator);
       bestSolutionProcessor.AddSubOperator(progOperator);
       return solutionStorer;