Changeset 14628 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization

Timestamp:

01/31/17 16:54:03 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added variegation problem for minimization and maximization
• refactored some classes

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3

Files:

• HeuristicLab.Networks.IntegratedOptimization-3.3.csproj (modified) (1 diff)
• MaximizationVariegationProblem.cs (added)
• MinimizationVariegationProblem.cs (added)
• OrchestratedAlgorithmNode.cs (modified) (9 diffs)
• OrchestratorNode.cs (modified) (6 diffs)
• VariegationProblem.cs (deleted)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/HeuristicLab.Networks.IntegratedOptimization-3.3.csproj

@@ -131 +131 @@
   <ItemGroup>
     <Compile Include="IOrchestratorNode.cs" />
+    <Compile Include="MaximizationVariegationProblem.cs" />
+    <Compile Include="MinimizationVariegationProblem.cs" />
     <Compile Include="OrchestratedAlgorithmNode.cs" />
     <Compile Include="OrchestrationMessage.cs" />
     <Compile Include="OrchestratorNode.cs" />
-    <Compile Include="VariegationProblem.cs" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

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);
@@ -97 +95 @@
     #region Port Events
     private void OrchestrationPort_MessageReceived(object sender, EventArgs<IMessage, CancellationToken> e) {
-      var message = e.Value;
-      var orchestrationMessage = ((EnumValue<OrchestrationMessage>)message["OrchestrationMessage"]).Value;
+      var requestMessage = e.Value;
+      var messageFlags = ((EnumValue<OrchestrationMessage>)requestMessage["OrchestrationMessage"]).Value;
 
       #region Prepare
-      if (orchestrationMessage.HasFlag(OrchestrationMessage.Prepare)) {
+      if (messageFlags.HasFlag(OrchestrationMessage.Prepare)) {
         switch (Algorithm.ExecutionState) {
           case ExecutionState.Prepared:
@@ -110 +108 @@
               var prob = (IHeuristicOptimizationProblem)problemMsgVal.Value.Clone();
 
-              if (orchestrationMessage.HasFlag(OrchestrationMessage.SetEvalHook)) {
+              if (messageFlags.HasFlag(OrchestrationMessage.SetEvalHook)) {
                 var instEval = prob.Evaluator as InstrumentedOperator;
                 if (instEval != null && EvalHook != null) instEval.AfterExecutionOperators.Add(EvalHook);
@@ -140 +138 @@
               }
 
-              Algorithm.Prepare(orchestrationMessage.HasFlag(OrchestrationMessage.ClearRuns));
+              Algorithm.Prepare(messageFlags.HasFlag(OrchestrationMessage.ClearRuns));
             }
             break;
@@ -148 +146 @@
 
       #region Start
-      if (orchestrationMessage.HasFlag(OrchestrationMessage.Start)) {
+      if (messageFlags.HasFlag(OrchestrationMessage.Start)) {
         switch (Algorithm.ExecutionState) {
           case ExecutionState.Prepared:
@@ -175 +173 @@
 
             if (sendResultMessage) {
-              message["Results"] = (ResultCollection)Algorithm.Results.Clone();
-              var msg = OrchestrationPort.PrepareMessage();
-              msg["Results"] = (ResultCollection)Algorithm.Results.Clone();
-              OrchestrationPort.SendMessage(msg);
+              requestMessage["Results"] = (ResultCollection)Algorithm.Results.Clone();
+              var responseMessage = OrchestrationPort.PrepareMessage();
+              responseMessage["Results"] = (ResultCollection)Algorithm.Results.Clone();
+              OrchestrationPort.SendMessage(responseMessage);
             } else sendResultMessage = true;
             break;
@@ -186 +184 @@
 
       #region Pause
-      if (orchestrationMessage.HasFlag(OrchestrationMessage.Pause)) {
+      if (messageFlags.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
           }
@@ -200 +197 @@
 
       #region Stop
-      if (orchestrationMessage.HasFlag(OrchestrationMessage.Stop)) {
+      if (messageFlags.HasFlag(OrchestrationMessage.Stop)) {
         switch (Algorithm.ExecutionState) {
           case ExecutionState.Started:
@@ -206 +203 @@
             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

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -35 +34 @@
   [StorableClass]
   public abstract class OrchestratorNode : Node, IOrchestratorNode {
-    //TODO remove suffixes
-    #region Constants
-    protected const string OrchestrationMessageParameterName = "OrchestrationMessage";
-    protected const string OrchestrationPortNameSuffix = "";
-    protected const string EvaluationPortNameSuffix = "";
-    #endregion
-
     [Storable]
     private ParameterCollection parameters;
@@ -63 +55 @@
     [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);
@@ -71 +62 @@
     }
 
-    protected OrchestratorNode()
-      : base("OrchestratorNode") {
+    protected OrchestratorNode() : base("OrchestratorNode") {
       results = new ResultCollection();
       parameters = new ParameterCollection();
-      Parameters.Add(new ValueParameter<EnumValue<OrchestrationMessage>>("OrchestrationMessage", new EnumValue<OrchestrationMessage>()));
       readOnlyParameters = null;
     }
-    protected OrchestratorNode(string name)
-      : base(name) {
+    protected OrchestratorNode(string name) : base(name) {
       results = new ResultCollection();
       parameters = new ParameterCollection();
-      Parameters.Add(new ValueParameter<EnumValue<OrchestrationMessage>>("OrchestrationMessage", new EnumValue<OrchestrationMessage>()));
       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();
-      Parameters.Add(new ValueParameter<EnumValue<OrchestrationMessage>>("OrchestrationMessage", new EnumValue<OrchestrationMessage>()));
       readOnlyParameters = null;
     }
@@ -102 +87 @@
     }
 
-    protected IMessagePort CreateOrchestrationPort<T>(string solverName) where T : class, IProblem {
-      var orchestrationPort = new MessagePort(solverName + OrchestrationPortNameSuffix);
+    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.Output
@@ -116 +101 @@
     }
 
-    protected IMessagePort CreateEvaluationPort<T>(string solverName, string solutionName, string qualityName) where T : class, IItem {
-      var evaluationPort = new MessagePort(solverName + EvaluationPortNameSuffix);
+    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.Input