Changeset 11520 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Nodes/KSPTSPConnector.cs

Timestamp:

11/03/14 01:15:46 (9 years ago)

Author:

swagner

Message:

#2205: Worked on optimization networks

File:

• branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Nodes/KSPTSPConnector.cs (modified) (5 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Nodes/KSPTSPConnector.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.TravelingSalesman;
 using System.Linq;
 
@@ -33 +34 @@
     [StorableConstructor]
     protected KSPTSPConnector(bool deserializing) : base(deserializing) { }
-    protected KSPTSPConnector(KSPTSPConnector original, Cloner cloner) : base(original, cloner) { }
+    protected KSPTSPConnector(KSPTSPConnector original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterEvents();
+    }
     public KSPTSPConnector()
       : base("KSPTSPConnector") {
       Initialize();
+      RegisterEvents();
     }
     public KSPTSPConnector(string name)
       : base(name) {
       Initialize();
+      RegisterEvents();
     }
     public KSPTSPConnector(string name, string description)
       : base(name, description) {
       Initialize();
+      RegisterEvents();
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEvents();
     }
 
@@ -62 +74 @@
       ksp.Parameters.Add(new PortParameter<DoubleValue>("Quality") { Type = PortParameterType.Input | PortParameterType.Output });
       ksp.Parameters.Add(new PortParameter<DoubleValue>("TransportCosts") { Type = PortParameterType.Output });
-      ksp.MessageReceived += Knapsack_MessageReceived;
+      ksp.Parameters.Add(new PortParameter<PathTSPTour>("Route") { Type = PortParameterType.Output });
 
       var tsp = new GenericPort("TSP Connector");
       Ports.Add(tsp);
       tsp.Parameters.Add(new PortParameter<DoubleMatrix>("Coordinates") { Type = PortParameterType.Output });
-      ksp.Parameters.Add(new PortParameter<DoubleValue>("BestQuality") { Type = PortParameterType.Input });
+      tsp.Parameters.Add(new PortParameter<PathTSPTour>("Best TSP Solution") { Type = PortParameterType.Input });
+      tsp.Parameters.Add(new PortParameter<DoubleValue>("BestQuality") { Type = PortParameterType.Input });
+    }
+
+    protected virtual void RegisterEvents() {
+      var ksp = (IGenericPort)Ports["KSP Connector"];
+      ksp.MessageReceived += Knapsack_MessageReceived;
     }
 
@@ -97 +115 @@
       tspMsg["Coordinates"] = coords;
       tspConnectorPort.SendMessage(tspMsg, e.Value2);
+      var tspSolution = (PathTSPTour)tspMsg["Best TSP Solution"];
       var tspQuality = ((DoubleValue)tspMsg["BestQuality"]).Value;
 
@@ -102 +121 @@
       ((DoubleValue)kspMsg["Quality"]).Value = kspQuality - factor * tspQuality;
       kspMsg["TransportCosts"] = new DoubleValue(factor * tspQuality);
+      kspMsg["Route"] = tspSolution;
     }
   }