Changeset 2129 for trunk/sources/HeuristicLab.FixedOperators/3.2/FixedOSGAMain.cs

Timestamp:

07/02/09 12:25:32 (15 years ago)

Author:

dtraxing

Message:

Algorithm continuation bug fixed. (ticket #580)

File:

• trunk/sources/HeuristicLab.FixedOperators/3.2/FixedOSGAMain.cs (modified) (3 diffs)

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

@@ -66 +66 @@
       IScope s;
       IScope s2;
+      bool loopSkipped = true;
+      bool running = false;
 
       DoubleData selectionPressure = null;
@@ -105 +107 @@
               Execute(wofc, s2);
               Execute(sr, s2);
+              loopSkipped = false;
+            } // foreach
 
-            } // foreach
-            subscopeNr.Data = 0;
+            // if for loop skipped, we had to add skiped operations
+            // to execution pointer.
+            if (loopSkipped)
+              executionPointer += 5;
 
             Execute(sorter, s);
             ////// END Create Children //////
-
-
-          } while (os.Execute(scope) != null);
+            
+            running = ExecuteFirstOperator(os, scope);
+            if (running) subscopeNr.Data = 0;
+          } while (running);
 
           DoReplacement(scope);
@@ -129 +136 @@
             break;
 
+          subscopeNr.Data = 0;
           ResetExecutionPointer();
         } // for i generations