Changeset 1251 for branches/CEDMA-Refactoring-Ticket419

Timestamp:

03/05/09 10:51:26 (16 years ago)

Author:

gkronber

Message:

Improved !StandardGP and !OffspringSelectionGP variants for classification and time-series. #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

Location:

branches/CEDMA-Refactoring-Ticket419

Files:

• HeuristicLab.GP.StructureIdentification.Classification/HeuristicLab.GP.StructureIdentification.Classification.csproj (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.Classification/OffspringSelectionGP.cs (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification.Classification/StandardGP.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.Classification/StructIdProblemInjector.cs (added)
• HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLab.GP.StructureIdentification.TimeSeries.csproj (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification.TimeSeries/OffspringSelectionGP.cs (modified) (3 diffs)
• HeuristicLab.GP.StructureIdentification.TimeSeries/StandardGP.cs (modified) (3 diffs)
• HeuristicLab.GP.StructureIdentification.TimeSeries/StructIdProblemInjector.cs (added)
• HeuristicLab.GP.StructureIdentification/AlgorithmBase.cs (modified) (3 diffs)
• HeuristicLab.GP.StructureIdentification/StandardGP.cs (modified) (1 diff)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.Classification/HeuristicLab.GP.StructureIdentification.Classification.csproj

@@ -76 +76 @@
     <Compile Include="ROCAnalyzer.cs" />
     <Compile Include="StandardGP.cs" />
+    <Compile Include="StructIdProblemInjector.cs" />
   </ItemGroup>
   <ItemGroup>

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.Classification/OffspringSelectionGP.cs

@@ -33 +33 @@
 namespace HeuristicLab.GP.StructureIdentification.Classification {
   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP {
+    protected override IOperator CreateProblemInjector() {
+      return new StructIdProblemInjector();
+    }
+
     protected override IOperator CreateBestSolutionProcessor() {
       IOperator seq = base.CreateBestSolutionProcessor();
@@ -68 +72 @@
       seq.AddSubOperator(validationAccuracy);
       seq.AddSubOperator(testAccuracy);
+      seq.AddSubOperator(trainingConfusionMatrix);
+      seq.AddSubOperator(validationConfusionMatrix);
+      seq.AddSubOperator(testConfusionMatrix);
       return seq;
     }

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

@@ -32 +32 @@
 
 namespace HeuristicLab.GP.StructureIdentification.Classification {
-  public class StandardGP :  HeuristicLab.GP.StructureIdentification.StandardGP {
+  public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP {
+
+    protected override IOperator CreateProblemInjector() {
+      return new StructIdProblemInjector();
+    }
+
     protected override IOperator CreateBestSolutionProcessor() {
       IOperator seq = base.CreateBestSolutionProcessor();

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLab.GP.StructureIdentification.TimeSeries.csproj

@@ -73 +73 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StandardGP.cs" />
+    <Compile Include="StructIdProblemInjector.cs" />
     <Compile Include="TheilInequalityCoefficientEvaluator.cs" />
   </ItemGroup>
@@ -99 +100 @@
       <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
       <Name>HeuristicLab.GP</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">
+      <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>
+      <Name>HeuristicLab.Logging</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Operators\HeuristicLab.Operators.csproj">

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/OffspringSelectionGP.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Logging;
 
 namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
@@ -35 +36 @@
     protected override IOperator CreateFunctionLibraryInjector() {
       return new FunctionLibraryInjector();
+    }
+
+    protected override IOperator CreateProblemInjector() {
+      return new StructIdProblemInjector();
+    }
+
+    protected override IOperator CreateGlobalInjector() {
+      VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
+      injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData(false)));
+      return injector;
     }
 
@@ -63 +74 @@
       testTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TestTheilInequalityCoefficientCovariance";
 
+      SimpleEvaluator trainingEvaluator = new SimpleEvaluator();
+      trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
+
+      SimpleEvaluator validationEvaluator = new SimpleEvaluator();
+      validationEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      validationEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+      validationEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
+      
+      SimpleEvaluator testEvaluator = new SimpleEvaluator();
+      testEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
+      testEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
+      testEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
+
+      LinechartInjector trainingChartInjector = new LinechartInjector();
+      trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
+      trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
+      trainingChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTrainingPredictedValues";
+
+      LinechartInjector validationChartInjector = new LinechartInjector();
+      validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
+      validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
+      validationChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartValidationPredictedValues";
+
+      LinechartInjector testChartInjector = new LinechartInjector();
+      testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
+      testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
+      testChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTestPredictedValues";
+
       seq.AddSubOperator(trainingTheil);
       seq.AddSubOperator(validationTheil);
       seq.AddSubOperator(testTheil);
+      seq.AddSubOperator(trainingEvaluator);
+      seq.AddSubOperator(trainingChartInjector);
+      seq.AddSubOperator(validationEvaluator);
+      seq.AddSubOperator(validationChartInjector);
+      seq.AddSubOperator(testEvaluator);
+      seq.AddSubOperator(testChartInjector);
 
       return seq;

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

@@ -29 +29 @@
 using HeuristicLab.DataAnalysis;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
+using HeuristicLab.Logging;
 
 namespace HeuristicLab.GP.StructureIdentification.TimeSeries {
@@ -34 +36 @@
     protected override IOperator CreateFunctionLibraryInjector() {
       return new FunctionLibraryInjector();
+    }
+
+    protected override IOperator CreateProblemInjector() {
+      return new StructIdProblemInjector();
+    }
+
+    protected override IOperator CreateGlobalInjector() {
+      VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
+      injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData(false)));
+      return injector;
     }
 
@@ -62 +74 @@
       testTheil.GetVariableInfo("TheilInequalityCoefficientCovariance").ActualName = "TestTheilInequalityCoefficientCovariance";
 
+      SimpleEvaluator trainingEvaluator = new SimpleEvaluator();
+      trainingEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
+      trainingEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
+
+      SimpleEvaluator validationEvaluator = new SimpleEvaluator();
+      validationEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
+      validationEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+      validationEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
+
+      SimpleEvaluator testEvaluator = new SimpleEvaluator();
+      testEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";
+      testEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
+      testEvaluator.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
+
+      LinechartInjector trainingChartInjector = new LinechartInjector();
+      trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
+      trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining";
+      trainingChartInjector.GetVariableInfo("LineChart").ActualName = "LineChartTrainingPredictedValues";
+
+      LinechartInjector validationChartInjector = new LinechartInjector();
+      validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
+      validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation";
+      validationChartInjector.GetVariableInfo("LineChart").ActualName = "LineChartValidationPredictedValues";
+
+      LinechartInjector testChartInjector = new LinechartInjector();
+      testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2;
+      testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest";
+      testChartInjector.GetVariableInfo("LineChart").ActualName = "LineChartTestPredictedValues";
+
       seq.AddSubOperator(trainingTheil);
       seq.AddSubOperator(validationTheil);
       seq.AddSubOperator(testTheil);
+      seq.AddSubOperator(trainingEvaluator);
+      seq.AddSubOperator(trainingChartInjector);
+      seq.AddSubOperator(validationEvaluator);
+      seq.AddSubOperator(validationChartInjector);
+      seq.AddSubOperator(testEvaluator);
+      seq.AddSubOperator(testChartInjector);
 
       return seq;

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

@@ -116 +116 @@
       algo.Name = "GP";
       SequentialProcessor seq = new SequentialProcessor();
-      EmptyOperator problemInjectorPlaceholder = new EmptyOperator();
+      IOperator problemInjector = CreateProblemInjector();
 
       RandomInjector randomInjector = new RandomInjector();
@@ -143 +143 @@
       LeftReducer cleanUp = new LeftReducer();
 
-      seq.AddSubOperator(problemInjectorPlaceholder);
+      seq.AddSubOperator(problemInjector);
       seq.AddSubOperator(randomInjector);
       seq.AddSubOperator(globalInjector);
@@ -162 +162 @@
       this.algorithm = seq;
       return algo;
+    }
+
+    protected internal virtual IOperator CreateProblemInjector() {
+      return new EmptyOperator();
     }
 

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

@@ -87 +87 @@
       Engine.OperatorGraph.AddOperator(algo);
       Engine.OperatorGraph.InitialOperator = algo;
+    }
+
+    protected internal override IOperator CreateProblemInjector() {
+      return new StructIdProblemInjector();
     }