Changeset 1552 for trunk

Timestamp:

04/14/09 11:49:33 (16 years ago)

Author:

dtraxing

Message:

added comments, removed unused source code and added a description for the operators CreateChildren and CreateChildrenHardWired(ticket #580)

Location:

trunk/sources/HeuristicLab.SGA.Hardwired/3.3

Files:

• CreateChildren.cs (modified) (3 diffs)
• CreateChildrenHardWired.cs (modified) (2 diffs)

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

@@ -44 +44 @@
     
     public override string Description {
-      get { return @"Implements the functionality of method SGAMain hard wired."; }
+      get { return @"Implements the control structures of CreateChildren hard wired. Operators are delegated."; }
     }
 
@@ -70 +70 @@
 
     public override IOperation Apply(IScope scope) {
-
-      ci = new ChildrenInitializer();
       crossover = (OperatorBase)GetVariableValue("Crossover", scope, true);
       mutator = (OperatorBase)GetVariableValue("Mutator", scope, true);
@@ -91 +89 @@
         counter.Execute(s);
       } // foreach
-      // set evaluated solutions
-      //IntData value = GetVariableValue<IntData>("EvaluatedSolutions", scope, true);
-      //value.Data = counter;
 
-      // sort with using of operator
       sorter.Execute(scope);
-
-      // sort scopes
-      //bool descending = false;//GetVariableValue<BoolData>("Descending", scope, true).Data;
-      //double[] keys = new double[scope.SubScopes.Count];
-      //int[] sequence = new int[keys.Length];
-
-      //for (int i = 0; i < keys.Length; i++) {
-      //  keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
-      //  sequence[i] = i;
-      //}
-
-      //Array.Sort<double, int>(keys, sequence);
-
-      //if (descending) {
-      //  int temp;
-      //  for (int i = 0; i < sequence.Length / 2; i++) {
-      //    temp = sequence[i];
-      //    sequence[i] = sequence[sequence.Length - 1 - i];
-      //    sequence[sequence.Length - 1 - i] = temp;
-      //  }
-      //}
-      //scope.ReorderSubScopes(sequence);
 
       return null;
     } // Apply
-
-  } // class SGAMain
-
-} // namespace HeuristicLab.SGA
+  } // class CreateChildren
+} // namespace HeuristicLab.SGA.Hardwired

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

@@ -75 +75 @@
       // UniformSequentialSubScopesProcessor
       foreach (IScope s in scope.SubScopes) {
-        crossover.Execute(s);
+        if (crossover.Execute(s) != null)
+          throw new InvalidOperationException("ERROR: no support for combined operators!");
+
         // Stochastic Branch
-        if (random.NextDouble() < probability.Data)
-          mutator.Execute(s);
-        evaluator.Execute(s);
+        if (random.NextDouble() < probability.Data) {
+          if (mutator.Execute(s) != null)
+            throw new InvalidOperationException("ERROR: no support for combined operators!");
+        }
+
+        if (evaluator.Execute(s) != null)
+          throw new InvalidOperationException("ERROR: no support for combined operators!");
+
         // subscopes remover
         IntData index = GetVariableValue<IntData>("SubScopeIndex", s, true, false);
@@ -120 +127 @@
       return null;
     } // Apply
-
-  } // class SGAMain
-
-} // namespace HeuristicLab.SGA
+  } // class CreateChildrenHardWired
+} // namespace HeuristicLab.SGA.Hardwired