Changeset 466 for trunk/sources/HeuristicLab.Operators.Metaprogramming

Timestamp:

08/07/08 09:12:59 (16 years ago)

Author:

gkronber

Message:

changed meta prog. operators to work with CombinedOperators as input and output values (this should be general policy in all operators of this plugin) (#203)

Location:

trunk/sources/HeuristicLab.Operators.Metaprogramming

Files:

• DoubleRangeVariableInjector.cs (modified) (2 diffs)
• SequentialComposer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators.Metaprogramming/DoubleRangeVariableInjector.cs

@@ -35 +35 @@
     public DoubleRangeVariableInjector()
       : base() {
-      AddVariableInfo(new VariableInfo("VariableInjector", "The operator graph that should hold the generated variable injector", typeof(IOperatorGraph), VariableKind.New));
+      AddVariableInfo(new VariableInfo("VariableInjector", "The combined operator that should hold the generated variable injector", typeof(CombinedOperator), VariableKind.New));
       AddVariableInfo(new VariableInfo("VariableName", "Name of the variable that should be injected", typeof(StringData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Min", "Minimal value of the injected variable", typeof(DoubleData), VariableKind.In));
@@ -53 +53 @@
         Scope subScope = new Scope(variableName + "<-" + value);
 
-        OperatorGraph opGraph = new OperatorGraph();
+        CombinedOperator combOp = new CombinedOperator();
         VariableInjector varInjector = new VariableInjector();
         varInjector.AddVariable(new Variable(variableName, new DoubleData(value)));
 
-        opGraph.AddOperator(varInjector);
-        opGraph.InitialOperator = varInjector;
+        combOp.OperatorGraph.AddOperator(varInjector);
+        combOp.OperatorGraph.InitialOperator = varInjector;
 
-        subScope.AddVariable(new Variable(scope.TranslateName("VariableInjector"), opGraph));
+        subScope.AddVariable(new Variable(scope.TranslateName("VariableInjector"), combOp));
         scope.AddSubScope(subScope);
       }

trunk/sources/HeuristicLab.Operators.Metaprogramming/SequentialComposer.cs

@@ -45 +45 @@
 
       foreach(StringData opName in parts) {
-        IOperatorGraph subOpGraph = scope.GetVariableValue<IOperatorGraph>(opName.Data, true);
-        foreach(IOperator op in subOpGraph.Operators)
+        CombinedOperator subOp = scope.GetVariableValue<CombinedOperator>(opName.Data, true);
+        foreach(IOperator op in subOp.OperatorGraph.Operators)
           combOp.OperatorGraph.AddOperator(op);
-        seq.AddSubOperator(subOpGraph.InitialOperator);
+        seq.AddSubOperator(subOp.OperatorGraph.InitialOperator);
       }
       combOp.OperatorGraph.AddOperator(seq);