Changeset 9010 for trunk/sources/HeuristicLab.Problems.VehicleRouting

Timestamp:

12/06/12 16:18:16 (12 years ago)

Author:

svonolfe

Message:

used explicit conversions in Interpreters and removed the unused method IVRPDataInterpreter.GetDataType (#1953)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters

Files:

• CVRPInterpreter.cs (modified) (2 diffs)
• CVRPTWInterpreter.cs (modified) (2 diffs)
• IVRPDataInterpreter.cs (modified) (1 diff)
• MDCVRPInterpreter.cs (modified) (2 diffs)
• MDCVRPTWInterpreter.cs (modified) (2 diffs)
• PDPTWInterpreter.cs (modified) (2 diffs)
• VRPInterpreter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPInterpreter.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class CVRPInterpreter : VRPInterpreter, IVRPDataInterpreter<CVRPData> {
-    public override Type GetDataType() {
-      return typeof(CVRPData);
-    }
-    
+  public class CVRPInterpreter : VRPInterpreter, IVRPDataInterpreter<CVRPData> {   
     protected override IVRPProblemInstance CreateProblemInstance() {
       return new CVRPProblemInstance();
@@ -38 +34 @@
 
     protected override void Interpret(IVRPData data, IVRPProblemInstance problemInstance) {
-      CVRPData cvrpData = data as CVRPData;
-      CVRPProblemInstance problem = problemInstance as CVRPProblemInstance;
+      CVRPData cvrpData = (CVRPData)data;
+      CVRPProblemInstance problem = (CVRPProblemInstance)problemInstance;
       
       if (cvrpData.Coordinates != null)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/CVRPTWInterpreter.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class CVRPTWInterpreter: CVRPInterpreter, IVRPDataInterpreter<CVRPTWData> {
-    public override Type GetDataType() {
-      return typeof(CVRPTWData);
-    }
-    
+  public class CVRPTWInterpreter: CVRPInterpreter, IVRPDataInterpreter<CVRPTWData> {    
     protected override IVRPProblemInstance CreateProblemInstance() {
       return new CVRPTWProblemInstance();
@@ -40 +36 @@
       base.Interpret(data, problemInstance);
 
-      CVRPTWData cvrptwData = data as CVRPTWData;
-      CVRPTWProblemInstance problem = problemInstance as CVRPTWProblemInstance;
+      CVRPTWData cvrptwData = (CVRPTWData)data;
+      CVRPTWProblemInstance problem = (CVRPTWProblemInstance)problemInstance;
 
       problem.ReadyTime = new DoubleArray(cvrptwData.ReadyTimes);

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/IVRPDataInterpreter.cs

@@ -34 +34 @@
 
   public interface IVRPDataInterpreter {
-    Type GetDataType();
     VRPInstanceDescription Interpret(IVRPData data);
   }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPInterpreter.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class MDCVRPInterpreter : VRPInterpreter, IVRPDataInterpreter<MDCVRPData> {
-    public override Type GetDataType() {
-      return typeof(MDCVRPData);
-    }
-    
+  public class MDCVRPInterpreter : VRPInterpreter, IVRPDataInterpreter<MDCVRPData> {   
     protected override IVRPProblemInstance CreateProblemInstance() {
       return new MDCVRPProblemInstance();
@@ -38 +34 @@
 
     protected override void Interpret(IVRPData data, IVRPProblemInstance problemInstance) {
-      MDCVRPData cvrpData = data as MDCVRPData;
-      MDCVRPProblemInstance problem = problemInstance as MDCVRPProblemInstance;
+      MDCVRPData cvrpData = (MDCVRPData)data;
+      MDCVRPProblemInstance problem = (MDCVRPProblemInstance)problemInstance;
 
       if (cvrpData.Coordinates != null)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/MDCVRPTWInterpreter.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class MDCVRPTWInterpreter : MDCVRPInterpreter, IVRPDataInterpreter<MDCVRPTWData> {
-    public override Type GetDataType() {
-      return typeof(MDCVRPTWData);
-    }
-    
+  public class MDCVRPTWInterpreter : MDCVRPInterpreter, IVRPDataInterpreter<MDCVRPTWData> {    
     protected override IVRPProblemInstance CreateProblemInstance() {
       return new MDCVRPTWProblemInstance();
@@ -40 +36 @@
       base.Interpret(data, problemInstance);
 
-      MDCVRPTWData cvrptwData = data as MDCVRPTWData;
-      MDCVRPTWProblemInstance problem = problemInstance as MDCVRPTWProblemInstance;
+      MDCVRPTWData cvrptwData = (MDCVRPTWData)data;
+      MDCVRPTWProblemInstance problem = (MDCVRPTWProblemInstance)problemInstance;
 
       problem.ReadyTime = new DoubleArray(cvrptwData.ReadyTimes);

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/PDPTWInterpreter.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Interpreters {
-  public class PDPTWInterpreter : CVRPTWInterpreter, IVRPDataInterpreter<PDPTWData> {
-    public override Type GetDataType() {
-      return typeof(PDPTWData);
-    }
-    
+  public class PDPTWInterpreter : CVRPTWInterpreter, IVRPDataInterpreter<PDPTWData> {    
     protected override IVRPProblemInstance CreateProblemInstance() {
       return new CVRPPDTWProblemInstance();
@@ -40 +36 @@
       base.Interpret(data, problemInstance);
 
-      PDPTWData pdpData = data as PDPTWData;
-      CVRPPDTWProblemInstance problem = problemInstance as CVRPPDTWProblemInstance;
+      PDPTWData pdpData = (PDPTWData)data;
+      CVRPPDTWProblemInstance problem = (CVRPPDTWProblemInstance)problemInstance;
 
       problem.PickupDeliveryLocation = new IntArray(pdpData.PickupDeliveryLocations);

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/VRPInterpreter.cs

@@ -50 +50 @@
     }
 
-    public abstract Type GetDataType();
-
     protected abstract IVRPProblemInstance CreateProblemInstance();