Context Navigation

TwoOptStar

Timestamp:

05/25/12 11:34:55 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4
- Property svn:mergeinfo set to
  /trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4 merged eligible

r7865	r7907
44	44	}
45	45
46		private PotvinTwoOptStarExhaustiveMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
	46	private PotvinTwoOptStarExhaustiveMoveGenerator(PotvinTwoOptStarExhaustiveMoveGenerator original, Cloner cloner)
47	47	: base(original, cloner) {
48	48	}

-                      r7865
+                      r7907
+    }
+    [StorableConstructor]
+    protected PotvinTwoOptStarMove(bool deserializing) : base(deserializing) { }
     #region IVRPMove Members

r7865	r7907
45	45
46	46	[StorableConstructor]
47		pr~~ivate~~ PotvinTwoOptStarMoveMaker(bool deserializing) : base(deserializing) { }
	47	protected PotvinTwoOptStarMoveMaker(bool deserializing) : base(deserializing) { }
48	48
49	49	public PotvinTwoOptStarMoveMaker()

r7865	r7907
56	56	}
57	57
58		private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
	58	private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarMultiMoveGenerator original, Cloner cloner)
59	59	: base(original, cloner) {
60	60	}

r7865	r7907
60	60	}
61	61
62		private PotvinTwoOptStarSingleMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
	62	private PotvinTwoOptStarSingleMoveGenerator(PotvinTwoOptStarSingleMoveGenerator original, Cloner cloner)
63	63	: base(original, cloner) {
64	64	}

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