Changeset 1731

Timestamp:

05/04/09 16:28:35 (15 years ago)

Author:

dtraxing

Message:

Updated FixedSGAMain (ticket #580)

Location:

trunk/sources/HeuristicLab.FixedOperators/3.2

Files:

• FixedBase.cs (modified) (2 diffs)
• FixedSGAMain.cs (modified) (4 diffs)

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

@@ -46 +46 @@
           }
           catch (Exception) {
-            // push operation on stack again
-            executionStack.Push(atomicOperation);
             //Abort();
             //ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
@@ -54 +52 @@
           if (next != null)
             executionStack.Push(next);
-          //OnOperationExecuted(atomicOperation);
-          //if (atomicOperation.Operator.Breakpoint) Abort();
         } else if (operation is CompositeOperation) {
           CompositeOperation compositeOperation = (CompositeOperation)operation;

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

@@ -113 +113 @@
       Stopwatch swApply = new Stopwatch();
       swApply.Start();
-      //base.Apply(scope); // noch nachfragen ob das auch in ordnung wäre
       for (int i = 0; i < SubOperators.Count; i++) {
         if (scope.GetVariable(SubOperators[i].Name) != null)
@@ -145 +144 @@
       // executionpointer saves the reentry point after engine abort occurs.
       IntData executionPointer;
-      try 
-      {
-        executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
-      }
-      catch (Exception)
-      {
+      try {
+        executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
+      }
+      catch (Exception) {
         scope.AddVariable(new Variable("ExecutionPointer", new IntData(-1)));
         executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
       }
-      
+
       // fetch variables from scope for create children
       InitializeExecuteCreateChildren(scope);
@@ -245 +242 @@
     } // Apply
 
-  
+
 
     /// <summary>
@@ -262 +259 @@
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="scope"></param>
     protected void ExecuteCreateChildrenWithFixedControlStructures(IScope scope) {
       // ChildrenInitializer