Changeset 14629

Timestamp:

01/31/17 17:45:48 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• fixed bugs in ttp network/orchestrator 3

Location:

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

Files:

• Problems/LootProfitProblem.cs (modified) (1 diff)
• Problems/TourProfitProblem.cs (modified) (1 diff)
• TtpNetwork3.cs (modified) (1 diff)
• TtpOrchestratorNode3.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/LootProfitProblem.cs

@@ -79 +79 @@
     public override double Evaluate(BinaryVector vector, IRandom random) {
       return TtpUtils.Evaluate(Tsp, FixedTspSolution.ToArray(),
-                                  Ksp, vector.ToArray(),
-                                  Availability, RentingRatio, MinSpeed, MaxSpeed, DistanceType);
+                               Ksp, vector.ToArray(),
+                               Availability, RentingRatio, MinSpeed, MaxSpeed, DistanceType);
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/Problems/TourProfitProblem.cs

@@ -78 +78 @@
     public override double Evaluate(Individual individual, IRandom random) {
       return TtpUtils.Evaluate(Tsp, individual.Permutation().ToArray(),
-                                  Ksp, FixedKspSolution.ToArray(),
-                                  Availability, RentingRatio, MinSpeed, MaxSpeed, DistanceType);
+                               Ksp, FixedKspSolution.ToArray(),
+                               Availability, RentingRatio, MinSpeed, MaxSpeed, DistanceType);
     }
 

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

@@ -38 +38 @@
     public TtpNetwork3() : this("TtpNetwork3") { }
     public TtpNetwork3(string name) : base(name) {
-      Orchestrator = new TtpOrchestratorNode2(OrchestratorNodeName);
+      Orchestrator = new TtpOrchestratorNode3(OrchestratorNodeName);
       MetaSolver = new OrchestratedAlgorithmNode(MetaSolverNodeName);
       TspSolver = new OrchestratedAlgorithmNode(TspSolverNodeName);

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

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
@@ -101 +100 @@
       var tspMsg = TspSolverOrchestrationPort.PrepareMessage();
       tspMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.ClearRuns | OrchestrationMessage.Start);
-      var tpp = new TourProfitProblem {
-        Tsp = (TravelingSalesmanProblem)TspParameter.Value.Clone(),
-        Ksp = (BinaryKnapsackProblem)KspParameter.Value.Clone(),
-        FixedKspSolution = bestKspSolution,
-        Availability = AvailabilityParameter.Value.ToArray(),
-        RentingRatio = RentingRatioParameter.Value.Value,
-        MinSpeed = MinSpeedParameter.Value.Value,
-        MaxSpeed = MaxSpeedParameter.Value.Value,
-        DistanceType = distanceType
-      };
-      tpp.Encoding.Length = TspParameter.Value.Coordinates.Rows;
-      tspMsg["Problem"] = tpp;
+      tspMsg["Problem"] = tsp;
       TspSolverOrchestrationPort.SendMessage(tspMsg);
       cts.Token.ThrowIfCancellationRequested();
 
       var tspResults = (ResultCollection)tspMsg["Results"];
-      var bestTspSolution = (Permutation)tspResults["Best TSP Solution"].Value.Clone();
+      var bestTspSolution = (PathTSPTour)tspResults["Best TSP Solution"].Value.Clone();
       var coordinates = (DoubleMatrix)TspParameter.Value.Coordinates.Clone();
-      var tour = new PathTSPTour(coordinates, bestTspSolution, new DoubleValue(TSPCoordinatesPathEvaluator.Apply(new TSPEuclideanPathEvaluator(), coordinates, bestTspSolution)));
+      var tour = new PathTSPTour(coordinates, bestTspSolution.Permutation, new DoubleValue(TSPCoordinatesPathEvaluator.Apply(new TSPEuclideanPathEvaluator(), coordinates, bestTspSolution.Permutation)));
 
       #region Analyze