Context Navigation

HeuristicLab.Problems.VehicleRouting

Timestamp:

01/20/12 13:52:51 (13 years ago)

Author:

ascheibe

Message:

#1745 merged trunk changes into branch

Location:

branches/HiveHiveEngine

Files:

Property svn:ignore

-                      old
+                      new
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 …
 bin
 protoc.exe
-*.user

Property svn:mergeinfo changed
/trunk/sources (added) merged: 7294-7295,7297,7304-7306,7318,7327,7333,7335,7341-7342,7351-7353,7369-7370

branches/HiveHiveEngine/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 7351

-                      r7259
+                      r7383
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      #region Backwards Compatibility
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
       if (!Parameters.ContainsKey("BestKnownQuality")) {
         Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));

-                      r7259
+                      r7383
     private VehicleRoutingProblem(VehicleRoutingProblem original, Cloner cloner)
       : base(original, cloner) {
       AttachEventHandlers();
+      RegisterEventHandlers();
+    }
     public VehicleRoutingProblem()
 …
       InitializeOperators();
       AttachEventHandlers();
+      RegisterEventHandlers();
+    }
 …
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      #region Backwards Compatibility
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
       if (!Parameters.ContainsKey("BestKnownSolution")) {
         Parameters.Add(new OptionalValueParameter<IVRPEncoding>("BestKnownSolution", "The best known solution of this TSP instance."));
 …
       #endregion
       AttachEventHandlers();
+    }
     private void AttachEventHandlers() {
+      RegisterEventHandlers();
+    }
+    private void RegisterEventHandlers() {
       CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);

Note: See TracChangeset for help on using the changeset viewer.