Context Navigation

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

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:

Files:

-                      r4379
+                      r4752
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
+    }
+    protected ZhuCrossover(ZhuCrossover original, Cloner cloner)
+      : base(original, cloner) {
+    }

-                      r4379
+                      r4752
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
     public ZhuHeuristicCrossover1()
       : base() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuHeuristicCrossover1(this, cloner);
+    }
+    private ZhuHeuristicCrossover1(ZhuHeuristicCrossover1 original, Cloner cloner)
+      : base(original, cloner) {
+    }

-                      r4379
+                      r4752
 using HeuristicLab.Data;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
     public ZhuHeuristicCrossover2()
       : base() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuHeuristicCrossover2(this, cloner);
+    }
+    private ZhuHeuristicCrossover2(ZhuHeuristicCrossover2 original, Cloner cloner)
+      : base(original, cloner) {
+    }

-                      r4379
+                      r4752
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
     public ZhuMergeCrossover1()
       : base() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuMergeCrossover1(this, cloner);
+    }
+    private ZhuMergeCrossover1(ZhuMergeCrossover1 original, Cloner cloner)
+      : base(original, cloner) {
+    }

-                      r4379
+                      r4752
 using System.Collections.Generic;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
     public ZhuMergeCrossover2()
       : base() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuMergeCrossover2(this, cloner);
+    }
+    private ZhuMergeCrossover2(ZhuMergeCrossover2 original, Cloner cloner)
+      : base(original, cloner) {
+    }

-                      r4379
+                      r4752
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
       : base() {
       Parameters.Add(new ValueLookupParameter<IPermutationCrossover>("InnerCrossover", "The permutation crossover.", new PartiallyMatchedCrossover()));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PrinsPermutationCrossover(this, cloner);
+    }
+    private PrinsPermutationCrossover(PrinsPermutationCrossover original, Cloner cloner)
+      : base(original, cloner) {
+    }

-                      r4379
+                      r4752
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
+    }
+    protected ZhuManipulator(ZhuManipulator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     protected abstract void Manipulate(IRandom random, ZhuEncoding individual);

-                      r4379
+                      r4752
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
 …
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuPermutationManipulator(this, cloner);
+    }
+    private ZhuPermutationManipulator(ZhuPermutationManipulator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     protected override void Manipulate(IRandom random, ZhuEncoding individual) {
       InnerManipulatorParameter.ActualValue.PermutationParameter.ActualName = VRPToursParameter.ActualName;

-                      r4379
+                      r4752
     #endregion
+    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
+      ZhuEncoding clone = new ZhuEncoding(
+        new Permutation(this.PermutationType, this.array), ProblemInstance);
+      cloner.RegisterClonedObject(this, clone);
+      clone.readOnly = readOnly;
+      return clone;
+    public ZhuEncoding(Permutation permutation, IVRPProblemInstance problemInstance)
+      : base(permutation, problemInstance) {
+    }
+    public ZhuEncoding(Permutation permutation, IVRPProblemInstance problemInstance)
+      : base(permutation, problemInstance) {
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuEncoding(this, cloner);
+    }
+    protected ZhuEncoding(ZhuEncoding original, Cloner cloner)
+      : base(original, cloner) {
+    }

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