Changeset 14628 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief

Timestamp:

01/31/17 16:54:03 (7 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added variegation problem for minimization and maximization
• refactored some classes

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3

Files:

• TtpNetwork1.cs (modified) (2 diffs)
• TtpNetwork2.cs (modified) (2 diffs)
• TtpNetwork3.cs (modified) (2 diffs)
• TtpOrchestratorNode.cs (modified) (4 diffs)
• TtpOrchestratorNode1.cs (modified) (4 diffs)
• TtpOrchestratorNode2.cs (modified) (4 diffs)
• TtpOrchestratorNode3.cs (modified) (4 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork1.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -43 +44 @@
 
       var cmaes = new CMAEvolutionStrategy();
-      cmaes.Problem = new VariegationProblem();
+      cmaes.Problem = new MaximizationVariegationProblem<RealVectorEncoding>();
       cmaes.MaximumGenerations = 80;
       MetaSolver.Algorithm = cmaes;

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork2.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -43 +44 @@
 
       var cmaes = new CMAEvolutionStrategy();
-      cmaes.Problem = new VariegationProblem();
+      cmaes.Problem = new MaximizationVariegationProblem<RealVectorEncoding>();
       cmaes.MaximumGenerations = 80;
       MetaSolver.Algorithm = cmaes;

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpNetwork3.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -43 +44 @@
 
       var cmaes = new CMAEvolutionStrategy();
-      cmaes.Problem = new VariegationProblem();
+      cmaes.Problem = new MaximizationVariegationProblem<RealVectorEncoding>();
       cmaes.MaximumGenerations = 80;
       MetaSolver.Algorithm = cmaes;

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode.cs

@@ -29 +29 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -49 +48 @@
     protected const string TspSolverName = "TspSolver";
     protected const string KspSolverName = "KspSolver";
+    protected const string OrchestrationPortNameSuffix = "OrchestrationPort";
+    protected const string EvaluationPortNameSuffix = "EvaluationPort";
     #endregion
 
     protected CancellationTokenSource cts;
-    protected ResultCollection tspResults, kspResults;
 
     [Storable]
@@ -319 +319 @@
 
     #region TspSolver Message Handling
-    protected virtual void TspSolverOrchestrationPortMessage(IMessage message) {
-      var results = (ResultCollection)message["Results"];
-      if (results.ContainsKey("Best TSP Solution")) {
-        tspResults = results;
-      }
-    }
+    protected virtual void TspSolverOrchestrationPortMessage(IMessage message) { }
 
     protected virtual void TspSolverEvaluationPortMessage(IMessage message) { }
@@ -330 +325 @@
 
     #region KspSolver Message Handling
-    protected virtual void KspSolverOrchestrationPortMessage(IMessage message) {
-      var results = (ResultCollection)message["Results"];
-      if (results.ContainsKey("Best Solution")) {
-        kspResults = results;
-      }
-    }
+    protected virtual void KspSolverOrchestrationPortMessage(IMessage message) { }
 
     private void KspSolverEvaluationPortMessage(IMessage message) { }

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode1.cs

@@ -43 +43 @@
     public TtpOrchestratorNode1() : this("TtpOrchestratorNode1") { }
     public TtpOrchestratorNode1(string name) : base(name) {
-      MetaSolverOrchestrationPort = CreateOrchestrationPort<VariegationProblem>(MetaSolverName);
-      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName, "RealVector", "Quality");
-      TspSolverOrchestrationPort = CreateOrchestrationPort<TourProfitProblem>(TspSolverName);
-      KspSolverOrchestrationPort = CreateOrchestrationPort<BinaryKnapsackProblem>(KspSolverName);
+      MetaSolverOrchestrationPort = CreateOrchestrationPort<MaximizationVariegationProblem<RealVectorEncoding>>(MetaSolverName + OrchestrationPortNameSuffix);
+      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName + EvaluationPortNameSuffix, "RealVector", "Quality");
+      TspSolverOrchestrationPort = CreateOrchestrationPort<TourProfitProblem>(TspSolverName + OrchestrationPortNameSuffix);
+      KspSolverOrchestrationPort = CreateOrchestrationPort<BinaryKnapsackProblem>(KspSolverName + OrchestrationPortNameSuffix);
     }
 
@@ -60 +60 @@
       if (clearRuns) msgFlags |= OrchestrationMessage.ClearRuns;
       metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(msgFlags);
-      var problem = new VariegationProblem();
+      var problem = new MaximizationVariegationProblem<RealVectorEncoding>();
       problem.Encoding.Length = KspParameter.Value.Length;
       problem.Encoding.Bounds = new DoubleMatrix(new[,] { { -1.0, 1.0 } });
@@ -81 +81 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var kspResults = (ResultCollection)kspMsg["Results"];
       var bestKspSolution = (BinaryVector)kspResults["Best Solution"].Value.Clone();
       var kspCapacity = (IntValue)KspParameter.Value.KnapsackCapacity.Clone();
