Changeset 10651 for trunk

Timestamp:

03/24/14 16:59:40 (11 years ago)

Author:

pfleck

Message:

#2152:

• Lookup for appropriate Interpreter now causes an InvalidOperationException if no or more than one interpreter is found.
• Put InterpreterDataType extraction into new method for better readability.

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -389 +389 @@
 
     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);
+      var interpreterDataType = data.GetType();
+      var interpreterType = typeof(IVRPDataInterpreter<>).MakeGenericType(interpreterDataType);
+
+      var interpreters = ApplicationManager.Manager.GetTypes(interpreterType);
+
+      var concreteInterpreter = interpreters.Single(t => GetInterpreterDataType(t) == interpreterDataType);
+
+      Load(data, (IVRPDataInterpreter)Activator.CreateInstance(concreteInterpreter));
+    }
+
+    private Type GetInterpreterDataType(Type type) {
+      var parentInterfaces = type.BaseType.GetInterfaces();
+      var interfaces = type.GetInterfaces().Except(parentInterfaces);
+
+      var interpreterInterface = interfaces.Single(i => typeof(IVRPDataInterpreter).IsAssignableFrom(i));
+      return interpreterInterface.GetGenericArguments()[0];
     }