Changeset 1731


Ignore:
Timestamp:
05/04/09 16:28:35 (12 years ago)
Author:
dtraxing
Message:

Updated FixedSGAMain (ticket #580)

Location:
trunk/sources/HeuristicLab.FixedOperators/3.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.FixedOperators/3.2/FixedBase.cs

    r1693 r1731  
    4646          }
    4747          catch (Exception) {
    48             // push operation on stack again
    49             executionStack.Push(atomicOperation);
    5048            //Abort();
    5149            //ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
     
    5452          if (next != null)
    5553            executionStack.Push(next);
    56           //OnOperationExecuted(atomicOperation);
    57           //if (atomicOperation.Operator.Breakpoint) Abort();
    5854        } else if (operation is CompositeOperation) {
    5955          CompositeOperation compositeOperation = (CompositeOperation)operation;
  • trunk/sources/HeuristicLab.FixedOperators/3.2/FixedSGAMain.cs

    r1693 r1731  
    113113      Stopwatch swApply = new Stopwatch();
    114114      swApply.Start();
    115       //base.Apply(scope); // noch nachfragen ob das auch in ordnung wäre
    116115      for (int i = 0; i < SubOperators.Count; i++) {
    117116        if (scope.GetVariable(SubOperators[i].Name) != null)
     
    145144      // executionpointer saves the reentry point after engine abort occurs.
    146145      IntData executionPointer;
    147       try
    148       {
    149         executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
    150       }
    151       catch (Exception)
    152       {
     146      try {
     147        executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
     148      }
     149      catch (Exception) {
    153150        scope.AddVariable(new Variable("ExecutionPointer", new IntData(-1)));
    154151        executionPointer = GetVariableValue<IntData>("ExecutionPointer", scope, true);
    155152      }
    156      
     153
    157154      // fetch variables from scope for create children
    158155      InitializeExecuteCreateChildren(scope);
     
    245242    } // Apply
    246243
    247  
     244
    248245
    249246    /// <summary>
     
    262259    }
    263260
     261    /// <summary>
     262    ///
     263    /// </summary>
     264    /// <param name="scope"></param>
    264265    protected void ExecuteCreateChildrenWithFixedControlStructures(IScope scope) {
    265266      // ChildrenInitializer
Note: See TracChangeset for help on using the changeset viewer.