@@ -106 +107 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var tspResults = (ResultCollection)tspMsg["Results"];
       var bestTspSolution = (Permutation)tspResults["Best TSP Solution"].Value.Clone();
       var coordinates = (DoubleMatrix)TspParameter.Value.Coordinates.Clone();

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode2.cs

@@ -42 +42 @@
     public TtpOrchestratorNode2() : this("TtpOrchestratorNode2") { }
     public TtpOrchestratorNode2(string name) : base(name) {
-      MetaSolverOrchestrationPort = CreateOrchestrationPort<VariegationProblem>(MetaSolverName);
-      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName, "RealVector", "Quality");
-      TspSolverOrchestrationPort = CreateOrchestrationPort<TravelingSalesmanProblem>(TspSolverName);
-      KspSolverOrchestrationPort = CreateOrchestrationPort<LootProfitProblem>(KspSolverName);
+      MetaSolverOrchestrationPort = CreateOrchestrationPort<MaximizationVariegationProblem<RealVectorEncoding>>(MetaSolverName + OrchestrationPortNameSuffix);
+      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName + EvaluationPortNameSuffix, "RealVector", "Quality");
+      TspSolverOrchestrationPort = CreateOrchestrationPort<TravelingSalesmanProblem>(TspSolverName + OrchestrationPortNameSuffix);
+      KspSolverOrchestrationPort = CreateOrchestrationPort<LootProfitProblem>(KspSolverName + OrchestrationPortNameSuffix);
     }
 
@@ -59 +59 @@
       if (clearRuns) msgFlags |= OrchestrationMessage.ClearRuns;
       metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(msgFlags);
-      var problem = new VariegationProblem();
+      var problem = new MaximizationVariegationProblem<RealVectorEncoding>();
       problem.Encoding.Length = TspParameter.Value.Coordinates.Rows * 2;
       problem.Encoding.Bounds = new DoubleMatrix(new[,] { { -1.0, 1.0 } });
@@ -82 +82 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var tspResults = (ResultCollection)tspMsg["Results"];
       var bestTspSolution = (PathTSPTour)tspResults["Best TSP Solution"].Value.Clone();
       var coordinates = (DoubleMatrix)TspParameter.Value.Coordinates.Clone();
@@ -103 +104 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var kspResults = (ResultCollection)kspMsg["Results"];
       var bestKspSolution = (BinaryVector)kspResults["Best Solution"].Value.Clone();
       var kspCapacity = (IntValue)KspParameter.Value.KnapsackCapacity.Clone();

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode3.cs

@@ -43 +43 @@
     public TtpOrchestratorNode3() : this("TtpOrchestratorNode3") { }
     public TtpOrchestratorNode3(string name) : base(name) {
-      MetaSolverOrchestrationPort = CreateOrchestrationPort<VariegationProblem>(MetaSolverName);
-      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName, "RealVector", "Quality");
-      TspSolverOrchestrationPort = CreateOrchestrationPort<TravelingSalesmanProblem>(TspSolverName);
-      KspSolverOrchestrationPort = CreateOrchestrationPort<BinaryKnapsackProblem>(KspSolverName);
+      MetaSolverOrchestrationPort = CreateOrchestrationPort<MaximizationVariegationProblem<RealVectorEncoding>>(MetaSolverName + OrchestrationPortNameSuffix);
+      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName + EvaluationPortNameSuffix, "RealVector", "Quality");
+      TspSolverOrchestrationPort = CreateOrchestrationPort<TravelingSalesmanProblem>(TspSolverName + OrchestrationPortNameSuffix);
+      KspSolverOrchestrationPort = CreateOrchestrationPort<BinaryKnapsackProblem>(KspSolverName + OrchestrationPortNameSuffix);
     }
 
@@ -60 +60 @@
       if (clearRuns) msgFlags |= OrchestrationMessage.ClearRuns;
       metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(msgFlags);
-      var problem = new VariegationProblem();
+      var problem = new MaximizationVariegationProblem<RealVectorEncoding>();
       problem.Encoding.Length = KspParameter.Value.Length + TspParameter.Value.Coordinates.Rows * 2;
       problem.Encoding.Bounds = new DoubleMatrix(new[,] { { -1.0, 1.0 } });
@@ -84 +84 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var kspResults = (ResultCollection)kspMsg["Results"];
       var bestKspSolution = (BinaryVector)kspResults["Best Solution"].Value.Clone();
       var kspCapacity = (IntValue)KspParameter.Value.KnapsackCapacity.Clone();
@@ -115 +116 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var tspResults = (ResultCollection)tspMsg["Results"];
       var bestTspSolution = (Permutation)tspResults["Best TSP Solution"].Value.Clone();
       var coordinates = (DoubleMatrix)TspParameter.Value.Coordinates.Clone();