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

Timestamp:

01/31/17 16:54:03 (8 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.LocationRouting/3.3

Files:

• LrpNetwork1.cs (modified) (2 diffs)
• LrpNetwork2.cs (modified) (2 diffs)
• LrpOrchestratorNode.cs (modified) (3 diffs)
• LrpOrchestratorNode1.cs (modified) (4 diffs)
• LrpOrchestratorNode2.cs (modified) (4 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork1.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -50 +51 @@
 
       var cmaes = new CMAEvolutionStrategy();
-      var vp = new VariegationProblem();
-      vp.SetMaximization(false);
+      var vp = new MinimizationVariegationProblem<RealVectorEncoding>();
       cmaes.Problem = vp;
       cmaes.MaximumGenerations = 80;

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork2.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -50 +51 @@
 
       var cmaes = new CMAEvolutionStrategy();
-      var vp = new VariegationProblem();
-      vp.SetMaximization(false);
+      var vp = new MinimizationVariegationProblem<RealVectorEncoding>();
       cmaes.Problem = vp;
       cmaes.MaximumGenerations = 80;

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode.cs

@@ -50 +50 @@
     protected const string FlpSolverName = "FlpSolver";
     protected const string VrpSolverName = "VrpSolver";
+    protected const string OrchestrationPortNameSuffix = "OrchestrationPort";
+    protected const string EvaluationPortNameSuffix = "EvaluationPort";
     #endregion
 
     protected CancellationTokenSource cts;
-    protected ResultCollection flpResults, vrpResults;
 
     [Storable]
@@ -309 +310 @@
 
     #region FlpSolver Message Handling
-    protected virtual void FlpSolverOrchestrationPortMessage(IMessage message) {
-      var results = (ResultCollection)message["Results"];
-      if (results.ContainsKey("Best Solution")) {
-        flpResults = results;
-      }
-    }
+    protected virtual void FlpSolverOrchestrationPortMessage(IMessage message) { }
 
     protected virtual void FlpSolverEvaluationPortMessage(IMessage message) { }
@@ -320 +316 @@
 
     #region VrpSolver Message Handling
-    protected virtual void VrpSolverOrchestrationPortMessage(IMessage message) {
-      var results = (ResultCollection)message["Results"];
-      if (results.ContainsKey("Best valid VRP Solution")) {
-        vrpResults = results;
-      }
-    }
+    protected virtual void VrpSolverOrchestrationPortMessage(IMessage message) { }
 
     private void VrpSolverEvaluationPortMessage(IMessage message) { }

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode1.cs

@@ -43 +43 @@
     public LrpOrchestratorNode1() : this("LrpOrchestratorNode1") { }
     public LrpOrchestratorNode1(string name) : base(name) {
-      MetaSolverOrchestrationPort = CreateOrchestrationPort<VariegationProblem>(MetaSolverName);
-      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName, "RealVector", "Quality");
-      FlpSolverOrchestrationPort = CreateOrchestrationPort<FacilityLocationProblem>(FlpSolverName);
-      VrpSolverOrchestrationPort = CreateOrchestrationPort<VehicleRoutingProblem>(VrpSolverName);
+      MetaSolverOrchestrationPort = CreateOrchestrationPort<MinimizationVariegationProblem<RealVectorEncoding>>(MetaSolverName + OrchestrationPortNameSuffix);
+      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName + EvaluationPortNameSuffix, "RealVector", "Quality");
+      FlpSolverOrchestrationPort = CreateOrchestrationPort<FacilityLocationProblem>(FlpSolverName + OrchestrationPortNameSuffix);
+      VrpSolverOrchestrationPort = CreateOrchestrationPort<VehicleRoutingProblem>(VrpSolverName + OrchestrationPortNameSuffix);
     }
 
@@ -60 +60 @@
       if (clearRuns) msgFlags |= OrchestrationMessage.ClearRuns;
       metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(msgFlags);
-      var problem = new VariegationProblem();
+      var problem = new MinimizationVariegationProblem<RealVectorEncoding>();
       problem.Encoding.Length = nrOfCustomers * 2;
       problem.Encoding.Bounds = new DoubleMatrix(new[,] { { -1.0, 1.0 } });
@@ -85 +85 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var flpResults = (ResultCollection)flpMsg["Results"];
       var bestFlpSolution = (IntegerVector)flpResults["Best Solution"].Value;
       var flpSolution = FlpParameter.Value.GetSolution(bestFlpSolution);
@@ -109 +110 @@
         cts.Token.ThrowIfCancellationRequested();
 
+        var vrpResults = (ResultCollection)vrpMsg["Results"];
         var bestVrpSolution = (VRPSolution)vrpResults["Best valid VRP Solution"].Value.Clone();
         vrpSolutions.Add(new Result("Depot " + depot.Key, bestVrpSolution));

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode2.cs

@@ -43 +43 @@
     public LrpOrchestratorNode2() : this("LrpOrchestratorNode2") { }
     public LrpOrchestratorNode2(string name) : base(name) {
-      MetaSolverOrchestrationPort = CreateOrchestrationPort<VariegationProblem>(MetaSolverName);
-      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName, "RealVector", "Quality");
-      FlpSolverOrchestrationPort = CreateOrchestrationPort<FacilityLocationProblem>(FlpSolverName);
-      VrpSolverOrchestrationPort = CreateOrchestrationPort<VehicleRoutingProblem>(VrpSolverName);
+      MetaSolverOrchestrationPort = CreateOrchestrationPort<MinimizationVariegationProblem<RealVectorEncoding>>(MetaSolverName + OrchestrationPortNameSuffix);
+      MetaSolverEvaluationPort = CreateEvaluationPort<RealVector>(MetaSolverName + EvaluationPortNameSuffix, "RealVector", "Quality");
+      FlpSolverOrchestrationPort = CreateOrchestrationPort<FacilityLocationProblem>(FlpSolverName + OrchestrationPortNameSuffix);
+      VrpSolverOrchestrationPort = CreateOrchestrationPort<VehicleRoutingProblem>(VrpSolverName + OrchestrationPortNameSuffix);
     }
 
@@ -60 +60 @@
       if (clearRuns) msgFlags |= OrchestrationMessage.ClearRuns;
       metaMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(msgFlags);
-      var problem = new VariegationProblem();
+      var problem = new MinimizationVariegationProblem<RealVectorEncoding>();
       problem.Encoding.Length = nrOfDepots * 2;
       problem.Encoding.Bounds = new DoubleMatrix(new[,] { { -1.0, 1.0 } });
@@ -85 +85 @@
       cts.Token.ThrowIfCancellationRequested();
 
+      var flpResults = (ResultCollection)flpMsg["Results"];
       var bestFlpSolution = (IntegerVector)flpResults["Best Solution"].Value;
       var flpSolution = FlpParameter.Value.GetSolution(bestFlpSolution);
@@ -109 +110 @@
         cts.Token.ThrowIfCancellationRequested();
 
+        var vrpResults = (ResultCollection)vrpMsg["Results"];
         var bestVrpSolution = (VRPSolution)vrpResults["Best valid VRP Solution"].Value.Clone();
         vrpSolutions.Add(new Result("Depot " + depot.Key, bestVrpSolution));