Changeset 7958 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

06/05/12 08:34:36 (12 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• . (modified) (1 prop)
• VehicleRoutingProblem.cs (modified) (6 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.Instances;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Problems.VehicleRouting.Interpreters;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
-using HeuristicLab.Problems.Instances;
-using System.Reflection;
-using HeuristicLab.Problems.VehicleRouting.Interpreters;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -112 +110 @@
 
     [Storable]
-    private List<IOperator> operators; 
+    private List<IOperator> operators;
 
     public IEnumerable<IOperator> Operators {
@@ -173 +171 @@
       EventHandler handler = Reset;
       if (handler != null) handler(this, EventArgs.Empty);
-    }  
+    }
     #endregion
 
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
+    private void AfterDeserialization() {
       AttachEventHandlers();
       AttachProblemInstanceEventHandlers();
@@ -204 +202 @@
 
         ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
-      }      
+      }
     }
 
@@ -248 +246 @@
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeSolutionCreator();
-      
+
       OnSolutionCreatorChanged();
     }
@@ -369 +367 @@
       } else {
         throw new Exception("Cannot find an interpreter for " + data.GetType());
-      }   
+      }
     }
   }