Changeset 1890 for trunk/sources

Timestamp:

05/25/09 16:40:11 (16 years ago)

Author:

gkronber

Message:

Added evaluation of VAF to hard-coded GP algorithms. VAF values for training, validation, test are stored as model attributes. #641 (CEDMA should also store VAF of models)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.DB.Interfaces/3.3/Ontology.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/Executer.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/StandardGP.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/3.3/Ontology.cs

@@ -145 +145 @@
     public static Entity TestCoefficientOfDetermination {
       get { return new Entity(CedmaNameSpace + "TestCoefficientOfDetermination"); }
+    }
+    public static Entity TrainingVarianceAccountedFor {
+      get { return new Entity(CedmaNameSpace + "TrainingVarianceAccountedFor"); }
+    }
+    public static Entity ValidationVarianceAccountedFor {
+      get { return new Entity(CedmaNameSpace + "ValidationVarianceAccountedFor"); }
+    }
+    public static Entity TestVarianceAccountedFor {
+      get { return new Entity(CedmaNameSpace + "TestVarianceAccountedFor"); }
     }
     public static Entity TrainingAccuracy {

trunk/sources/HeuristicLab.CEDMA.Server/3.3/Executer.cs

@@ -145 +145 @@
       StoreModelVariable(model, Ontology.ValidationCoefficientOfDetermination, bestModelScope, "ValidationR2");
       StoreModelVariable(model, Ontology.TestCoefficientOfDetermination, bestModelScope, "TestR2");
+      StoreModelVariable(model, Ontology.TrainingCoefficientOfDetermination, bestModelScope, "TrainingVAF");
+      StoreModelVariable(model, Ontology.ValidationCoefficientOfDetermination, bestModelScope, "ValidationVAF");
+      StoreModelVariable(model, Ontology.TestCoefficientOfDetermination, bestModelScope, "TestVAF");
       StoreModelVariable(model, Ontology.TrainingTheilsInequalityCoefficient, bestModelScope, "TrainingTheilInequalityCoefficient");
       StoreModelVariable(model, Ontology.ValidationTheilsInequalityCoefficient, bestModelScope, "ValidationTheilInequalityCoefficient");

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGP.cs

@@ -240 +240 @@
       testR2Evaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
       testR2Evaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
+      VarianceAccountedForEvaluator trainingVAFEvaluator = new VarianceAccountedForEvaluator();
+      trainingVAFEvaluator.Name = "TrainingVAFEvaluator";
+      trainingVAFEvaluator.GetVariableInfo("VAF").ActualName = "TrainingVAF";
+      trainingVAFEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      trainingVAFEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      VarianceAccountedForEvaluator validationVAFEvaluator = new VarianceAccountedForEvaluator();
+      validationVAFEvaluator.Name = "ValidationVAFEvaluator";
+      validationVAFEvaluator.GetVariableInfo("VAF").ActualName = "ValidationVAF";
+      validationVAFEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      validationVAFEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+      VarianceAccountedForEvaluator testVAFEvaluator = new VarianceAccountedForEvaluator();
+      testVAFEvaluator.Name = "TestVAFEvaluator";
+      testVAFEvaluator.GetVariableInfo("VAF").ActualName = "TestVAF";
+      testVAFEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
+      testVAFEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
+
       ProgrammableOperator progOperator = new ProgrammableOperator();
       progOperator.RemoveVariableInfo("Result");
@@ -257 +273 @@
       bestSolutionProcessor.AddSubOperator(validationR2Evaluator);
       bestSolutionProcessor.AddSubOperator(testR2Evaluator);
+      bestSolutionProcessor.AddSubOperator(trainingVAFEvaluator);
+      bestSolutionProcessor.AddSubOperator(validationVAFEvaluator);
+      bestSolutionProcessor.AddSubOperator(testVAFEvaluator);
       bestSolutionProcessor.AddSubOperator(progOperator);
       return bestSolutionProcessor;