Changeset 513 for trunk

Timestamp:

08/13/08 17:09:48 (16 years ago)

Author:

gkronber

Message:

Fixed the problem that sometimes an operator link was not patched before a view was created (which resulted in a NullException) by adding a property for the source database in OperatorLink! and updating this property recursively whenever an operator is loaded from the CEDMA DB.

The method for recursively setting the property is in static class OperatorLinkPatcher because the code is needed in Agent, DatabaseOperatorLibrary and OperatorLink.

(ticket #211)

Location:

trunk/sources/HeuristicLab.CEDMA.Core

Files:

• Agent.cs (modified) (1 diff)
• DatabaseOperatorLibrary.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core.csproj (modified) (1 diff)
• OperatorLink.cs (modified) (2 diffs)
• OperatorLinkPatcher.cs (added)

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

@@ -96 +96 @@
         foreach(IOperator op in opGraph.Operators) OperatorGraph.AddOperator(op);
         OperatorGraph.InitialOperator = opGraph.InitialOperator;
-        PatchOperatorLinks(OperatorGraph);
+        OperatorLinkPatcher.LinkDatabase(OperatorGraph, Database);
       }
       return new AgentView(this);
     }
-
-    private void PatchOperatorLinks(IOperatorGraph opGraph) {
-      foreach(IOperator op in opGraph.Operators) {
-        PatchOperatorLinks(op);
-      }
-    }
-
-    private void PatchOperatorLinks(IOperator op) {
-      if(op is OperatorLink) {
-        OperatorLink link = op as OperatorLink;
-        link.Database = Database;
-        //if(downloaded.ContainsKey(link.Id)) {
-        //  link.Operator = downloaded[link.Id];
-        //} else {
-        //  OperatorEntry targetEntry = Database.GetOperator(link.Id);
-        //  IOperator target = (IOperator)PersistenceManager.RestoreFromGZip(targetEntry.RawData);
-        //  downloaded.Add(link.Id, target);
-        //  PatchOperatorLinks(target, downloaded);
-        //  link.Operator = target;
-        //}
-      } else if(op is CombinedOperator) {
-        PatchOperatorLinks(((CombinedOperator)op).OperatorGraph);
-      }
-      // 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) {
-          PatchOperatorLinks((IOperatorGraph)var.Value);
-        } else if(var != null && var.Value is IOperator) {
-          PatchOperatorLinks((IOperator)var.Value);
-        }
-      }
-    }
   }
 }

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

@@ -85 +85 @@
       }
 
-      // patch all OperatorLinks
+      // set the DB source for each operator
       foreach(IOperator op in group.Operators) {
-        PatchLinks(op);
-      }
-    }
-
-    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.Database = Database;
-      }
-      else if(op is CombinedOperator) {
-        CombinedOperator combinedOp = op as CombinedOperator;
-        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);
-        }
+        OperatorLinkPatcher.LinkDatabase(op, Database);
       }
     }

trunk/sources/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

@@ -70 +70 @@
     </Compile>
     <Compile Include="OperatorLink.cs" />
+    <Compile Include="OperatorLinkPatcher.cs" />
     <Compile Include="Result.cs" />
     <Compile Include="IResult.cs" />

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

@@ -73 +73 @@
         OperatorEntry targetEntry = Database.GetOperator(Id);
         IOperator target = (IOperator)PersistenceManager.RestoreFromGZip(targetEntry.RawData);
-        PatchOperatorLinks(target);
+        OperatorLinkPatcher.LinkDatabase(target, Database);
         Operator = target;
       }
@@ -95 +95 @@
       base.Populate(node, restoredObjects);
     }
-
-    private void PatchOperatorLinks(IOperatorGraph opGraph) {
-      foreach(IOperator op in opGraph.Operators) {
-        PatchOperatorLinks(op);
-      }
-    }
-
-    private void PatchOperatorLinks(IOperator op) {
-      if(op is OperatorLink) {
-        OperatorLink link = op as OperatorLink;
-        link.Database = Database;
-        //if(downloaded.ContainsKey(link.Id)) {
-        //  link.Operator = downloaded[link.Id];
-        //} else {
-        //  OperatorEntry targetEntry = Database.GetOperator(link.Id);
-        //  IOperator target = (IOperator)PersistenceManager.RestoreFromGZip(targetEntry.RawData);
-        //  downloaded.Add(link.Id, target);
-        //  PatchOperatorLinks(target, downloaded);
-        //  link.Operator = target;
-        //}
-      } else if(op is CombinedOperator) {
-        PatchOperatorLinks(((CombinedOperator)op).OperatorGraph);
-      }
-      // also patch operator links contained (indirectily) in variables
-      foreach(VariableInfo varInfo in op.VariableInfos) {
-        IVariable var = op.GetVariable(varInfo.ActualName);
-        if(var != null && var.Value is IOperatorGraph) {
-          PatchOperatorLinks((IOperatorGraph)var.Value);
-        } else if(var != null && var.Value is IOperator) {
-          PatchOperatorLinks((IOperator)var.Value);
-        }
-      }
-    }
   }
 }