Changeset 14628 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode2.cs

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

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode2.cs (modified) (4 diffs)

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));