Changeset 14653 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode1.cs

Timestamp:

02/07/17 21:54:23 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• improved ttp evaluation

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.TravelingThief/3.3/TtpOrchestratorNode1.cs (modified) (3 diffs)

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

@@ -90 +90 @@
       var loot = new KnapsackSolution(bestKspSolution, bestKspQuality, kspCapacity, kspWeights, kspValues);
 
+      var availability = TtpUtils.GetAvailability(AvailabilityParameter.Value.ToArray());
+
       var tspMsg = TspSolverOrchestrationPort.PrepareMessage();
       tspMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.ClearRuns | OrchestrationMessage.Start);
@@ -96 +98 @@
         Ksp = (BinaryKnapsackProblem)KspParameter.Value.Clone(),
         FixedKspSolution = bestKspSolution,
-        Availability = AvailabilityParameter.Value.ToArray(),
+        Availability = availability,
         RentingRatio = RentingRatioParameter.Value.Value,
         MinSpeed = MinSpeedParameter.Value.Value,
         MaxSpeed = MaxSpeedParameter.Value.Value,
-        DistanceType = distanceType
       };
       tpp.Encoding.Length = TspParameter.Value.Coordinates.Rows;
@@ -114 +115 @@
       #region Analyze
       double objectiveValue = TtpUtils.Evaluate(TspParameter.Value, tour.Permutation.ToArray(), KspParameter.Value, loot.BinaryVector.ToArray(),
-        AvailabilityParameter.Value.ToArray(), RentingRatioParameter.Value.Value, MinSpeedParameter.Value.Value, MaxSpeedParameter.Value.Value, distanceType);
+        availability, RentingRatioParameter.Value.Value, MinSpeedParameter.Value.Value, MaxSpeedParameter.Value.Value);
       ((DoubleValue)message["Quality"]).Value = objectiveValue;