Changeset 1922 for trunk/sources/HeuristicLab.GP.StructureIdentification

Timestamp:

05/27/09 18:26:10 (16 years ago)

Author:

gkronber

Message:

#650 (IAlgorithm and derived interfaces should provide properties to retrieve results):

• Implemented properties to retrieve model quality
• Changed CEDMA executor to retrieve results via properties
• Removed obsolete class Execution in CEDMA (replaced by the interface IAlgorithm)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• AlgorithmBase.cs (modified) (2 diffs)
• StandardGP.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs ¶

@@ -42 +42 @@
     public virtual string Description { get { return "TODO"; } }
 
+    public abstract Dataset Dataset { get; set; }
+    public abstract int TargetVariable { get; set; }
+
     public virtual double MutationRate {
       get { return GetVariableInjector().GetVariable("MutationRate").GetValue<DoubleData>().Data; }
@@ -457 +460 @@
     #endregion
 
+
   }
 }

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

@@ -40 +40 @@
 
     public override string Name { get { return "StandardGP"; } }
+
+    public override int TargetVariable {
+      get { return ProblemInjector.GetVariableValue<IntData>("TargetVariable", null, false).Data; }
+      set { ProblemInjector.GetVariableValue<IntData>("TargetVariable", null, false).Data = value; }
+    }
+
+    public override Dataset Dataset {
+      get { return ProblemInjector.GetVariableValue<Dataset>("Dataset", null, false); }
+      set { ProblemInjector.GetVariable("Dataset").Value = value; }
+    }
 
     public virtual int MaxGenerations {
@@ -315 +325 @@
       Model model = base.CreateGPModel(bestModelScope);
       model.TestMeanSquaredError = bestModelScope.GetVariableValue<DoubleData>("TestQuality", false).Data;
+      model.TrainingCoefficientOfDetermination = bestModelScope.GetVariableValue<DoubleData>("TrainingR2", false).Data;
+      model.ValidationCoefficientOfDetermination = bestModelScope.GetVariableValue<DoubleData>("ValidationR2", false).Data;
+      model.TestCoefficientOfDetermination = bestModelScope.GetVariableValue<DoubleData>("TestR2", false).Data;
+      model.TrainingMeanAbsolutePercentageError = bestModelScope.GetVariableValue<DoubleData>("TrainingMAPE", false).Data;
+      model.ValidationMeanAbsolutePercentageError = bestModelScope.GetVariableValue<DoubleData>("ValidationMAPE", false).Data;
+      model.TestMeanAbsolutePercentageError = bestModelScope.GetVariableValue<DoubleData>("TestMAPE", false).Data;
+      model.TrainingMeanAbsolutePercentageOfRangeError = bestModelScope.GetVariableValue<DoubleData>("TrainingMAPRE", false).Data;
+      model.ValidationMeanAbsolutePercentageOfRangeError = bestModelScope.GetVariableValue<DoubleData>("ValidationMAPRE", false).Data;
+      model.TestMeanAbsolutePercentageOfRangeError = bestModelScope.GetVariableValue<DoubleData>("TestMAPRE", false).Data;
+      model.TrainingVarianceAccountedFor = bestModelScope.GetVariableValue<DoubleData>("TrainingVAF", false).Data;
+      model.ValidationVarianceAccountedFor = bestModelScope.GetVariableValue<DoubleData>("ValidationVAF", false).Data;
+      model.TestVarianceAccountedFor = bestModelScope.GetVariableValue<DoubleData>("TestVAF", false).Data;
+
       return model;
     }