Changeset 2052 for trunk/sources/HeuristicLab.ES/3.2/ES.cs

Timestamp:

06/17/09 00:30:11 (15 years ago)

Author:

abeham

Message:

Improved ES GUI according to #674

File:

• trunk/sources/HeuristicLab.ES/3.2/ES.cs (modified) (13 diffs)

trunk/sources/HeuristicLab.ES/3.2/ES.cs

@@ -30 +30 @@
 using HeuristicLab.Selection;
 using HeuristicLab.RealVector;
+using HeuristicLab.Evolutionary;
 
 namespace HeuristicLab.ES {
@@ -36 +37 @@
   /// </summary>
   public class ES : ItemBase, IEditable {
+
     #region Create Operators
     /// <summary>
@@ -64 +66 @@
       // place holder for ProblemInjector
       EmptyOperator eo1 = new EmptyOperator();
-      eo1.Name = "ProblemInjector";
+      eo1.Name = "Empty Problem"; // was ProblemInjector
       op.OperatorGraph.AddOperator(eo1);
       co1.AddSubOperator(eo1);
+      co1.AddVariableInfo(new VariableInfo("ProblemInjector", "", typeof(IOperator), VariableKind.In));
+      co1.GetVariableInfo("ProblemInjector").ActualName = "Empty Problem";
 
       CombinedOperator co2 = CreatePopulationInitialization();
@@ -75 +79 @@
       // place holder for SolutionGenerator
       EmptyOperator eo2 = new EmptyOperator();
-      eo2.Name = "SolutionGenerator";
+      eo2.Name = "Empty Solution"; // was SolutionGenerator
       op.OperatorGraph.AddOperator(eo2);
       co2.AddSubOperator(eo2);
+      co2.AddVariableInfo(new VariableInfo("SolutionGenerator", "", typeof(IOperator), VariableKind.In));
+      co2.GetVariableInfo("SolutionGenerator").ActualName = "Empty Solution";
 
       // place holder for Evaluator
       EmptyOperator eo3 = new EmptyOperator();
-      eo3.Name = "Evaluator";
+      eo3.Name = "Empty Evaluation"; // was Evaluator
       op.OperatorGraph.AddOperator(eo3);
       co2.AddSubOperator(eo3);
+      co2.AddVariableInfo(new VariableInfo("Evaluator", "", typeof(IOperator), VariableKind.In));
+      co2.GetVariableInfo("Evaluator").ActualName = "Empty Evaluation";
 
       CombinedOperator co3 = CreateESMain();
@@ -92 +100 @@
       // place holder for Mutator
       EmptyOperator eo4 = new EmptyOperator();
-      eo4.Name = "Mutator";
+      eo4.Name = "No Mutation"; // was Mutator
       op.OperatorGraph.AddOperator(eo4);
       co3.AddSubOperator(eo4);
+      co3.AddVariableInfo(new VariableInfo("Mutator", "", typeof(IOperator), VariableKind.In));
+      co3.GetVariableInfo("Mutator").ActualName = "No Mutation";
 
       // place holder for Evaluator
       co3.AddSubOperator(eo3);
+      co3.AddVariableInfo(new VariableInfo("Evaluator", "", typeof(IOperator), VariableKind.In));
+      co3.GetVariableInfo("Evaluator").ActualName = "Empty Evaluation";
 
       // place holder for Recombinator
       EmptyOperator eo5 = new EmptyOperator();
-      eo5.Name = "Recombinator";
+      eo5.Name = "No Recombination"; // was Recombinator
       op.OperatorGraph.AddOperator(eo5);
       co3.AddSubOperator(eo5);
+      co3.AddVariableInfo(new VariableInfo("Recombinator", "", typeof(IOperator), VariableKind.In));
+      co3.GetVariableInfo("Recombinator").ActualName = "No Recombination";
 
       return op;
@@ -289 +303 @@
       op.OperatorGraph.InitialOperator = sp1;
 
+      GreaterThanComparator gtc = new GreaterThanComparator();
+      gtc.GetVariableInfo("LeftSide").ActualName = "ESrho";
+      gtc.GetVariableInfo("RightSide").Local = true;
+      gtc.AddVariable(new Variable("RightSide", new IntData(1)));
+      gtc.GetVariableInfo("Result").ActualName = "UseRecombination";
+      op.OperatorGraph.AddOperator(gtc);
+      sp1.AddSubOperator(gtc);
+
+      ConditionalBranch cb = new ConditionalBranch();
+      cb.Name = "Use recombination?";
+      cb.GetVariableInfo("Condition").ActualName = "UseRecombination";
+      op.OperatorGraph.AddOperator(cb);
+      sp1.AddSubOperator(cb);
+
+      SequentialProcessor sp2 = new SequentialProcessor();
+      op.OperatorGraph.AddOperator(sp2);
+      cb.AddSubOperator(sp2);
+
+      ChildrenInitializer ci = new ChildrenInitializer();
+      ci.GetVariableInfo("ParentsPerChild").Local = false;
+      ci.RemoveVariable("ParentsPerChild");
+      ci.GetVariableInfo("ParentsPerChild").ActualName = "ESrho";
+      op.OperatorGraph.AddOperator(ci);
+      sp2.AddSubOperator(ci);
+
+      UniformSequentialSubScopesProcessor ussp0 = new UniformSequentialSubScopesProcessor();
+      op.OperatorGraph.AddOperator(ussp0);
+      sp2.AddSubOperator(ussp0);
+
+      SequentialProcessor sp3 = new SequentialProcessor();
+      op.OperatorGraph.AddOperator(sp3);
+      ussp0.AddSubOperator(sp3);
+
       OperatorExtractor oe1 = new OperatorExtractor();
       oe1.Name = "Recombinator";
       oe1.GetVariableInfo("Operator").ActualName = "Recombinator";
       op.OperatorGraph.AddOperator(oe1);
-      sp1.AddSubOperator(oe1);
+      sp3.AddSubOperator(oe1);
 
       UniformSequentialSubScopesProcessor ussp = new UniformSequentialSubScopesProcessor();
       op.OperatorGraph.AddOperator(ussp);
-      sp1.AddSubOperator(ussp);
-
-      SequentialProcessor sp2 = new SequentialProcessor();
-      op.OperatorGraph.AddOperator(sp2);
-      ussp.AddSubOperator(sp2);
+      cb.AddSubOperator(ussp);
+
+      SequentialProcessor sp4 = new SequentialProcessor();
+      op.OperatorGraph.AddOperator(sp4);
+      ussp.AddSubOperator(sp4);
 
       OperatorExtractor oe2 = new OperatorExtractor();
@@ -307 +354 @@
       oe2.GetVariableInfo("Operator").ActualName = "Mutator";
       op.OperatorGraph.AddOperator(oe2);
-      sp2.AddSubOperator(oe2);
+      sp4.AddSubOperator(oe2);
 
       OperatorExtractor oe3 = new OperatorExtractor();
@@ -313 +360 @@
       oe3.GetVariableInfo("Operator").ActualName = "Evaluator";
       op.OperatorGraph.AddOperator(oe3);
-      sp2.AddSubOperator(oe3);
+      sp4.AddSubOperator(oe3);
 
       Counter c = new Counter();
       c.GetVariableInfo("Value").ActualName = "EvaluatedSolutions";
       op.OperatorGraph.AddOperator(c);
-      sp2.AddSubOperator(c);
+      sp4.AddSubOperator(c);
+
+      sp3.AddSubOperator(oe2);
+      sp3.AddSubOperator(oe3);
+      sp3.AddSubOperator(c);
+
+      SubScopesRemover ssr = new SubScopesRemover();
+      ssr.GetVariableInfo("SubScopeIndex").Local = true;
+      op.OperatorGraph.AddOperator(ssr);
+      sp3.AddSubOperator(ssr);
 
       Sorter s = new Sorter();
@@ -542 +598 @@
       get { return myVariableInjection.SubOperators[0]; }
       set {
-        value.Name = "ProblemInjector";
+        myVariableInjection.GetVariableInfo("ProblemInjector").ActualName = value.Name;
         myES.OperatorGraph.RemoveOperator(ProblemInjector.Guid);
         myES.OperatorGraph.AddOperator(value);
@@ -555 +611 @@
       get { return myPopulationInitialization.SubOperators[0]; }
       set {
-        value.Name = "SolutionGenerator";
+        myPopulationInitialization.GetVariableInfo("SolutionGenerator").ActualName = value.Name;
         myES.OperatorGraph.RemoveOperator(SolutionGenerator.Guid);
         myES.OperatorGraph.AddOperator(value);
@@ -567 +623 @@
       get { return myPopulationInitialization.SubOperators[1]; }
       set {
-        value.Name = "Evaluator";
+        myPopulationInitialization.GetVariableInfo("Evaluator").ActualName = value.Name;
+        myESMain.GetVariableInfo("Evaluator").ActualName = value.Name;
         myES.OperatorGraph.RemoveOperator(Evaluator.Guid);
         myES.OperatorGraph.AddOperator(value);
@@ -580 +637 @@
       get { return myESMain.SubOperators[0]; }
       set {
-        value.Name = "Mutator";
+        myESMain.GetVariableInfo("Mutator").ActualName = value.Name;
         myES.OperatorGraph.RemoveOperator(Mutator.Guid);
         myES.OperatorGraph.AddOperator(value);
@@ -592 +649 @@
       get { return myESMain.SubOperators[2]; }
       set {
-        value.Name = "Recombinator";
+        myESMain.GetVariableInfo("Recombinator").ActualName = value.Name;
         myES.OperatorGraph.RemoveOperator(Recombinator.Guid);
         myES.OperatorGraph.AddOperator(value);