Changeset 76

Timestamp:

03/18/08 15:56:41 (17 years ago)

Author:

swagner

Message:

Fixed ticket #68

• removed aliases again after an operator has been executed

Location:

trunk/sources

Files:

• HeuristicLab.Core/OperatorBase.cs (modified) (2 diffs)
• HeuristicLab.Operators/CombinedOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/OperatorBase.cs

@@ -41 +41 @@
     }
 
-    private bool myCanceled;
+    protected bool myCanceled;
     public bool Canceled {
       get { return myCanceled; }
@@ -372 +372 @@
 
       IOperation next = Apply(scope);
+
+      foreach (IVariableInfo variableInfo in VariableInfos)
+        scope.RemoveAlias(variableInfo.FormalName);
+
       OnExecuted();
       return next;

trunk/sources/HeuristicLab.Operators/CombinedOperator.cs

@@ -64 +64 @@
     }
 
+    public override IOperation Execute(IScope scope) {
+      myCanceled = false;
+
+      if (scope.GetVariable(Guid.ToString()) == null) { // contained operator not yet executed
+        // add marker
+        scope.AddVariable(new Variable(Guid.ToString(), null));
+
+        // add aliases
+        foreach (IVariableInfo variableInfo in VariableInfos)
+          scope.AddAlias(variableInfo.FormalName, variableInfo.ActualName);
+
+        CompositeOperation next = new CompositeOperation();
+        next.AddOperation(Apply(scope));
+        // execute combined operator again after contained operators have been executed
+        next.AddOperation(new AtomicOperation(this, scope));
+
+        OnExecuted();
+        return next;
+      } else {  // contained operator already executed
+        // remove marker
+        scope.RemoveVariable(Guid.ToString());
+
+        // remove aliases
+        foreach (IVariableInfo variableInfo in VariableInfos)
+          scope.RemoveAlias(variableInfo.FormalName);
+
+        OnExecuted();
+        return null;
+      }
+    }
+
     public override IOperation Apply(IScope scope) {
       if (OperatorGraph.InitialOperator != null) {