Changeset 4301 for branches/VRP

Timestamp:

08/24/10 14:52:26 (14 years ago)

Author:

svonolfe

Message:

Added VRPTours analyzer (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3

Files:

• Analyzers/BestAverageWorstVRPToursAnalyzer.cs (added)
• Analyzers/BestAverageWorstVRPToursCalculator.cs (added)
• Analyzers/BestVRPSolutionAnalyzer.cs (modified) (1 diff)
• Analyzers/BestVRPToursMemorizer.cs (added)
• HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (2 diffs)
• HeuristicLabProblemsVehicleRoutingPlugin.cs.frame (modified) (1 diff)
• VehicleRoutingProblem.cs (modified) (3 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs

@@ -127 +127 @@
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best VRP Solution", solution));
-
-        results.Add(new Result("Best TravelTime", new DoubleValue(travelTimes[i].Value)));
-        results.Add(new Result("Best Distance",  new DoubleValue(distances[i].Value)));
-        results.Add(new Result("Best VehicleUtilization", new DoubleValue(vehiclesUtilizations[i].Value)));
-        results.Add(new Result("Best Overload",  new DoubleValue(overloads[i].Value)));
-        results.Add(new Result("Best Tardiness",  new DoubleValue(tardinesses[i].Value)));
       } else {
-        if (solution.Quality.Value > qualities[i].Value) {
+        if (qualities[i].Value <= solution.Quality.Value) {
           solution.Coordinates = coordinates;
           solution.Solution = best.Clone() as IVRPEncoding;
           solution.Quality.Value = qualities[i].Value;
-          solution.Distance.Value = (results["Best Distance"].Value as DoubleValue).Value = distances[i].Value;
-          solution.Overload.Value = (results["Best Overload"].Value as DoubleValue).Value = overloads[i].Value;
-          solution.Tardiness.Value = (results["Best Tardiness"].Value as DoubleValue).Value = tardinesses[i].Value;
-          solution.TravelTime.Value = (results["Best TravelTime"].Value as DoubleValue).Value = travelTimes[i].Value;
-          solution.VehicleUtilization.Value = (results["Best VehicleUtilization"].Value as DoubleValue).Value = vehiclesUtilizations[i].Value;
+          solution.Distance.Value = distances[i].Value;
+          solution.Overload.Value = overloads[i].Value;
+          solution.Tardiness.Value = tardinesses[i].Value;
+          solution.TravelTime.Value = travelTimes[i].Value;
+          solution.VehicleUtilization.Value = vehiclesUtilizations[i].Value;
           solution.DistanceMatrix = DistanceMatrixParameter.ActualValue;
           solution.UseDistanceMatrix = UseDistanceMatrixParameter.ActualValue;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

@@ -106 +106 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\BestAverageWorstVRPToursAnalyzer.cs" />
+    <Compile Include="Analyzers\BestAverageWorstVRPToursCalculator.cs" />
+    <Compile Include="Analyzers\BestVRPToursMemorizer.cs" />
     <Compile Include="Analyzers\BestVRPSolutionAnalyzer.cs" />
     <Compile Include="Encodings\Alba\Crossovers\PermutationCrossover.cs" />
@@ -216 +219 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLabProblemsVehicleRoutingPlugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Problems.VehicleRouting", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.VehicleRouting-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -178 +178 @@
       get { return operators.OfType<BestVRPSolutionAnalyzer>().FirstOrDefault(); }
     }
+    private BestAverageWorstVRPToursAnalyzer BestAverageWorstVRPToursAnalyzer {
+      get { return operators.OfType<BestAverageWorstVRPToursAnalyzer>().FirstOrDefault(); }
+    }
     #endregion
 
@@ -315 +318 @@
       operators = new List<IOperator>();
       operators.Add(new BestVRPSolutionAnalyzer());
+      operators.Add(new BestAverageWorstVRPToursAnalyzer());
       ParameterizeAnalyzer();
       operators.AddRange(ApplicationManager.Manager.GetInstances<IVRPOperator>().Cast<IOperator>());
@@ -367 +371 @@
       BestVRPSolutionAnalyzer.OverloadParameter.ActualName = Evaluator.OverloadParameter.ActualName;
       BestVRPSolutionAnalyzer.TardinessParameter.ActualName = Evaluator.TardinessParameter.ActualName;
+      BestVRPSolutionAnalyzer.TravelTimeParameter.ActualName = Evaluator.TravelTimeParameter.ActualName;
+      BestVRPSolutionAnalyzer.VehiclesUtilizedParameter.ActualName = Evaluator.VehcilesUtilizedParameter.ActualName;
       BestVRPSolutionAnalyzer.VRPToursParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName;
       BestVRPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
+
+      BestAverageWorstVRPToursAnalyzer.DistanceParameter.ActualName = Evaluator.DistanceParameter.ActualName;
+      BestAverageWorstVRPToursAnalyzer.OverloadParameter.ActualName = Evaluator.OverloadParameter.ActualName;
+      BestAverageWorstVRPToursAnalyzer.TardinessParameter.ActualName = Evaluator.TardinessParameter.ActualName;
+      BestAverageWorstVRPToursAnalyzer.TravelTimeParameter.ActualName = Evaluator.TravelTimeParameter.ActualName;
+      BestAverageWorstVRPToursAnalyzer.VehiclesUtilizedParameter.ActualName = Evaluator.VehcilesUtilizedParameter.ActualName;
+      BestAverageWorstVRPToursAnalyzer.ResultsParameter.ActualName = "Results";
     }
     private void ParameterizeOperators() {