Changeset 1550 for trunk/sources

Timestamp:

04/14/09 00:16:08 (16 years ago)

Author:

dtraxing

Message:

added support for exchangeable operators in sga for crossover, mutation and evaluation (ticket #580)

File:

• trunk/sources/HeuristicLab.SGA.Hardwired/3.3/CreateChildren.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.SGA.Hardwired/3.3/CreateChildren.cs

@@ -34 +34 @@
   class CreateChildren : OperatorBase {
     ChildrenInitializer ci;
-    OrderCrossover oc;
-    InversionManipulator im;
-    RoundedEuclideanPathTSPEvaluator repTSPe;
+    OperatorBase crossover;
+    OperatorBase mutator;
+    OperatorBase evaluator;
     SubScopesRemover sr;
     Counter counter;
@@ -50 +50 @@
       : base() {
       ci = new ChildrenInitializer();
-      oc = new OrderCrossover();
-      im = new InversionManipulator();
-      repTSPe = new RoundedEuclideanPathTSPEvaluator();
   
-      // variables for stochastic branch
+      // variables infos
       AddVariableInfo(new VariableInfo("Random", "Pseudo random number generator", typeof(IRandom), VariableKind.In));
       AddVariableInfo(new VariableInfo("MutationRate", "Probability to choose first branch", typeof(DoubleData), VariableKind.In));
-            
+      AddVariableInfo(new VariableInfo("Crossover", "Crossover strategy for SGA", typeof(OperatorBase), VariableKind.In));
+      AddVariableInfo(new VariableInfo("Mutator", "Mutation strategy for SGA", typeof(OperatorBase), VariableKind.In));
+      AddVariableInfo(new VariableInfo("Evaluator", "Evaluation strategy for SGA", typeof(OperatorBase), VariableKind.In));
+
       sr = new SubScopesRemover();
       sr.GetVariableInfo("SubScopeIndex").Local = true;
@@ -69 +69 @@
     }
 
-    void valueInfo_ActualNameChanged(object sender, EventArgs e) {
-      throw new NotImplementedException();
-    } // SGAMain()
+    public override IOperation Apply(IScope scope) {
 
-    public override IOperation Apply(IScope scope) {
+      ci = new ChildrenInitializer();
+      crossover = (OperatorBase)GetVariableValue("Crossover", scope, true);
+      mutator = (OperatorBase)GetVariableValue("Mutator", scope, true);
+      evaluator = GetVariableValue<OperatorBase>("Evaluator", scope, true);
 
       random = GetVariableValue<IRandom>("Random", scope, true);
@@ -82 +83 @@
       // UniformSequentialSubScopesProcessor
       foreach (IScope s in scope.SubScopes) {
-        oc.Execute(s);
-        
+        crossover.Execute(s);
+        // Stochastic Branch
         if(random.NextDouble() < probability.Data)
-          im.Execute(s);
-        repTSPe.Execute(s);
+          mutator.Execute(s);
+        evaluator.Execute(s);
         sr.Execute(s);
         counter.Execute(s);