Changeset 1225 for trunk/sources

Timestamp:

02/24/09 13:15:48 (16 years ago)

Author:

abeham

Message:

Adapted SGA plugin to use new crossover model, added reference to HeuristicLab.Evolutionary (ticket #496)

Location:

trunk/sources/HeuristicLab.SGA

Files:

• HeuristicLab.SGA.csproj (modified) (1 diff)
• HeuristicLabSGAPlugin.cs (modified) (1 diff)
• SGA.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.SGA/HeuristicLab.SGA.csproj

@@ -84 +84 @@
       <Name>HeuristicLab.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Evolutionary\HeuristicLab.Evolutionary.csproj">
+      <Project>{F5614C53-153C-4A37-A608-121E1C087F07}</Project>
+      <Name>HeuristicLab.Evolutionary</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">
       <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>

trunk/sources/HeuristicLab.SGA/HeuristicLabSGAPlugin.cs

@@ -33 +33 @@
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Evolutionary-3.2")]
   [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
   [Dependency(Dependency = "HeuristicLab.Random-3.2")]

trunk/sources/HeuristicLab.SGA/SGA.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Evolutionary;
 using HeuristicLab.SequentialEngine;
 using HeuristicLab.Operators;
@@ -266 +267 @@
       op.OperatorGraph.InitialOperator = sp1;
 
+      ChildrenInitializer ci = new ChildrenInitializer();
+      op.OperatorGraph.AddOperator(ci);
+      sp1.AddSubOperator(ci);
+
+      UniformSequentialSubScopesProcessor ussp = new UniformSequentialSubScopesProcessor();
+      op.OperatorGraph.AddOperator(ussp);
+      sp1.AddSubOperator(ussp);
+
+      SequentialProcessor sp2 = new SequentialProcessor();
+      op.OperatorGraph.AddOperator(sp2);
+      ussp.AddSubOperator(sp2);
+
       OperatorExtractor oe1 = new OperatorExtractor();
       oe1.Name = "Crossover";
       oe1.GetVariableInfo("Operator").ActualName = "Crossover";
       op.OperatorGraph.AddOperator(oe1);
-      sp1.AddSubOperator(oe1);
-
-      UniformSequentialSubScopesProcessor ussp = new UniformSequentialSubScopesProcessor();
-      op.OperatorGraph.AddOperator(ussp);
-      sp1.AddSubOperator(ussp);
-
-      SequentialProcessor sp2 = new SequentialProcessor();
-      op.OperatorGraph.AddOperator(sp2);
-      ussp.AddSubOperator(sp2);
+      sp2.AddSubOperator(oe1);
 
       StochasticBranch hb = new StochasticBranch();
@@ -296 +301 @@
       op.OperatorGraph.AddOperator(oe3);
       sp2.AddSubOperator(oe3);
+
+      SubScopesRemover sr = new SubScopesRemover();
+      sr.GetVariableInfo("SubScopeIndex").Local = true;
+      op.OperatorGraph.AddOperator(sr);
+      sp2.AddSubOperator(sr);
 
       Counter c = new Counter();