Changeset 10479 for branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

02/20/14 14:29:01 (10 years ago)

Author:

gkronber

Message:

#2124 merged all changes from trunk to prepare for trunk-reintegration

Location:

branches/SpectralKernelForGaussianProcesses

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (8 diffs)

branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -39 +39 @@
 
 namespace HeuristicLab.Problems.VehicleRouting {
-  public interface IVRPInstanceConsumer :  
-    IProblemInstanceConsumer<CVRPData>, IProblemInstanceConsumer<CVRPTWData>, 
-    IProblemInstanceConsumer<MDCVRPData>, IProblemInstanceConsumer<MDCVRPTWData>,
-    IProblemInstanceConsumer<PDPTWData> {
-  }
-
   [Item("Vehicle Routing Problem", "Represents a Vehicle Routing Problem.")]
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class VehicleRoutingProblem : Problem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IVRPInstanceConsumer {
+  public sealed class VehicleRoutingProblem : Problem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IProblemInstanceConsumer<VRPData> {
     public string Filename { get; set; }
 
@@ -143 +137 @@
       AttachEventHandlers();
       AttachProblemInstanceEventHandlers();
+
+      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
     }
 
@@ -153 +149 @@
       : base(original, cloner) {
       this.AttachEventHandlers();
+      this.AttachProblemInstanceEventHandlers();
+
+      ProblemInstance.SolutionEvaluator = EvaluatorParameter.Value;
     }
 
@@ -173 +172 @@
       AttachEventHandlers();
       AttachProblemInstanceEventHandlers();
+
+      ProblemInstance.SolutionEvaluator = EvaluatorParameter.Value;
     }
 
@@ -189 +190 @@
     private void AttachProblemInstanceEventHandlers() {
       if (ProblemInstance != null) {
-        EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
         ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
       }
@@ -209 +209 @@
 
     void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
-      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
       EvalBestKnownSolution();
     }
@@ -216 +215 @@
       InitializeOperators();
       AttachProblemInstanceEventHandlers();
+
+      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
 
       OnSolutionCreatorChanged();
@@ -383 +384 @@
       }
     }
-
-    public void Load(CVRPData data) {
-      Load(data, new CVRPInterpreter());
-    }
-
-    public void Load(CVRPTWData data) {
-      Load(data, new CVRPTWInterpreter());
-    }
-
-    public void Load(MDCVRPData data) {
-      Load(data, new MDCVRPInterpreter());
-    }
-
-    public void Load(MDCVRPTWData data) {
-      Load(data, new MDCVRPTWInterpreter());
-    }
-
-    public void Load(PDPTWData data) {
-      Load(data, new PDPTWInterpreter());
+    #endregion
+
+    #region IProblemInstanceConsumer<VRPData> Members
+
+    public void Load(VRPData data) {
+      Type interpreterType = typeof(IVRPDataInterpreter<>).MakeGenericType(data.GetType());
+      var interpreters = ApplicationManager.Manager.GetInstances(interpreterType);
+      IVRPDataInterpreter interpreter = null;
+      foreach (object i in interpreters) {
+        var parentInterfaces = i.GetType().BaseType.GetInterfaces();
+        var interfaces = i.GetType().GetInterfaces().Except(parentInterfaces);
+        var interpreterInterface = interfaces.First(j => typeof(IVRPDataInterpreter).IsAssignableFrom(j));
+        var interpreterDataType = interpreterInterface.GetGenericArguments()[0];
+        if (interpreterDataType == data.GetType()) {
+          interpreter = i as IVRPDataInterpreter;
+          break;
+        }
+      }
+
+      if (interpreter == null)
+        throw new ArgumentException("No interpreter found for the VRP type");
+      Load(data, interpreter);
     }