Changeset 14601 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork1.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/TtpNetwork1.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization/3.3/TtpNetwork5.cs) (7 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork1.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 HeuristicLab.Algorithms.CMAEvolutionStrategy;
@@ -11 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Networks.IntegratedOptimization {
-  [Item("TtpNetwork5", "An optimization network for the TTP.")]
+namespace HeuristicLab.Networks.IntegratedOptimization.TravelingThief {
+  [Item("TtpNetwork1", "Version 1 of a TTP optimization network.")]
   [Creatable("Optimization Networks")]
   [StorableClass]
-  // standard ttp
-  // cmaes variegates ksp values (factors)
-  // 1) init cmaes (length = ksp.values.length)
-  // 2) start cmaes
-  // 3) evaluate vector as follows:
-  // 4) change ksp values (mult by factor in vector)
-  // 5) best ksp
-  // 6) best tsp for ksp selection
-  // 7) return ttp quality
-  public sealed class TtpNetwork5 : Network, IOptimizer {
+  public sealed class TtpNetwork1 : Network, IOptimizer {
     #region Nodes
-    public TtpOrchestratorNode5 Orchestrator {
-      get { return (TtpOrchestratorNode5)Nodes["Orchestrator"]; }
+    public TtpOrchestratorNode1 Orchestrator {
+      get { return (TtpOrchestratorNode1)Nodes["Orchestrator"]; }
     }
 
@@ -44 +56 @@
 
     [StorableConstructor]
-    private TtpNetwork5(bool deserializing) : base(deserializing) { }
-    private TtpNetwork5(TtpNetwork5 original, Cloner cloner) : base(original, cloner) {
+    private TtpNetwork1(bool deserializing) : base(deserializing) { }
+    private TtpNetwork1(TtpNetwork1 original, Cloner cloner) : base(original, cloner) {
       RegisterEvents();
     }
@@ -59 +71 @@
     }
 
-    public TtpNetwork5() : base("TtpNetwork5") {
-      var orchestratorNode = new TtpOrchestratorNode5("Orchestrator");
+    public TtpNetwork1() : base("TtpNetwork1") {
+      var orchestratorNode = new TtpOrchestratorNode1("Orchestrator");
       Nodes.Add(orchestratorNode);
 
@@ -70 +82 @@
       orchestratorNode.MetaSolverOrchestrationPort.ConnectedPort = metaSolverNode.OrchestrationPort;
       Nodes.Add(metaSolverNode);
-
-      //var tspSolverNode = new OrchestratedAlgorithmNode("TspSolver");
-      //var osga = new OffspringSelectionGeneticAlgorithm();
-      //osga.Problem = new TourProfitProblem();
-      //osga.ComparisonFactorLowerBound.Value = 1.0;
-      //osga.ComparisonFactorModifier = null;
-      //osga.ComparisonFactorUpperBound.Value = 1.0;
-      //var crossover = (MultiPermutationCrossover)(osga.Crossover = osga.CrossoverParameter.ValidValues.First(x => x is MultiPermutationCrossover));
-      //foreach (var c in crossover.Operators)
-      //  crossover.Operators.SetItemCheckedState(c, c is CosaCrossover || c is OrderCrossover2 || c is PartiallyMatchedCrossover);
-      //osga.MaximumSelectionPressure.Value = 200;
-      //osga.Mutator = osga.MutatorParameter.ValidValues.First(x => x is MultiPermutationManipulator);
-      //osga.PopulationSize.Value = 200;
-      //osga.Selector = osga.SelectorParameter.ValidValues.First(x => x is RandomSelector);
-      //tspSolverNode.Algorithm = osga;
-      //orchestratorNode.TspSolverOrchestrationPort.ConnectedPort = tspSolverNode.OrchestrationPort;
-      //Nodes.Add(tspSolverNode);
 
       var tspSolverNode = new OrchestratedAlgorithmNode("TspSolver");
@@ -109 +104 @@
       IntValue kspCapacity; IntArray kspItemWeights; IntArray kspItemValues;
       IntArray ttpAvailability; DoubleValue ttpMinSpeed; DoubleValue ttpMaxSpeed; DoubleValue ttpRentingRatio;
-      TtpImporter.ImportTtpInstance(@"ttp-instances\berlin52-ttp\berlin52_n51_uncorr-similar-weights_05.ttp",
+      TtpImporter.ImportTtpInstance(@"ttp-instances\berlin52-ttp\berlin52_n51_uncorr_01.ttp",
           out tspCoordinates,
           out kspCapacity, out kspItemValues, out kspItemWeights,
@@ -133 +128 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new TtpNetwork5(this, cloner);
+      return new TtpNetwork1(this, cloner);
     }