Changeset 11554 for branches/OptimizationNetworks

Timestamp:

11/17/14 03:22:32 (10 years ago)

Author:

swagner

Message:

#2205: Implemented review comments:

• added cloning of Port in HookOperator and prevented cloning of hook operator ports in AlgorithmNode instead
• added additional checks that port parameters of a hook operator port match with parameters of hook operator

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3

Files:

• Operators/HookOperator.cs (modified) (3 diffs)
• Optimization.Networks/AlgorithmNode.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Operators/HookOperator.cs

@@ -51 +51 @@
     protected HookOperator(HookOperator original, Cloner cloner)
       : base(original, cloner) {
-      // ATTENTION: port is intentionally NOT cloned
-      port = original.port;
+      port = cloner.Clone(original.port);
     }
     public HookOperator() : base() { }
@@ -73 +72 @@
           if (Parameters.TryGetValue(output.Name, out param)) {
             msg[output.Name] = param.ActualValue;
+          } else if (output.DefaultValue == null) {
+            throw new InvalidOperationException(string.Format("Cannot determine value for output parameter \"{0}\".", output.Name));
           }
         }
@@ -82 +83 @@
           if (Parameters.TryGetValue(input.Name, out param)) {
             param.ActualValue = msg[input.Name];
+          } else {
+            throw new InvalidOperationException(string.Format("Cannot find operator parameter for input parameter \"{0}\".", input.Name));
           }
         }

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Optimization.Networks/AlgorithmNode.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Core.Networks;
+using HeuristicLab.Operators;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
@@ -107 +108 @@
       IAlgorithm algorithm;
       lock (locker) {
-        algorithm = (IAlgorithm)Algorithm.Clone();
+        // prevent cloning of ports in hook operators
+        var cloner = new Cloner();
+        foreach (var hook in Algorithm.GetObjectGraphObjects(new HashSet<object>() { Algorithm.Results, Algorithm.Runs }).OfType<IHookOperator>()) {
+          cloner.RegisterClonedObject(hook.Port, hook.Port);
+        }
+        algorithm = (IAlgorithm)Algorithm.Clone(cloner);
         waitHandles.Add(algorithm, new AutoResetEvent(false));
       }