Changeset 1051

Timestamp:

12/22/08 09:37:50 (16 years ago)

Author:

gkronber

Message:

fixed missing project file.
fixed operator graph of standard GP engine.
#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/HeuristicLab.GP.StructureIdentification.csproj (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification/StandardGP.cs (modified) (16 diffs)
• HeuristicLab.GP.StructureIdentification/StandardGpEditor.Designer.cs (added)
• HeuristicLab.GP.StructureIdentification/StandardGpEditor.cs (added)
• HeuristicLab.GP.StructureIdentification/StandardGpEditor.resx (added)

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

@@ -70 +70 @@
     <Compile Include="GPClassificationEvaluatorBase.cs" />
     <Compile Include="CrossValidation.cs" />
-    <Compile Include="FunctionLibraryInjector.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="HeuristicLabGPClassificationPlugin.cs" />
     <Compile Include="MulticlassModeller.cs" />

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

@@ -72 +72 @@
     <Compile Include="Constant.cs" />
     <Compile Include="FunctionLibraryInjector.cs" />
+    <Compile Include="StandardGpEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="StandardGpEditor.Designer.cs">
+      <DependentUpon>StandardGpEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="StandardGP.cs" />
     <Compile Include="Cosinus.cs" />
@@ -161 +167 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="StandardGpEditor.resx">
+      <DependentUpon>StandardGpEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="StructIdProblemInjectorView.resx">
       <DependentUpon>StructIdProblemInjectorView.cs</DependentUpon>

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

