Changeset 11530 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/Optimization.Networks.KSPTSP/KSPTSPConnector.cs

Timestamp:

11/10/14 04:24:04 (9 years ago)

Author:

swagner

Message:

#2205: Implemented review comments

• renamed GenericPort to MessagePort
• refactored CanConnectToPort
• refactored PrepareMessage
• removed IConnectedPort

Additional changes:

• added UserDefinedMessagePort
• refactored CloneConnectedPortParameters to CloneParametersFromPort and moved it to ParameterizedPort
• added ports to NetworkView

File:

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

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

@@ -65 +65 @@
 
     protected virtual void Initialize() {
-      var parameters = new GenericPort("Parameters");
+      var parameters = new MessagePort("Parameters");
       Ports.Add(parameters);
       parameters.Parameters.Add(new PortParameter<DoubleMatrix>("Cities") { Type = PortParameterType.Input });
       parameters.Parameters.Add(new PortParameter<DoubleValue>("TransportCostsFactor") { Type = PortParameterType.Input });
 
-      var ksp = new GenericPort("KSP Connector");
+      var ksp = new MessagePort("KSP Connector");
       Ports.Add(ksp);
       ksp.Parameters.Add(new PortParameter<BinaryVector>("KnapsackSolution") { Type = PortParameterType.Input });
@@ -77 +77 @@
       ksp.Parameters.Add(new PortParameter<PathTSPTour>("Route") { Type = PortParameterType.Output });
 
-      var tsp = new GenericPort("TSP Connector");
+      var tsp = new MessagePort("TSP Connector");
       Ports.Add(tsp);
       tsp.Parameters.Add(new PortParameter<DoubleMatrix>("Coordinates") { Type = PortParameterType.Output });
@@ -85 +85 @@
 
     protected virtual void RegisterEvents() {
-      var ksp = (IGenericPort)Ports["KSP Connector"];
+      var ksp = (IMessagePort)Ports["KSP Connector"];
       ksp.MessageReceived += Knapsack_MessageReceived;
     }
@@ -91 +91 @@
     protected virtual void Knapsack_MessageReceived(object sender, EventArgs<IMessage, System.Threading.CancellationToken> e) {
       // get parameters
-      var parametersPort = (IGenericPort)Ports["Parameters"];
+      var parametersPort = (IMessagePort)Ports["Parameters"];
       var parameters = parametersPort.PrepareMessage();
       parametersPort.SendMessage(parameters, e.Value2);
@@ -112 +112 @@
 
       // solve TSP
-      var tspConnectorPort = (IGenericPort)Ports["TSP Connector"];
+      var tspConnectorPort = (IMessagePort)Ports["TSP Connector"];
       var tspMsg = tspConnectorPort.PrepareMessage();
       tspMsg["Coordinates"] = coords;