Changeset 14628 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode3.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.TravelingThief/3.3/TtpOrchestratorNode3.cs (modified) (4 diffs)

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