Changeset 1335 for trunk/sources

Timestamp:

03/12/09 14:39:44 (16 years ago)

Author:

gkronber

Message:

Fixed hard-coded StandardGP implementations to work with new crossover architecture. #521 (Hard-coded GP implementations do not work with new crossover operator architecture)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/AlgorithmBase.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/AlgorithmBase.cs

@@ -34 +34 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators.Programmable;
+using HeuristicLab.Evolutionary;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -343 +344 @@
       selector.Name = "Selector (extr.)";
       selector.GetVariableInfo("Operator").ActualName = "Selector";
+
       SequentialSubScopesProcessor seqScopesProc = new SequentialSubScopesProcessor();
       EmptyOperator emptyOpt = new EmptyOperator();
       SequentialProcessor selectedProc = new SequentialProcessor();
+      ChildrenInitializer childInitializer = new ChildrenInitializer();
+      ((IntData)childInitializer.GetVariable("ParentsPerChild").Value).Data = 2;
+
       OperatorExtractor crossover = new OperatorExtractor();
       crossover.Name = "Crossover (extr.)";
@@ -365 +370 @@
       Counter evalCounter = new Counter();
       evalCounter.GetVariableInfo("Value").ActualName = "EvaluatedSolutions";
+      SubScopesRemover parentRefRemover = new SubScopesRemover();
 
       Sorter sorter = new Sorter();
@@ -375 +381 @@
       seqScopesProc.AddSubOperator(emptyOpt);
       seqScopesProc.AddSubOperator(selectedProc);
-      selectedProc.AddSubOperator(crossover);
+      selectedProc.AddSubOperator(childInitializer);
       selectedProc.AddSubOperator(individualProc);
       individualProc.AddSubOperator(individualSeqProc);
+      individualSeqProc.AddSubOperator(crossover);
       individualSeqProc.AddSubOperator(cond);
       cond.AddSubOperator(manipulator);
@@ -383 +390 @@
       individualSeqProc.AddSubOperator(validationEvaluator);
       individualSeqProc.AddSubOperator(evalCounter);
+      individualSeqProc.AddSubOperator(parentRefRemover);
       selectedProc.AddSubOperator(sorter);