Changeset 14631

Timestamp:

02/01/17 10:17:12 (8 years ago)

Author:

mkommend

Message:

#2205: Updated OrchestratedAlgorithmNode to work with problems as well.

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Networks.IntegratedOptimization.MachineLearning/FeatureSelectionOrchestrator.cs (modified) (2 diffs)
• HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestratedAlgorithmNode.cs (modified) (5 diffs)

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

@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 
 namespace HeuristicLab.Networks.IntegratedOptimization.MachineLearning {
@@ -103 +102 @@
 
       var orchestrationMessage = RegressionOrchestrationPort.PrepareMessage();
-      orchestrationMessage["Problem"] = new SymbolicRegressionSingleObjectiveProblem() { ProblemData = problemData };
+      orchestrationMessage["Problem"] = new RegressionProblem() { ProblemData = problemData };
       orchestrationMessage["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare);
       RegressionOrchestrationPort.SendMessage(orchestrationMessage, token);

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);
@@ -106 +108 @@
             IMessageValue problemMsgVal;
             if (e.Value.Values.TryGetValue("Problem", out problemMsgVal)) {
-              var prob = (IHeuristicOptimizationProblem)problemMsgVal.Value.Clone();
-
-              if (messageFlags.HasFlag(OrchestrationMessage.SetEvalHook)) {
-                var instEval = prob.Evaluator as InstrumentedOperator;
+              var problem = (IProblem)problemMsgVal.Value.Clone();
+
+              var heuristicOptimizationProblem = problem as IHeuristicOptimizationProblem;
+              if (heuristicOptimizationProblem != null && messageFlags.HasFlag(OrchestrationMessage.SetEvalHook)) {
+                var instEval = heuristicOptimizationProblem.Evaluator as InstrumentedOperator;
                 if (instEval != null && EvalHook != null) instEval.AfterExecutionOperators.Add(EvalHook);
               }
@@ -122 +125 @@
               }
 
-              Algorithm.Problem = prob;
+              Algorithm.Problem = problem;
 
               if (multiAnalyzer != null) {
@@ -189 +192 @@
           try {
             Algorithm.Pause();
-          } catch (InvalidOperationException) {
+          }
+          catch (InvalidOperationException) {
             // ExecutionState might have changed since we accepted the message
           }
@@ -203 +207 @@
             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