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

Timestamp:

06/13/12 17:14:53 (12 years ago)

Author:

ascheibe

Message:

#1864

• switched IOperators collection to IItems
• adapted algorithms and problems
• added AfterDeserialization hooks for problem, external evaluation problem and user-defined problem

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (5 diffs)

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

@@ -110 +110 @@
 
     [Storable]
-    private List<IOperator> operators;
-
-    public IEnumerable<IOperator> Operators {
+    private List<IItem> operators;
+
+    public IEnumerable<IItem> Operators {
       get { return operators; }
     }
@@ -131 +131 @@
       EvaluatorParameter.Hidden = true;
 
-      operators = new List<IOperator>();
+      operators = new List<IItem>();
 
       InitializeRandomVRPInstance();
@@ -147 +147 @@
     private VehicleRoutingProblem(VehicleRoutingProblem original, Cloner cloner)
       : base(original, cloner) {
-      this.operators = original.operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      this.operators = original.operators.Select(x => (IItem)cloner.Clone(x)).ToList();
       this.AttachEventHandlers();
     }
@@ -254 +254 @@
 
     private void InitializeOperators() {
-      operators = new List<IOperator>();
+      operators = new List<IItem>();
 
       if (ProblemInstance != null) {
@@ -267 +267 @@
     private void ParameterizeSolutionCreator() {
       if (SolutionCreator is IMultiVRPOperator) {
-        (SolutionCreator as IMultiVRPOperator).SetOperators(Operators);
+        (SolutionCreator as IMultiVRPOperator).SetOperators(Operators.OfType<IOperator>());
       }
     }
 
     private void ParameterizeOperators() {
-      foreach (IOperator op in Operators) {
+      foreach (IOperator op in Operators.OfType<IOperator>()) {
         if (op is IMultiVRPOperator) {
-          (op as IMultiVRPOperator).SetOperators(Operators);
+          (op as IMultiVRPOperator).SetOperators(Operators.OfType<IOperator>());
         }
       }