@@ -35 +35 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class StandardGP {
+  public class StandardGP : ItemBase, IEditable {
     private IntData maxGenerations = new IntData();
     public int MaxGenerations {
@@ -41 +41 @@
       set { maxGenerations.Data = value; }
     }
-      
+
     private IntData tournamentSize = new IntData();
     public int TournamentSize {
@@ -62 +62 @@
     }
 
+    private BoolData setSeedRandomly = new BoolData();
+    public bool SetSeedRandomly {
+      get { return setSeedRandomly.Data; }
+      set { setSeedRandomly.Data = value; }
+    }
+
+    private IntData seed = new IntData();
+    public int Seed {
+      get { return seed.Data; }
+      set { seed.Data = value; }
+    }
+
+    public IOperator ProblemInjector {
+      get { return algorithm.SubOperators[0]; }
+      set {
+        value.Name = "ProblemInjector";
+        algorithm.RemoveSubOperator(0);
+        algorithm.AddSubOperator(value, 0);
+      }
+    }
+
+    private IntData elites = new IntData();
+    public int Elites {
+      get { return elites.Data; }
+      set { elites.Data = value; }
+    }
+
     private int maxTreeSize = 50;
     private int maxTreeHeight = 8;
@@ -68 +95 @@
     private double fullTreeShakingFactor = 0.1;
     private double onepointShakingFactor = 1.0;
-
+    private IOperator algorithm;
     private SequentialEngine.SequentialEngine engine;
 
+    public IEngine Engine {
+      get { return engine; }
+    }
+
     public StandardGP() {
-      PopulationSize = 10000;
+      PopulationSize = 100;
       MaxGenerations = 100;
       TournamentSize = 7;
       MutationRate = 0.15;
       engine = new SequentialEngine.SequentialEngine();
-      CreateAlgorithm();
-    }
-
-    public void Reset() {
-      engine.Reset();
-    }                                            
-
-    private void Run() {
-      Reset();
-    }
-
-    private void CreateAlgorithm() {
-      SequentialProcessor seq = new SequentialProcessor();
+      CombinedOperator algo = CreateAlgorithm();
+      engine.OperatorGraph.AddOperator(algo);
+      engine.OperatorGraph.InitialOperator = algo;
+    }
+
+    private CombinedOperator CreateAlgorithm() {
+      CombinedOperator algo = new CombinedOperator();
+      algo.Name = "StandardGP";
+      SequentialProcessor seq = new SequentialProcessor();
+      EmptyOperator problemInjectorPlaceholder = new EmptyOperator();
       RandomInjector randomInjector = new RandomInjector();
+      randomInjector.GetVariable("SetSeedRandomly").Value = setSeedRandomly;
+      randomInjector.GetVariable("Seed").Value = seed;
       randomInjector.Name = "Random Injector";
       VariableInjector globalInjector = CreateGlobalInjector();
@@ -104 +134 @@
       treeCreator.Name = "Tree generator";
       treeCreator.GetVariableInfo("OperatorLibrary").ActualName = "FunctionLibrary";
+      treeCreator.GetVariableInfo("MinTreeSize").Local = true;
+      treeCreator.AddVariable(new HeuristicLab.Core.Variable("MinTreeSize", new IntData(3)));
       MeanSquaredErrorEvaluator evaluator = new MeanSquaredErrorEvaluator();
       evaluator.GetVariableInfo("MSE").ActualName = "Quality";
@@ -121 +153 @@
       selector.GetVariableInfo("GroupSize").ActualName = "TournamentSize";
 
+      seq.AddSubOperator(problemInjectorPlaceholder);
       seq.AddSubOperator(randomInjector);
       seq.AddSubOperator(globalInjector);
@@ -135 +168 @@
       mainLoop.AddSubOperator(manipulator);
       mainLoop.AddSubOperator(evaluator);
-      engine.OperatorGraph.AddOperator(seq);
-      engine.OperatorGraph.InitialOperator = seq;
+      algo.OperatorGraph.AddOperator(seq);
+      algo.OperatorGraph.InitialOperator = seq;
+      this.algorithm = seq;
+      return algo;
     }
 
@@ -147 +182 @@
       injector.AddVariable(new HeuristicLab.Core.Variable("PopulationSize", populationSize));
       injector.AddVariable(new HeuristicLab.Core.Variable("Parents", parents));
-      injector.AddVariable(new HeuristicLab.Core.Variable("Elites", new IntData(1)));
+      injector.AddVariable(new HeuristicLab.Core.Variable("Elites", elites));
+      injector.AddVariable(new HeuristicLab.Core.Variable("TournamentSize", tournamentSize));
       injector.AddVariable(new HeuristicLab.Core.Variable("Maximization", new BoolData(false)));
       injector.AddVariable(new HeuristicLab.Core.Variable("MaxTreeHeight", new IntData(maxTreeHeight)));
@@ -160 +196 @@
       CombinedOperator manipulator = new CombinedOperator();
       StochasticMultiBranch multibranch = new StochasticMultiBranch();
-
       FullTreeShaker fullTreeShaker = new FullTreeShaker();
       fullTreeShaker.GetVariableInfo("OperatorLibrary").ActualName = "FunctionLibrary";
@@ -179 +214 @@
       substituteSubTreeManipulation.GetVariableInfo("OperatorLibrary").ActualName = "FunctionLibrary";
 
-      multibranch.AddSubOperator(fullTreeShaker);
-      multibranch.AddSubOperator(onepointShaker);
-      multibranch.AddSubOperator(changeNodeTypeManipulation);
-      multibranch.AddSubOperator(cutOutNodeManipulation);
-      multibranch.AddSubOperator(deleteSubTreeManipulation);
-      multibranch.AddSubOperator(substituteSubTreeManipulation);
+      IOperator[] manipulators = new IOperator[] {
+        onepointShaker, fullTreeShaker,
+        changeNodeTypeManipulation,
+        cutOutNodeManipulation,
+        deleteSubTreeManipulation,
+        substituteSubTreeManipulation};
+
+      DoubleArrayData probabilities = new DoubleArrayData(new double[manipulators.Length]);
+      for(int i=0;i<manipulators.Length;i++) {
+        probabilities.Data[i] = 1.0;
+        multibranch.AddSubOperator(manipulators[i]);
+      }
+      multibranch.GetVariableInfo("Probabilities").Local = true;
+      multibranch.AddVariable(new HeuristicLab.Core.Variable("Probabilities", probabilities));
+
       manipulator.OperatorGraph.AddOperator(multibranch);
       manipulator.OperatorGraph.InitialOperator = multibranch;
@@ -194 +238 @@
       SequentialProcessor seq = new SequentialProcessor();
       SubScopesCreater subScopesCreater = new SubScopesCreater();
+      subScopesCreater.GetVariableInfo("SubScopes").ActualName = "PopulationSize";
       UniformSequentialSubScopesProcessor subScopesProc = new UniformSequentialSubScopesProcessor();
       SequentialProcessor individualSeq = new SequentialProcessor();
@@ -202 +247 @@
       evaluator.Name = "Evaluator (extr.)";
       evaluator.GetVariableInfo("Operator").ActualName = "Evaluator";
-      
+
       seq.AddSubOperator(subScopesCreater);
       seq.AddSubOperator(subScopesProc);
@@ -237 +282 @@
       comparator.GetVariableInfo("RightSide").ActualName = "MaxGenerations";
       comparator.GetVariableInfo("Result").ActualName = "GenerationsCondition";
-
       ConditionalBranch cond = new ConditionalBranch();
       cond.GetVariableInfo("Condition").ActualName = "GenerationsCondition";
+
+      seq.AddSubOperator(childCreater);
+      seq.AddSubOperator(replacement);
+      seq.AddSubOperator(qualityCalculator);
+      seq.AddSubOperator(collector);
+      seq.AddSubOperator(lineChartInjector);
+      seq.AddSubOperator(qualityLogger);
+      seq.AddSubOperator(counter);
+      seq.AddSubOperator(comparator);
+      seq.AddSubOperator(cond);
+      cond.AddSubOperator(seq);
+
       main.OperatorGraph.AddOperator(seq);
       main.OperatorGraph.InitialOperator = seq;
@@ -253 +309 @@
       leftSelector.GetVariableInfo("Selected").ActualName = "Elites";
       RightReducer rightReducer = new RightReducer();
-      
+
       SequentialProcessor remainingProc = new SequentialProcessor();
       RightSelector rightSelector = new RightSelector();
@@ -303 +359 @@
       sorter.GetVariableInfo("Descending").ActualName = "Maximization";
       sorter.GetVariableInfo("Value").ActualName = "Quality";
- 
+
 
       seq.AddSubOperator(selector);
@@ -321 +377 @@
       return childCreater;
     }
+
+    public IEditor CreateEditor() {
+      return new StandardGpEditor(this);
+    }
+
+    public IView CreateView() {
+      return new StandardGpEditor(this);
+    }
   }
 }