Changeset 8660 for branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution
- Timestamp:
- 09/14/12 18:58:15 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 5 edited
-
. (modified) (2 props)
-
HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
-
HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/Capacitated/BestCapacitatedVRPSolutionAnalyzer.cs (modified) (3 diffs)
-
HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/PickupAndDelivery/BestPickupAndDeliveryVRPSolutionAnalyzer.cs (modified) (3 diffs)
-
HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/TimeWindowed/BestTimeWindowedVRPSolutionAnalyzer.cs (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 8231,8246,8346,8455,8497,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/Capacitated/BestCapacitatedVRPSolutionAnalyzer.cs
r8053 r8660 30 30 using HeuristicLab.Problems.VehicleRouting.Interfaces; 31 31 using HeuristicLab.Problems.VehicleRouting.Variants; 32 using HeuristicLab.Problems.VehicleRouting.ProblemInstances; 32 33 33 34 namespace HeuristicLab.Problems.VehicleRouting { … … 87 88 88 89 public override IOperation Apply() { 90 IVRPProblemInstance problemInstance = ProblemInstanceParameter.ActualValue; 89 91 ItemArray<IVRPEncoding> solutions = VRPToursParameter.ActualValue; 90 92 ResultCollection results = ResultsParameter.ActualValue; … … 100 102 results.Add(new Result("Best VRP Solution Overload", new DoubleValue(overloads[i].Value))); 101 103 } else { 102 if (qualities[i].Value <= solution.Quality.Value) { 104 VRPEvaluation eval = problemInstance.Evaluate(solution.Solution); 105 if (qualities[i].Value <= eval.Quality) { 103 106 (results["Best VRP Solution Overload"].Value as DoubleValue).Value = overloads[i].Value; 104 107 } -
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/PickupAndDelivery/BestPickupAndDeliveryVRPSolutionAnalyzer.cs
r8053 r8660 30 30 using HeuristicLab.Problems.VehicleRouting.Interfaces; 31 31 using HeuristicLab.Problems.VehicleRouting.Variants; 32 using HeuristicLab.Problems.VehicleRouting.ProblemInstances; 32 33 33 34 namespace HeuristicLab.Problems.VehicleRouting { … … 87 88 88 89 public override IOperation Apply() { 90 IVRPProblemInstance problemInstance = ProblemInstanceParameter.ActualValue; 89 91 ItemArray<IVRPEncoding> solutions = VRPToursParameter.ActualValue; 90 92 ResultCollection results = ResultsParameter.ActualValue; … … 101 103 results.Add(new Result("Best VRP Solution PickupViolations", new DoubleValue(pickupViolations[i].Value))); 102 104 } else { 103 if (qualities[i].Value <= solution.Quality.Value) { 105 VRPEvaluation eval = problemInstance.Evaluate(solution.Solution); 106 if (qualities[i].Value <= eval.Quality) { 104 107 (results["Best VRP Solution PickupViolations"].Value as DoubleValue).Value = pickupViolations[i].Value; 105 108 } -
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/TimeWindowed/BestTimeWindowedVRPSolutionAnalyzer.cs
r8053 r8660 30 30 using HeuristicLab.Problems.VehicleRouting.Interfaces; 31 31 using HeuristicLab.Problems.VehicleRouting.Variants; 32 using HeuristicLab.Problems.VehicleRouting.ProblemInstances; 32 33 33 34 namespace HeuristicLab.Problems.VehicleRouting { … … 91 92 92 93 public override IOperation Apply() { 94 IVRPProblemInstance problemInstance = ProblemInstanceParameter.ActualValue; 93 95 ItemArray<IVRPEncoding> solutions = VRPToursParameter.ActualValue; 94 96 ResultCollection results = ResultsParameter.ActualValue; … … 106 108 results.Add(new Result("Best VRP Solution TravelTime", new DoubleValue(travelTimes[i].Value))); 107 109 } else { 108 if (qualities[i].Value <= solution.Quality.Value) { 110 VRPEvaluation eval = problemInstance.Evaluate(solution.Solution); 111 if (qualities[i].Value <= eval.Quality) { 109 112 (results["Best VRP Solution Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value; 110 113 (results["Best VRP Solution TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
Note: See TracChangeset
for help on using the changeset viewer.
