Changeset 2027 for branches/Operator Architecture Refactoring/HeuristicLab.Operators/3.2/ComparatorBase.cs

Timestamp:

06/06/09 02:09:35 (15 years ago)

Author:

swagner

Message:

Refactoring of the operator architecture (#95)

File:

• branches/Operator Architecture Refactoring/HeuristicLab.Operators/3.2/ComparatorBase.cs (modified) (2 diffs)

branches/Operator Architecture Refactoring/HeuristicLab.Operators/3.2/ComparatorBase.cs

@@ -36 +36 @@
     /// </summary>
     protected ComparatorBase() {
-      AddVariableInfo(new VariableInfo("LeftSide", "Variable on the left side of the comparison", typeof(IItem), VariableKind.In));
-      AddVariableInfo(new VariableInfo("RightSide", "Variable on the right side of the comparison", typeof(IItem), VariableKind.In));
-      AddVariableInfo(new VariableInfo("Result", "Result of the comparison", typeof(BoolData), VariableKind.Out | VariableKind.New));
+      AddParameter(new Parameter("LeftSide", "Variable on the left side of the comparison", typeof(IItem), ParameterType.In));
+      AddParameter(new Parameter("RightSide", "Variable on the right side of the comparison", typeof(IItem), ParameterType.In));
+      AddParameter(new Parameter("Result", "Result of the comparison", typeof(BoolData), ParameterType.Out));
     }
 
@@ -50 +50 @@
     /// <param name="scope">The scope where to apply the compare operation.</param>
     /// <returns><c>null</c>.</returns>
-    public override IOperation Apply(IScope scope) {
-      BoolData result = GetVariableValue<BoolData>("Result", scope, false, false);
+    public override IOperation Apply(IEnvironment env, IScope scope) {
+      string resultName = env.TranslateName("Result");
+      BoolData result = scope.GetVariableValue<BoolData>(resultName, false, false);
       if (result == null) {
         result = new BoolData(true);
-        IVariableInfo info = GetVariableInfo("Result");
-        if (info.Local)
-          AddVariable(new Variable(info.ActualName, result));
-        else
-          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), result));
+        scope.AddVariable(new Variable(resultName, result));
       }
-      IItem leftSide = GetVariableValue<IItem>("LeftSide", scope, true);
+      IItem leftSide = scope.GetVariableValue<IItem>(env.TranslateName("LeftSide"), true);
       if (!(leftSide is IComparable)) throw new InvalidOperationException("Comparator: Left side needs to be of type IComparable");
       IComparable left = (IComparable)leftSide;
-      IItem rightSide = GetVariableValue<IItem>("RightSide", scope, true);
+      IItem rightSide = scope.GetVariableValue<IItem>(env.TranslateName("RightSide"), true);
       result.Data = Compare(left, rightSide);
       return null;