Changeset 9363 for branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPInterpreter.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPTWInterpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/IVRPDataInterpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPInterpreter.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPInterpreter.cs)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPTWInterpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/VRPInterpreter.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/VRPInterpreter.cs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPInterpreter.cs

@@ -24 +24 @@
 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using System;
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class CVRPInterpreter : IVRPDataInterpreter<CVRPData> {
-    public VRPInstanceDescription Interpret(IVRPData data) {
-      CVRPData cvrpData = data as CVRPData;
+  public class CVRPInterpreter : VRPInterpreter, IVRPDataInterpreter<CVRPData> {   
+    protected override IVRPProblemInstance CreateProblemInstance() {
+      return new CVRPProblemInstance();
+    }
 
-      VRPInstanceDescription result = new VRPInstanceDescription();
-      result.Name = cvrpData.Name;
-      result.Description = cvrpData.Description;
-
-      CVRPProblemInstance problem = new CVRPProblemInstance();
+    protected override void Interpret(IVRPData data, IVRPProblemInstance problemInstance) {
+      CVRPData cvrpData = (CVRPData)data;
+      CVRPProblemInstance problem = (CVRPProblemInstance)problemInstance;
+      
       if (cvrpData.Coordinates != null)
         problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
@@ -47 +49 @@
         problem.DistanceMatrix = new DoubleMatrix(cvrpData.GetDistanceMatrix());
       }
-      result.ProblemInstance = problem;
-
-      result.BestKnownQuality = cvrpData.BestKnownQuality;
-      if (cvrpData.BestKnownTour != null) {
-        PotvinEncoding solution = new PotvinEncoding(problem);
-
-        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
-          Tour tour = new Tour();
-          solution.Tours.Add(tour);
-
-          foreach (int stop in cvrpData.BestKnownTour[i]) {
-            tour.Stops.Add(stop + 1);
-          }
-        }
-
-        result.BestKnownSolution = solution;
-      }
-
-      return result;
     }
   }

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPTWInterpreter.cs

