Changeset 14635 for branches/OptimizationNetworks

Timestamp:

02/01/17 18:25:28 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• created default parameters for orchestration and evaluation ports
• adapted FeatureSelectionNetwork

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Networks.IntegratedOptimization.MachineLearning/FeatureSelectionNetwork.cs (modified) (6 diffs)
• HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestratedAlgorithmNode.cs (modified) (6 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.MachineLearning/FeatureSelectionNetwork.cs

@@ -60 +60 @@
 
       var featureSelectionAlgorithm = CreateFeatureSelectionAlgorithm();
-      //TOO configure FeatureSelectionProblem
+      //TODO configure FeatureSelectionProblem
 
       FeatureSelectionAlgorithmNode = new OrchestratedAlgorithmNode("Feature Selection");
@@ -69 +69 @@
 
       var regressionAlgorithm = CreateRegressionAlgorithm();
-      //TODO set empty regresion problem
+      //TODO set empty regression problem
 
       RegressionAlgorithmNode = new OrchestratedAlgorithmNode("Regression");
       RegressionAlgorithmNode.Algorithm = regressionAlgorithm;
-      RegressionAlgorithmNode.OrchestrationPort.ConnectedPort = Orchestrator.RegressionOrchestrationPort;
+      Orchestrator.RegressionOrchestrationPort.ConnectedPort = RegressionAlgorithmNode.OrchestrationPort;
       RegressionAlgorithmNode.OrchestrationPort.CloneParametersFromPort(Orchestrator.RegressionOrchestrationPort);
       Nodes.Add(RegressionAlgorithmNode);
@@ -103 +103 @@
     public void Prepare(bool clearRuns) {
       var msg = FeatureSelectionAlgorithmNode.OrchestrationPort.PrepareMessage();
-      msg.Values.Add(new MessageValue<EnumValue<OrchestrationMessage>>("OrchestrationMessage"));
       if (clearRuns)
         msg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.ClearRuns);
@@ -116 +115 @@
 
       var msg = FeatureSelectionAlgorithmNode.OrchestrationPort.PrepareMessage();
-      msg.Values.Add(new MessageValue<EnumValue<OrchestrationMessage>>("OrchestrationMessage"));
       msg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Start);
       FeatureSelectionAlgorithmNode.OrchestrationPort.ReceiveMessage(msg, new CancellationToken());
@@ -122 +120 @@
     public void Pause() {
       var msg = FeatureSelectionAlgorithmNode.OrchestrationPort.PrepareMessage();
-      msg.Values.Add(new MessageValue<EnumValue<OrchestrationMessage>>("OrchestrationMessage"));
       msg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Pause);
       FeatureSelectionAlgorithmNode.OrchestrationPort.ReceiveMessage(msg, new CancellationToken());
@@ -128 +125 @@
     public void Stop() {
       var msg = FeatureSelectionAlgorithmNode.OrchestrationPort.PrepareMessage();
-      msg.Values.Add(new MessageValue<EnumValue<OrchestrationMessage>>("OrchestrationMessage"));
       msg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Stop);
       FeatureSelectionAlgorithmNode.OrchestrationPort.ReceiveMessage(msg, new CancellationToken()); ;

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestratedAlgorithmNode.cs

@@ -73 +73 @@
     public OrchestratedAlgorithmNode(string name)
       : base(name) {
-      var orchestrationPort = new MessagePort(OrchestrationPortName);
-      Ports.Add(orchestrationPort);
-
-      var evaluationPort = new MessagePort(EvaluationPortName);
-      Ports.Add(evaluationPort);
+      Ports.Add(CreateOrchestrationPort<IProblem>(OrchestrationPortName));
+      Ports.Add(CreateEvaluationPort<IItem>(EvaluationPortName, "Solution", "Quality"));
 
       RegisterEvents();
@@ -93 +90 @@
     private void RegisterEvents() {
       OrchestrationPort.MessageReceived += OrchestrationPort_MessageReceived;
+    }
+
+    protected IMessagePort CreateOrchestrationPort<T>(string portName) where T : class, IProblem {
+      var orchestrationPort = new MessagePort(portName);
+      orchestrationPort.Parameters.Add(new PortParameter<EnumValue<OrchestrationMessage>>("OrchestrationMessage") {
+        Type = PortParameterType.Input
+      });
+      orchestrationPort.Parameters.Add(new PortParameter<T>("Problem") {
+        Type = PortParameterType.Input
+      });
+      orchestrationPort.Parameters.Add(new PortParameter<ResultCollection>("Results") {
+        Type = PortParameterType.Output
+      });
+      return orchestrationPort;
+    }
+
+    protected IMessagePort CreateEvaluationPort<T>(string portName, string solutionName, string qualityName) where T : class, IItem {
+      var evaluationPort = new MessagePort(portName);
+      evaluationPort.Parameters.Add(new PortParameter<T>(solutionName) {
+        Type = PortParameterType.Output
+      });
+      evaluationPort.Parameters.Add(new PortParameter<DoubleValue>(qualityName) {
+        Type = PortParameterType.Input | PortParameterType.Output
+      });
+      return evaluationPort;
     }
 
@@ -106 +128 @@
           case ExecutionState.Paused:
           case ExecutionState.Stopped:
-            IMessageValue problemMsgVal;
-            if (e.Value.Values.TryGetValue("Problem", out problemMsgVal)) {
-              var problem = (IProblem)problemMsgVal.Value.Clone();
+            var problem = (IProblem)requestMessage["Problem"];
+            if (problem != null) {
+              problem = (IProblem)problem.Clone();
 
               var heuristicOptimizationProblem = problem as IHeuristicOptimizationProblem;
@@ -140 +162 @@
                 }
               }
-
-              Algorithm.Prepare(messageFlags.HasFlag(OrchestrationMessage.ClearRuns));
             }
+
+
+            Algorithm.Prepare(messageFlags.HasFlag(OrchestrationMessage.ClearRuns));
             break;
         }
@@ -192 +215 @@
           try {
             Algorithm.Pause();
-          }
-          catch (InvalidOperationException) {
+          } catch (InvalidOperationException) {
             // ExecutionState might have changed since we accepted the message
           }
@@ -207 +229 @@
             try {
               Algorithm.Stop();
-            }
-            catch (InvalidOperationException) {
+            } catch (InvalidOperationException) {
               // ExecutionState might have changed since we accepted the message
-            }
-            catch (NullReferenceException) {
+            } catch (NullReferenceException) {
               // BasicAlgorithm might have stopped since we accepted the message
               // CancellationTokenSource is null in this case