Changeset 512 for trunk/sources/HeuristicLab.CEDMA.Core/DatabaseOperatorLibrary.cs

Timestamp:

08/13/08 16:33:03 (16 years ago)

Author:

gkronber

Message:

worked on #211

File:

• trunk/sources/HeuristicLab.CEDMA.Core/DatabaseOperatorLibrary.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/DatabaseOperatorLibrary.cs

@@ -91 +91 @@
     }
 
+    private void PatchLinks(IOperatorGraph opGraph) {
+      foreach(IOperator op in opGraph.Operators) {
+        PatchLinks(op);
+      }
+    }
+
     private void PatchLinks(IOperator op) {
       if(op is OperatorLink) {
         OperatorLink link = op as OperatorLink;
-        link.Operator = FindOperator(link.Id);
+        link.Database = Database;
       }
       else if(op is CombinedOperator) {
@@ -100 +106 @@
         foreach(IOperator internalOp in combinedOp.OperatorGraph.Operators) {
           PatchLinks(internalOp);
+        }
+      }
+      // also patch operator links contained (indirectly) in variables
+      foreach(VariableInfo varInfo in op.VariableInfos) {
+        IVariable var = op.GetVariable(varInfo.ActualName);
+        if(var != null && var.Value is IOperatorGraph) {
+          PatchLinks((IOperatorGraph)var.Value);
+        } else if(var != null && var.Value is IOperator) {
+          PatchLinks((IOperator)var.Value);
         }
       }