@@ -24 +24 @@
 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using System;
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class CVRPTWInterpreter : IVRPDataInterpreter<CVRPTWData> {
-    public VRPInstanceDescription Interpret(IVRPData data) {
-      CVRPTWData cvrpData = data as CVRPTWData;
+  public class CVRPTWInterpreter: CVRPInterpreter, IVRPDataInterpreter<CVRPTWData> {    
+    protected override IVRPProblemInstance CreateProblemInstance() {
+      return new CVRPTWProblemInstance();
+    }
 
-      VRPInstanceDescription result = new VRPInstanceDescription();
-      result.Name = cvrpData.Name;
-      result.Description = cvrpData.Description;
+    protected override void Interpret(IVRPData data, IVRPProblemInstance problemInstance) {
+      base.Interpret(data, problemInstance);
 
-      CVRPTWProblemInstance problem = new CVRPTWProblemInstance();
-      if (cvrpData.Coordinates != null)
-        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
-      if (cvrpData.MaximumVehicles != null)
-        problem.Vehicles.Value = (int)cvrpData.MaximumVehicles;
-      else
-        problem.Vehicles.Value = cvrpData.Dimension - 1;
-      problem.Capacity.Value = cvrpData.Capacity;
-      problem.Demand = new DoubleArray(cvrpData.Demands);
-      if (cvrpData.DistanceMeasure != DistanceMeasure.Euclidean) {
-        problem.UseDistanceMatrix.Value = true;
-        problem.DistanceMatrix = new DoubleMatrix(cvrpData.GetDistanceMatrix());
-      }
-      problem.ReadyTime = new DoubleArray(cvrpData.ReadyTimes);
-      problem.ServiceTime = new DoubleArray(cvrpData.ServiceTimes);
-      problem.DueTime = new DoubleArray(cvrpData.DueTimes);
-      result.ProblemInstance = problem;
+      CVRPTWData cvrptwData = (CVRPTWData)data;
+      CVRPTWProblemInstance problem = (CVRPTWProblemInstance)problemInstance;
 
-      result.BestKnownQuality = cvrpData.BestKnownQuality;
-      if (cvrpData.BestKnownTour != null) {
-        PotvinEncoding solution = new PotvinEncoding(problem);
-
-        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
-          Tour tour = new Tour();
-          solution.Tours.Add(tour);
-
-          foreach (int stop in cvrpData.BestKnownTour[i]) {
-            tour.Stops.Add(stop + 1);
-          }
-        }
-
-        result.BestKnownSolution = solution;
-      }
-
-      return result;
+      problem.ReadyTime = new DoubleArray(cvrptwData.ReadyTimes);
+      problem.ServiceTime = new DoubleArray(cvrptwData.ServiceTimes);
+      problem.DueTime = new DoubleArray(cvrptwData.DueTimes);
     }
   }

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/IVRPDataInterpreter.cs

@@ -22 +22 @@
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using System;
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPTWInterpreter.cs

@@ -24 +24 @@
 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using System;
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class MDCVRPTWInterpreter : IVRPDataInterpreter<MDCVRPTWData> {
-    public VRPInstanceDescription Interpret(IVRPData data) {
-      MDCVRPTWData cvrpData = data as MDCVRPTWData;
+  public class MDCVRPTWInterpreter : MDCVRPInterpreter, IVRPDataInterpreter<MDCVRPTWData> {    
+    protected override IVRPProblemInstance CreateProblemInstance() {
+      return new MDCVRPTWProblemInstance();
+    }
 
-      VRPInstanceDescription result = new VRPInstanceDescription();
-      result.Name = cvrpData.Name;
-      result.Description = cvrpData.Description;
+    protected override void Interpret(IVRPData data, IVRPProblemInstance problemInstance) {
+      base.Interpret(data, problemInstance);
 
-      MDCVRPTWProblemInstance problem = new MDCVRPTWProblemInstance();
-      if (cvrpData.Coordinates != null)
-        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
-      if (cvrpData.MaximumVehicles != null)
-        problem.Vehicles.Value = (int)cvrpData.MaximumVehicles;
-      else
-        problem.Vehicles.Value = cvrpData.Dimension - 1;
-      problem.Capacity = new DoubleArray(cvrpData.Capacity);
-      problem.Demand = new DoubleArray(cvrpData.Demands);
-      if (cvrpData.DistanceMeasure != DistanceMeasure.Euclidean) {
-        problem.UseDistanceMatrix.Value = true;
-        problem.DistanceMatrix = new DoubleMatrix(cvrpData.GetDistanceMatrix());
-      }
+      MDCVRPTWData cvrptwData = (MDCVRPTWData)data;
+      MDCVRPTWProblemInstance problem = (MDCVRPTWProblemInstance)problemInstance;
 
-      problem.Depots.Value = cvrpData.Depots;
-      problem.VehicleDepotAssignment = new IntArray(cvrpData.VehicleDepotAssignment);
-
-      problem.ReadyTime = new DoubleArray(cvrpData.ReadyTimes);
-      problem.ServiceTime = new DoubleArray(cvrpData.ServiceTimes);
-      problem.DueTime = new DoubleArray(cvrpData.DueTimes);
-      result.ProblemInstance = problem;
-
-      result.BestKnownQuality = cvrpData.BestKnownQuality;
-      if (cvrpData.BestKnownTour != null) {
-        PotvinEncoding solution = new PotvinEncoding(problem);
-
-        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
-          Tour tour = new Tour();
-          solution.Tours.Add(tour);
-
-          foreach (int stop in cvrpData.BestKnownTour[i]) {
-            tour.Stops.Add(stop + 1);
-          }
-        }
-
-        result.BestKnownSolution = solution;
-      }
-
-      return result;
+      problem.ReadyTime = new DoubleArray(cvrptwData.ReadyTimes);
+      problem.ServiceTime = new DoubleArray(cvrptwData.ServiceTimes);
+      problem.DueTime = new DoubleArray(cvrptwData.DueTimes);
     }
   }

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs

@@ -24 +24 @@
 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using System;
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class PDPTWInterpreter : IVRPDataInterpreter<PDPTWData> {
-    public VRPInstanceDescription Interpret(IVRPData data) {
-      PDPTWData cvrpData = data as PDPTWData;
+  public class PDPTWInterpreter : CVRPTWInterpreter, IVRPDataInterpreter<PDPTWData> {    
+    protected override IVRPProblemInstance CreateProblemInstance() {
+      return new CVRPPDTWProblemInstance();
+    }
 
-      VRPInstanceDescription result = new VRPInstanceDescription();
-      result.Name = cvrpData.Name;
-      result.Description = cvrpData.Description;
+    protected override void Interpret(IVRPData data, IVRPProblemInstance problemInstance) {
+      base.Interpret(data, problemInstance);
 
-      CVRPPDTWProblemInstance problem = new CVRPPDTWProblemInstance();
-      if (cvrpData.Coordinates != null)
-        problem.Coordinates = new DoubleMatrix(cvrpData.Coordinates);
-      if (cvrpData.MaximumVehicles != null)
-        problem.Vehicles.Value = (int)cvrpData.MaximumVehicles;
-      else
-        problem.Vehicles.Value = cvrpData.Dimension - 1;
-      problem.Capacity.Value = cvrpData.Capacity;
-      problem.Demand = new DoubleArray(cvrpData.Demands);
-      if (cvrpData.DistanceMeasure != DistanceMeasure.Euclidean) {
-        problem.UseDistanceMatrix.Value = true;
-        problem.DistanceMatrix = new DoubleMatrix(cvrpData.GetDistanceMatrix());
-      }
-      problem.ReadyTime = new DoubleArray(cvrpData.ReadyTimes);
-      problem.ServiceTime = new DoubleArray(cvrpData.ServiceTimes);
-      problem.DueTime = new DoubleArray(cvrpData.DueTimes);
-      problem.PickupDeliveryLocation = new IntArray(cvrpData.PickupDeliveryLocations);
-      result.ProblemInstance = problem;
+      PDPTWData pdpData = (PDPTWData)data;
+      CVRPPDTWProblemInstance problem = (CVRPPDTWProblemInstance)problemInstance;
 
-      result.BestKnownQuality = cvrpData.BestKnownQuality;
-      if (cvrpData.BestKnownTour != null) {
-        PotvinEncoding solution = new PotvinEncoding(problem);
-
-        for (int i = 0; i < cvrpData.BestKnownTour.GetLength(0); i++) {
-          Tour tour = new Tour();
-          solution.Tours.Add(tour);
-
-          foreach (int stop in cvrpData.BestKnownTour[i]) {
-            tour.Stops.Add(stop + 1);
-          }
-        }
-
-        result.BestKnownSolution = solution;
-      }
-
-      return result;
+      problem.PickupDeliveryLocation = new IntArray(pdpData.PickupDeliveryLocations);
     }
   }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages