Context Navigation

Changeset 6837

Timestamp:

09/27/11 13:29:22 (13 years ago)

Author:

svonolfe

Message:

Fixed issue when individual contained more tours then vehicles (#1177)

Location:

Files:

r6752	r6837
56	56	}
57	57
58		public virtual List<Tour> GetTours() {
59		Repair();
60
	58	public virtual List<Tour> GetTours() {
61	59	List<Tour> result = new List<Tour>();
62	60	foreach (Tour tour in Tours)
…	…
105	103	public static void ConvertFrom(IVRPEncoding encoding, TourEncoding solution, IVRPProblemInstance problemInstance) {
106	104	solution.Tours = new ItemList<Tour>(encoding.GetTours());
	105	solution.Repair();
107	106	}
108	107
…	…
121	120	}
122	121	}
	122
	123	solution.Repair();
123	124	}
124	125	}

-                      r6607
+                      r6837
+      }
       if (!allowInfeasible && !instance.Feasible(newTour))
+      if (!allowInfeasible && !instance.TourFeasible(newTour, solution))
         return false;
 …
       ChildParameter.ActualValue = Crossover(RandomParameter.ActualValue, parents[0] as PotvinEncoding, parents[1] as PotvinEncoding);
+      (ChildParameter.ActualValue as PotvinEncoding).Repair();
       return base.Apply();

r6607	r6837
95	95
96	96	Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as PotvinEncoding);
	97	(VRPToursParameter.ActualValue as PotvinEncoding).Repair();
97	98
98	99	return base.Apply();

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