Changeset 14624

Timestamp:

01/31/17 13:58:50 (7 years ago)

Author:

mkommend

Message:

#2205: Refactored messages in orchestrated algorithm node.

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3

Files:

• OrchestratedAlgorithmNode.cs (modified) (9 diffs)
• OrchestratorNode.cs (modified) (5 diffs)

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

@@ -65 +65 @@
     [StorableConstructor]
     protected OrchestratedAlgorithmNode(bool deserializing) : base(deserializing) { }
-    protected OrchestratedAlgorithmNode(OrchestratedAlgorithmNode original, Cloner cloner) : base(original, cloner) {
+    protected OrchestratedAlgorithmNode(OrchestratedAlgorithmNode original, Cloner cloner)
+      : base(original, cloner) {
       EvalHook = cloner.Clone(original.EvalHook);
       RegisterEvents();
     }
     public OrchestratedAlgorithmNode() : this("OrchestratedAlgorithmNode") { }
-    public OrchestratedAlgorithmNode(string name) : base(name) {
+    public OrchestratedAlgorithmNode(string name)
+      : base(name) {
       var orchestrationPort = new MessagePort(OrchestrationPortName);
       Ports.Add(orchestrationPort);
@@ -95 +97 @@
     #region Port Events
     private void OrchestrationPort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
-      var message = ((EnumValue<OrchestrationMessage>)e.Value["OrchestrationMessage"]).Value;
+      var message = e.Value;
+      var orchestrationMessage = ((EnumValue<OrchestrationMessage>)message["OrchestrationMessage"]).Value;
 
       #region Prepare
-      if (message.HasFlag(OrchestrationMessage.Prepare)) {
+      if (orchestrationMessage.HasFlag(OrchestrationMessage.Prepare)) {
         switch (Algorithm.ExecutionState) {
           case ExecutionState.Prepared:
@@ -107 +110 @@
               var prob = (IHeuristicOptimizationProblem)problemMsgVal.Value.Clone();
 
-              if (message.HasFlag(OrchestrationMessage.SetEvalHook)) {
+              if (orchestrationMessage.HasFlag(OrchestrationMessage.SetEvalHook)) {
                 var instEval = prob.Evaluator as InstrumentedOperator;
                 if (instEval != null && EvalHook != null) instEval.AfterExecutionOperators.Add(EvalHook);
@@ -137 +140 @@
               }
 
-              Algorithm.Prepare(message.HasFlag(OrchestrationMessage.ClearRuns));
+              Algorithm.Prepare(orchestrationMessage.HasFlag(OrchestrationMessage.ClearRuns));
             }
             break;
@@ -145 +148 @@
 
       #region Start
-      if (message.HasFlag(OrchestrationMessage.Start)) {
+      if (orchestrationMessage.HasFlag(OrchestrationMessage.Start)) {
         switch (Algorithm.ExecutionState) {
           case ExecutionState.Prepared:
@@ -172 +175 @@
 
             if (sendResultMessage) {
+              message["Results"] = (ResultCollection)Algorithm.Results.Clone();
               var msg = OrchestrationPort.PrepareMessage();
               msg["Results"] = (ResultCollection)Algorithm.Results.Clone();
@@ -182 +186 @@
 
       #region Pause
-      if (message.HasFlag(OrchestrationMessage.Pause)) {
+      if (orchestrationMessage.HasFlag(OrchestrationMessage.Pause)) {
         if (Algorithm.ExecutionState == ExecutionState.Started) {
           sendResultMessage = false;
           try {
             Algorithm.Pause();
-          } catch (InvalidOperationException) {
+          }
+          catch (InvalidOperationException) {
             // ExecutionState might have changed since we accepted the message
           }
@@ -195 +200 @@
 
       #region Stop
-      if (message.HasFlag(OrchestrationMessage.Stop)) {
+      if (orchestrationMessage.HasFlag(OrchestrationMessage.Stop)) {
         switch (Algorithm.ExecutionState) {
           case ExecutionState.Started:
@@ -201 +206 @@
             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

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

@@ -35 +35 @@
   [StorableClass]
   public abstract class OrchestratorNode : Node, IOrchestratorNode {
+    //TODO remove suffixes
     #region Constants
     protected const string OrchestrationMessageParameterName = "OrchestrationMessage";
-    protected const string OrchestrationPortNameSuffix = "OrchestrationPort";
-    protected const string EvaluationPortNameSuffix = "EvaluationPort";
+    protected const string OrchestrationPortNameSuffix = "";
+    protected const string EvaluationPortNameSuffix = "";
     #endregion
 
@@ -62 +63 @@
     [StorableConstructor]
     protected OrchestratorNode(bool deserializing) : base(deserializing) { }
-    protected OrchestratorNode(OrchestratorNode original, Cloner cloner) : base(original, cloner) {
+    protected OrchestratorNode(OrchestratorNode original, Cloner cloner)
+      : base(original, cloner) {
       results = cloner.Clone(original.results);
       parameters = cloner.Clone(original.parameters);
@@ -69 +71 @@
     }
 
-    protected OrchestratorNode() : base("OrchestratorNode") {
+    protected OrchestratorNode()
+      : base("OrchestratorNode") {
       results = new ResultCollection();
       parameters = new ParameterCollection();
@@ -75 +78 @@
       readOnlyParameters = null;
     }
-    protected OrchestratorNode(string name) : base(name) {
+    protected OrchestratorNode(string name)
+      : base(name) {
       results = new ResultCollection();
       parameters = new ParameterCollection();
@@ -81 +85 @@
       readOnlyParameters = null;
     }
-    protected OrchestratorNode(string name, string description) : base(name, description) {
+    protected OrchestratorNode(string name, string description)
+      : base(name, description) {
       results = new ResultCollection();
       parameters = new ParameterCollection();