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

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

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3

Files:

• HeuristicLab.Networks.IntegratedOptimization-3.3.csproj (modified) (1 diff)
• IOrchestratorNode.cs (modified) (2 diffs)
• OrchestratedAlgorithmNode.cs (modified) (3 diffs)
• OrchestrationMessage.cs (modified) (2 diffs)
• OrchestratorNode.cs (modified) (2 diffs)
• TtpNetwork.cs (deleted)
• TtpNetwork2.cs (deleted)
• TtpNetwork4.cs (deleted)
• TtpOrchestratorNode1.cs (deleted)
• TtpOrchestratorNode2.cs (deleted)
• TtpOrchestratorNode4.cs (deleted)
• VariegationProblem.cs (modified) (1 diff)

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

@@ -231 +231 @@
     <Compile Include="OrchestratorNode.cs" />
     <Compile Include="VariegationProblem.cs" />
-    <Compile Include="TtpNetwork.cs" />
-    <Compile Include="TtpNetwork2.cs" />
-    <Compile Include="TtpNetwork4.cs" />
-    <Compile Include="TtpOrchestratorNode1.cs" />
-    <Compile Include="TtpOrchestratorNode2.cs" />
-    <Compile Include="TtpOrchestratorNode4.cs" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

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

@@ -1 @@
-using System.Threading.Tasks;
+#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.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Networks;
@@ -9 +30 @@
     ResultCollection Results { get; }
 
-    void Prepare();
-    Task PrepareAsync();
+    void Prepare(bool clearRuns = false);
+    Task PrepareAsync(bool clearRuns = false);
     void Start();
     Task StartAsync();

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;

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
   [Flags]
   public enum OrchestrationMessage {
-    Unknown = 0x0,
-    Prepare = 0x1,
-    Start = 0x2,
-    Pause = 0x4,
-    Stop = 0x8,
-    QualityAdaption = 0x100,
+    Unknown = 0,
+    Prepare = 1,
+    Start = 1 << 1,       // 2
+    Pause = 1 << 2,       // 4
+    Stop = 1 << 3,        // 8
+    SetEvalHook = 1 << 8, // 256
+    ClearRuns = 1 << 9,   // 512
   }
 }

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

@@ -1 @@
-using System.Threading;
+#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.Threading;
 using System.Threading.Tasks;
 using HeuristicLab.Collections;
@@ -104 +125 @@
     protected virtual void ProcessMessage(IMessage message, IMessagePort port, CancellationToken token) { }
 
-    public abstract void Prepare();
-    public async Task PrepareAsync() { await Task.Run(() => Prepare()); }
+    public abstract void Prepare(bool clearRuns = false);
+    public async Task PrepareAsync(bool clearRuns = false) { await Task.Run(() => Prepare(clearRuns)); }
     public abstract void Start();
     public async Task StartAsync() { await Task.Run(() => Start()); }

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

@@ -1 @@
-using HeuristicLab.Common;
+#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 HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.RealVectorEncoding;