Changeset 4752 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

11/09/10 09:55:31 (14 years ago)

Author:

svonolfe

Message:

Merged relevant changes from the trunk into the branch (cloning,...) (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Files:

• Creators/MultiVRPSolutionCreator.cs (modified) (2 diffs)
• Creators/VRPCreator.cs (modified) (2 diffs)
• Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (2 diffs)
• Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (2 diffs)
• Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (2 diffs)
• Moves/VRPMoveEvaluator.cs (modified) (2 diffs)
• Moves/VRPMoveGenerator.cs (modified) (2 diffs)
• Moves/VRPMoveMaker.cs (modified) (2 diffs)
• Moves/VRPMoveOperator.cs (modified) (2 diffs)
• PermutationEncoding.cs (modified) (1 diff)
• TourEncoding.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Creators/MultiVRPSolutionCreator.cs

@@ -33 +33 @@
 using HeuristicLab.Problems.VehicleRouting.Variants;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -60 +61 @@
 
       Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiVRPSolutionCreator(this, cloner);
+    }
+
+    protected MultiVRPSolutionCreator(MultiVRPSolutionCreator original, Cloner cloner)
+      : base(original, cloner) {
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Creators/VRPCreator.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -46 +47 @@
         Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours to be created."));
     }
+
+    protected VRPCreator(VRPCreator original, Cloner cloner)
+      : base(original, cloner) {
+    }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

@@ -26 +26 @@
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -43 +44 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiVRPMoveEvaluator(this, cloner);
+    }
+
+    private MultiVRPMoveEvaluator(MultiVRPMoveEvaluator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
     protected override void EvaluateMove() {
       IVRPMove move = VRPMoveParameter.ActualValue as IVRPMove;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

@@ -33 +33 @@
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -86 +87 @@
       Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours."));
       Parameters.Add(new LookupParameter<IVRPMove>("VRPMove", "The generated moves."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiVRPMoveGenerator(this, cloner);
+    }
+
+    protected MultiVRPMoveGenerator(MultiVRPMoveGenerator original, Cloner cloner)
+      : base(original, cloner) {
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs

@@ -28 +28 @@
 using System.Collections.Generic;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General{
@@ -45 +46 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiVRPMoveMaker(this, cloner);
+    }
+
+    protected MultiVRPMoveMaker(MultiVRPMoveMaker original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
     protected override void PerformMove() {
       IVRPMove move = VRPMoveParameter.ActualValue as IVRPMove;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -51 +52 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
+    }
+
+    protected VRPMoveEvaluator(VRPMoveEvaluator original, Cloner cloner)
+      : base(original, cloner) {
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveGenerator.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -42 +43 @@
       : base() {
     }
+
+    protected VRPMoveGenerator(VRPMoveGenerator original, Cloner cloner)
+      : base(original, cloner) {
+    }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -49 +50 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
+    }
+
+    protected VRPMoveMaker(VRPMoveMaker original, Cloner cloner)
+      : base(original, cloner) {
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveOperator.cs

@@ -28 +28 @@
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Parameters;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -45 +46 @@
       Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours considered in the move."));
     }
+
+    protected VRPMoveOperator(VRPMoveOperator original, Cloner cloner)
+      : base(original, cloner) {
+    }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs

@@ -40 +40 @@
     protected IVRPProblemInstance ProblemInstance { get; set; }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      PermutationEncoding clone = (PermutationEncoding)base.Clone(cloner);
-
-      clone.ProblemInstance = (IVRPProblemInstance)cloner.Clone(ProblemInstance);
-
-      return clone;
+    protected PermutationEncoding(PermutationEncoding original, Cloner cloner)
+      : base(original, cloner) {
+        this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
+        this.readOnly = original.readOnly;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -82 +82 @@
     }
 
+    protected TourEncoding(TourEncoding original, Cloner cloner)
+      : base(original, cloner) {
+       this.Tours = (ItemList<Tour>)cloner.Clone(original.Tours);
+       this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
+    }
+
     public static void ConvertFrom(IVRPEncoding encoding, TourEncoding solution, IVRPProblemInstance problemInstance) {
       solution.Tours = new ItemList<Tour>(encoding.GetTours());