Changeset 89 for trunk/sources

Timestamp:

03/22/08 10:52:14 (17 years ago)

Author:

gkronber

Message:

Moved abstract operator DelegatingOperator from StructureIdentification to Operators. And removed code duplication.
See ticket #55.

Location:

trunk/sources

Files:

• HeuristicLab.Operators/CombinedOperator.cs (modified) (2 diffs)
• HeuristicLab.Operators/DelegatingOperator.cs (moved) (moved from trunk/sources/HeuristicLab.StructureIdentification/DelegatingOperator.cs) (1 diff)
• HeuristicLab.Operators/HeuristicLab.Operators.csproj (modified) (1 diff)
• HeuristicLab.StructureIdentification/HeuristicLab.StructureIdentification.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Operators/CombinedOperator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Operators {
-  public class CombinedOperator : OperatorBase {
+  public class CombinedOperator : DelegatingOperator {
     private string myDescription;
     public override string Description {
@@ -62 +62 @@
       clone.myOperatorGraph = (IOperatorGraph)Auxiliary.Clone(OperatorGraph, clonedObjects);
       return clone;
-    }
-
-    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(), new NullData()));
-
-        // 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;
-      }
     }
 

trunk/sources/HeuristicLab.Operators/DelegatingOperator.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 
-namespace HeuristicLab.StructureIdentification {
+namespace HeuristicLab.Operators {
   public abstract class DelegatingOperator : OperatorBase {
     public override IOperation Execute(IScope scope) {
       myCanceled = false;
 
-      // copied from CombinedOperator (gkronber 22.3.08)
       if(scope.GetVariable(Guid.ToString()) == null) { // contained operator not yet executed
         // add marker

trunk/sources/HeuristicLab.Operators/HeuristicLab.Operators.csproj

@@ -64 +64 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DelegatingOperator.cs" />
     <Compile Include="StochasticMultiBranch.cs" />
     <Compile Include="SubScopesMixer.cs" />

trunk/sources/HeuristicLab.StructureIdentification/HeuristicLab.StructureIdentification.csproj

@@ -48 +48 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DelegatingOperator.cs" />
     <Compile Include="Evaluation\CoefficientOfDeterminationEvaluator.cs" />
     <Compile Include="Evaluation\FunctionEvaluator.cs">