Changeset 14610 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestratedAlgorithmNode.cs

Timestamp:

01/26/17 14:12:39 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added abstract base classes for ttp networks/orchestrators
• removed ttp networks/orchestrators from HeuristicLab.Networks.IntegratedOptimization
• runs can now be cleared when preparing OrchestratedAlgorithmNodes

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/OrchestratedAlgorithmNode.cs (modified) (3 diffs)

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -86 +107 @@
               var prob = (IHeuristicOptimizationProblem)problemMsgVal.Value.Clone();
 
-              if (message.HasFlag(OrchestrationMessage.QualityAdaption)) {
+              if (message.HasFlag(OrchestrationMessage.SetEvalHook)) {
                 var instEval = prob.Evaluator as InstrumentedOperator;
                 if (instEval != null && EvalHook != null) instEval.AfterExecutionOperators.Add(EvalHook);
@@ -116 +137 @@
               }
 
-              Algorithm.Prepare();
+              Algorithm.Prepare(true);
             }
             break;