Changeset 4722 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -82 +82 @@
     }
 
+    [StorableConstructor]
+    private VRPEvaluator(bool deserializing) : base(deserializing) { }
+    private VRPEvaluator(VRPEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public VRPEvaluator()
       : base() {
@@ -98 +103 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new VRPEvaluator(this, cloner);
+    }
+
     private double CalculateFleetUsage() {
       IVRPEncoding vrpSolution = VRPToursParameter.ActualValue;