Changeset 14601 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode1.cs

Timestamp:

01/24/17 09:31:29 (7 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• created separate project for ttp optimization
• removed some unused classes

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief

Files:

• . (added)
• 3.3 (added)
• 3.3/TtpOrchestratorNode1.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/TtpOrchestratorNode5.cs) (6 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode1.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;
@@ -17 +38 @@
 using HeuristicLab.Problems.TravelingSalesman;
 
-namespace HeuristicLab.Networks.IntegratedOptimization {
-  [Item("TtpOrchestratorNode5", "An abstract base class for an orchestrator node for the TTP.")]
+namespace HeuristicLab.Networks.IntegratedOptimization.TravelingThief {
+  [Item("TtpOrchestratorNode1", "Orchestrator for TTP optimization network version 1.")]
   [StorableClass]
-  public sealed class TtpOrchestratorNode5 : OrchestratorNode {
+  public sealed class TtpOrchestratorNode1 : OrchestratorNode {
     #region Constants
     private const string TspParameterName = "TSP";
@@ -34 +55 @@
     #endregion
 
-    [Storable]
     private ResultCollection tspResults, kspResults;
 
@@ -96 +116 @@
 
     [StorableConstructor]
-    private TtpOrchestratorNode5(bool deserializing) : base(deserializing) { }
-    private TtpOrchestratorNode5(TtpOrchestratorNode5 original, Cloner cloner) : base(original, cloner) {
+    private TtpOrchestratorNode1(bool deserializing) : base(deserializing) { }
+    private TtpOrchestratorNode1(TtpOrchestratorNode1 original, Cloner cloner) : base(original, cloner) {
       RegisterEvents();
     }
-    public TtpOrchestratorNode5() : this("TtpOrchestratorNode5") { }
-    public TtpOrchestratorNode5(string name) : base(name) {
+    public TtpOrchestratorNode1() : this("TtpOrchestratorNode1") { }
+    public TtpOrchestratorNode1(string name) : base(name) {
       #region Configure Parameters
       Parameters.Add(new ValueParameter<IntValue>(IterationsParameterName, new IntValue(20)));
@@ -125 +145 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new TtpOrchestratorNode5(this, cloner);
+      return new TtpOrchestratorNode1(this, cloner);
     }
 
@@ -230 +250 @@
       var bestKspQuality = KnapsackEvaluator.Apply(bestKspSolution, kspCapacity, kspPenalty, kspWeights, kspValues).Quality;
       var loot = new KnapsackSolution(bestKspSolution, bestKspQuality, kspCapacity, kspWeights, kspValues);
-      kspResults.Add(new Result("Best KSP Solution", loot));
 
       var tspMsg = TspSolverOrchestrationPort.PrepareMessage();