Context Navigation

Changeset 4696 for branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3

Timestamp:

10/31/10 11:36:07 (14 years ago)

Author:

abeham

Message:

#922

Fixed most of the errors that surfaced in the test cases
Removed storable attribute from SymbolicExpressionTreeStringFormatter
Modified StorableConstructorTest that the StorableConstructor may also be public (such as in BoolValue)

Location:

Files:

-                      r4690
+                      r4696
     [StorableConstructor]
+    private AlbaIntraRouteInversionMoveMaker(bool deserializing) : base(deserializing) { }
+    private AlbaIntraRouteInversionMoveMaker(AlbaIntraRouteInversionMoveMaker original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    protected AlbaIntraRouteInversionMoveMaker(bool deserializing) : base(deserializing) { }
+    protected AlbaIntraRouteInversionMoveMaker(AlbaIntraRouteInversionMoveMaker original, Cloner cloner) : base(original, cloner) { }
     public AlbaIntraRouteInversionMoveMaker()
       : base() {

r4690	r4696
47	47
48	48	[StorableConstructor]
49		pr~~ivate~~ AlbaLambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { }
	49	protected AlbaLambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { }
50	50	protected AlbaLambdaInterchangeMoveMaker(AlbaLambdaInterchangeMoveMaker original, Cloner cloner)
51	51	: base(original, cloner) {

r4687	r4696
79	79
80	80	[StorableConstructor]
81		pr~~ivate~~ MultiVRPSolutionCreator(bool deserializing) : base(deserializing) { }
	81	protected MultiVRPSolutionCreator(bool deserializing) : base(deserializing) { }
82	82	protected MultiVRPSolutionCreator(MultiVRPSolutionCreator original, Cloner cloner) : base(original, cloner) { }
83	83	public override IDeepCloneable Clone(Cloner cloner) {

r4687	r4696
83	83
84	84	[StorableConstructor]
85		pr~~ivate~~ MultiVRPSolutionCrossover(bool deserializing) : base(deserializing) { }
	85	protected MultiVRPSolutionCrossover(bool deserializing) : base(deserializing) { }
86	86	protected MultiVRPSolutionCrossover(MultiVRPSolutionCrossover original, Cloner cloner) : base(original, cloner) { }
87	87	public override IDeepCloneable Clone(Cloner cloner) {

r4687	r4696
79	79
80	80	[StorableConstructor]
81		pr~~ivate~~ MultiVRPSolutionManipulator(bool deserializing) : base(deserializing) { }
	81	protected MultiVRPSolutionManipulator(bool deserializing) : base(deserializing) { }
82	82	protected MultiVRPSolutionManipulator(MultiVRPSolutionManipulator original, Cloner cloner) : base(original, cloner) { }
83	83	public override IDeepCloneable Clone(Cloner cloner) {

-                      r4687
+                      r4696
     [StorableConstructor]
     private MultiVRPMoveGenerator(bool deserializing) : base(deserializing) { }
     private MultiVRPMoveGenerator(MultiVRPMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    protected MultiVRPMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected MultiVRPMoveGenerator(MultiVRPMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new MultiVRPMoveGenerator(this, cloner);

r4687	r4696
80	80
81	81	[StorableConstructor]
82		pr~~ivate~~ LambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { }
	82	protected LambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { }
83	83	protected LambdaInterchangeMoveMaker(LambdaInterchangeMoveMaker original, Cloner cloner) : base(original, cloner) { }
84	84	public override IDeepCloneable Clone(Cloner cloner) {

-                      r4691
+                      r4696
     public List<int> Unrouted { get; set; }
+    public PotvinEncoding()
+      : base() {
+      Unrouted = new List<int>();
+    }
+    [StorableConstructor]
+    protected PotvinEncoding(bool deserializing) : base(deserializing) { }
     protected PotvinEncoding(PotvinEncoding original, Cloner cloner)
       : base(original, cloner) {
 …
       Unrouted = new List<int>(original.Unrouted);
+    }
+    public PotvinEncoding()
+      : base() {
+      Unrouted = new List<int>();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PotvinEncoding(this, cloner);
+    }
-    [StorableConstructor]
-    private PotvinEncoding(bool serializing)
-      : base() {
+    }

-                      r4693
+                      r4696
     [StorableConstructor]
+    private ZhuEncoding(bool serializing)
+      : base(serializing) {
+    }
+    protected ZhuEncoding(bool deserializing) : base(deserializing) { }
     protected ZhuEncoding(ZhuEncoding original, Cloner cloner)
       : base(original, cloner) {

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