Changeset 1900

Timestamp:

05/26/09 23:09:19 (16 years ago)

Author:

dtraxing

Message:

new implementation for fixed sga main (ticket #580)

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

• FixedOperatorBase.cs (modified) (1 diff)
• FixedSGAMain.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.FixedOperators/3.2/FixedOperatorBase.cs

@@ -65 +65 @@
         ExecuteOperation(op, scope);
         persistedExecutionPointer.Data++;
+        //Console.WriteLine("Execute: {0}", executionPointer);
       } // if not executed
+      //else
+        //Console.WriteLine("Skip Execute: {0}", executionPointer);
       executionPointer++;
 

trunk/sources/HeuristicLab.FixedOperators/3.2/FixedSGAMain.cs

@@ -143 +143 @@
       IntData maxGenerations = GetVariableValue<IntData>("MaximumGenerations", scope, true);
       IntData nrOfGenerations = GetVariableValue<IntData>("Generations", scope, true);
-      nrOfGenerations.Data = 0;
-
-      IntData subscopeNr = new IntData(0);
+      //nrOfGenerations.Data = 0;
+
+      IntData subscopeNr;
+      try {
+        subscopeNr = scope.GetVariableValue<IntData>("SubScopeNr", false);
+      }
+      catch (Exception) {
+        subscopeNr = new IntData(0);
+        scope.AddVariable(new Variable("SubScopeNr", subscopeNr));
+      }
+
+      EmptyOperator empty = new EmptyOperator();
 
       IScope s;
       IScope s2;
-      int tempExePointer;
-      int tempPersExePointer;
+      int tempExePointer = 0;
+      int tempPersExePointer = 0;
       // fetch variables from scope for create children
       InitializeExecuteCreateChildren(scope);
       try {
         for (int i = nrOfGenerations.Data; i < maxGenerations.Data; i++) {
+          if (executionPointer == persistedExecutionPointer.Data)
+            persistedExecutionPointer.Data = 0;
+          executionPointer = 0;
+          
           Execute(selector, scope);
 
@@ -161 +174 @@
           s = scope.SubScopes[1];
           Execute(ci, s);
+          
           tempExePointer = executionPointer;
           tempPersExePointer = persistedExecutionPointer.Data;
           // UniformSequentialSubScopesProcessor
           for (int j = subscopeNr.Data; j < s.SubScopes.Count; j++ ) {
+            if (executionPointer == persistedExecutionPointer.Data)
+              persistedExecutionPointer.Data = tempExePointer;
             executionPointer = tempExePointer;
-            persistedExecutionPointer.Data = tempPersExePointer;
+            
             s2 = s.SubScopes[j];
             Execute(crossover, s2);
@@ -172 +188 @@
             if (random.NextDouble() < probability.Data)
               Execute(mutator, s2);
+            else
+              Execute(empty, s2);
             Execute(evaluator, s2);
             Execute(sr, s2);
             Execute(counter, s2);
+            subscopeNr.Data++;
           } // foreach
+          
 
           Execute(sorter, s);
@@ -185 +205 @@
           Execute(dc, scope);
           Execute(lci, scope);
+          subscopeNr.Data = 0;
           nrOfGenerations.Data++;
         } // for i