Changeset 2356 for trunk/sources/HeuristicLab.Modeling/3.2/DefaultClassificationOperators.cs

Timestamp:

09/15/09 14:01:47 (15 years ago)

Author:

gkronber

Message:

Moved common (not algorithm specific) model analyzer code (same operator tree in all regression/classification/time-series-prognosis engines) to HL.Modeling. #625, #705, #739.

File:

• trunk/sources/HeuristicLab.Modeling/3.2/DefaultClassificationOperators.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/3.3/DefaultClassificationAlgorithmOperators.cs) (2 diffs)

trunk/sources/HeuristicLab.Modeling/3.2/DefaultClassificationOperators.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.DataAnalysis;
-using HeuristicLab.GP.Interfaces;
 using HeuristicLab.Operators;
 using HeuristicLab.Modeling;
 using HeuristicLab.Data;
 
-namespace HeuristicLab.GP.StructureIdentification.Classification {
-  public static class DefaultClassificationAlgorithmOperators {
+namespace HeuristicLab.Modeling {
+  public static class DefaultClassificationOperators {
     public static IOperator CreatePostProcessingOperator() {
+      CombinedOperator op = new CombinedOperator();
+      op.Name = "Classification model analyzer";
+
       SequentialProcessor seq = new SequentialProcessor();
-      seq.AddSubOperator(DefaultStructureIdentificationAlgorithmOperators.CreatePostProcessingOperator());
+      seq.AddSubOperator(DefaultRegressionOperators.CreatePostProcessingOperator());
 
-      UniformSequentialSubScopesProcessor subScopesProc = new UniformSequentialSubScopesProcessor();
-      SequentialProcessor individualProc = new SequentialProcessor();
-      subScopesProc.AddSubOperator(individualProc);
-      seq.AddSubOperator(subScopesProc);
       SimpleAccuracyEvaluator trainingAccuracy = new SimpleAccuracyEvaluator();
       trainingAccuracy.Name = "TrainingAccuracyEvaluator";
@@ -52 +50 @@
       testAccuracy.GetVariableInfo("Values").ActualName = "TestValues";
 
-      individualProc.AddSubOperator(trainingAccuracy);
-      individualProc.AddSubOperator(validationAccuracy);
-      individualProc.AddSubOperator(testAccuracy);
-      return seq;
+      SimpleConfusionMatrixEvaluator trainingConfusionMatrixEvaluator = new SimpleConfusionMatrixEvaluator();
+      trainingConfusionMatrixEvaluator.Name = "TrainingConfusionMatrixEvaluator";
+      trainingConfusionMatrixEvaluator.GetVariableInfo("Values").ActualName = "TrainingValues";
+      trainingConfusionMatrixEvaluator.GetVariableInfo("ConfusionMatrix").ActualName = "TrainingConfusionMatrix";
+      SimpleConfusionMatrixEvaluator validationConfusionMatrixEvaluator = new SimpleConfusionMatrixEvaluator();
+      validationConfusionMatrixEvaluator.Name = "ValidationConfusionMatrixEvaluator";
+      validationConfusionMatrixEvaluator.GetVariableInfo("Values").ActualName = "ValidationValues";
+      validationConfusionMatrixEvaluator.GetVariableInfo("ConfusionMatrix").ActualName = "ValidationConfusionMatrix";
+      SimpleConfusionMatrixEvaluator testConfusionMatrixEvaluator = new SimpleConfusionMatrixEvaluator();
+      testConfusionMatrixEvaluator.Name = "TestConfusionMatrixEvaluator";
+      testConfusionMatrixEvaluator.GetVariableInfo("Values").ActualName = "TestValues";
+      testConfusionMatrixEvaluator.GetVariableInfo("ConfusionMatrix").ActualName = "TestConfusionMatrix";
+
+      seq.AddSubOperator(trainingAccuracy);
+      seq.AddSubOperator(validationAccuracy);
+      seq.AddSubOperator(testAccuracy);
+      seq.AddSubOperator(trainingConfusionMatrixEvaluator);
+      seq.AddSubOperator(validationConfusionMatrixEvaluator);
+      seq.AddSubOperator(testConfusionMatrixEvaluator);
+
+      op.OperatorGraph.AddOperator(seq);
+      op.OperatorGraph.InitialOperator = seq;
+
+      return op;
     }
 
     public static IOperator CreateProblemInjector() {
-      CombinedOperator op = new CombinedOperator();
-      op.Name = "ProblemInjector";
-      SequentialProcessor seq = new SequentialProcessor();
-      seq.AddSubOperator(new ProblemInjector());
-      seq.AddSubOperator(new TargetClassesCalculator());
-      op.OperatorGraph.AddOperator(seq);
-      op.OperatorGraph.InitialOperator = seq;
-      return op;
+      return DefaultRegressionOperators.CreateProblemInjector();
     }
 
-    public static void SetModelData(IAnalyzerModel model, IScope scope) {
-      model.SetResult("TrainingAccuracy", scope.GetVariableValue<DoubleData>("TrainingAccuracy", true).Data);
-      model.SetResult("ValidationAccuracy", scope.GetVariableValue<DoubleData>("ValidationAccuracy", true).Data);
-      model.SetResult("TestAccuracy", scope.GetVariableValue<DoubleData>("TestAccuracy", true).Data);
+    public static IAnalyzerModel PopulateAnalyzerModel(IScope modelScope, IAnalyzerModel model) {
+      DefaultRegressionOperators.PopulateAnalyzerModel(modelScope, model);
+      model.SetResult("TrainingAccuracy", modelScope.GetVariableValue<DoubleData>("TrainingAccuracy", false).Data);
+      model.SetResult("ValidationAccuracy", modelScope.GetVariableValue<DoubleData>("ValidationAccuracy", false).Data);
+      model.SetResult("TestAccuracy", modelScope.GetVariableValue<DoubleData>("TestAccuracy", false).Data);
+      return model;
     }
   }