Context Navigation

Changeset 6883 for branches

Timestamp:

10/06/11 12:27:40 (13 years ago)

Author:

svonolfe

Message:

Added vehicle information to the tour insertion info (#1177)

Location:

Files:

r6854	r6883
48	48
49	49	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
50		TourInsertionInfo tourInfo = new TourInsertionInfo();
	50	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
51	51	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
52	52

r6856	r6883
48	48
49	49	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
50		TourInsertionInfo tourInfo = new TourInsertionInfo();
	50	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
51	51	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
52	52

r6855	r6883
52	52
53	53	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
54		TourInsertionInfo tourInfo = new TourInsertionInfo();
	54	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
55	55	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
56	56

r6854	r6883
41	41	public class MultiDepotVRPEvaluator: VRPEvaluator {
42	42	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
43		TourInsertionInfo tourInfo = new TourInsertionInfo();
	43	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
44	44	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
45	45

r6851	r6883
48	48
49	49	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
50		TourInsertionInfo tourInfo = new TourInsertionInfo();
	50	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); ;
51	51	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
52	52

r6855	r6883
48	48
49	49	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
50		TourInsertionInfo tourInfo = new TourInsertionInfo();
	50	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
51	51	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
52	52

r6855	r6883
52	52
53	53	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
54		TourInsertionInfo tourInfo = new TourInsertionInfo();
	54	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
55	55	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
56	56

r6851	r6883
41	41	public class SingleDepotVRPEvaluator: VRPEvaluator {
42	42	protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
43		TourInsertionInfo tourInfo = new TourInsertionInfo();
	43	TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
44	44	eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
45	45

-                      r6752
+                      r6883
     public double Penalty { get; set; }
+    public int Vehicle { get; set; }
     private List<StopInsertionInfo> stopInsertionInfos;
     public TourInsertionInfo()
+    public TourInsertionInfo(int vehicle)
       : base() {
       stopInsertionInfos = new List<StopInsertionInfo>();
+      Vehicle = vehicle;
+    }

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