Context Navigation

Changeset 7855

Timestamp:

05/21/12 14:32:32 (13 years ago)

Author:

svonolfe

Message:

Deactivated LS manipulators by default (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

r6716	r7855
84	84	foreach (IOperator op in operators) {
85	85	if (op is IVRPManipulator && !(op is MultiVRPSolutionManipulator)) {
86		Operators.Add(op.Clone() as IVRPManipulator, ~~true~~);
	86	Operators.Add(op.Clone() as IVRPManipulator, !(op is IVRPLocalSearchManipulator));
87	87	}
88	88	}

r6851	r7855
36	36	public abstract List<Tour> GetTours();
37	37
38		public int GetTourIndex(Tour tour) {
	38	public virtual int GetTourIndex(Tour tour) {
39	39	int index = -1;
40	40

r6093	r7855
71	71
72	72	foreach (IVRPManipulator shaker in ApplicationManager.Manager.GetInstances<IVRPManipulator>().OrderBy(x => x.Name))
73		if (!(shaker is MultiVRPSolutionManipulator)) Operators.Add(shaker);
	73	if (!(shaker is MultiVRPSolutionManipulator)) Operators.Add(shaker, !(shaker is IVRPLocalSearchManipulator));
74	74	}
75	75

-                      r6838
+                      r7855
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinLocalSearchManipulator", "The LSM operator which manipulates a VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
   [StorableClass]
   public sealed class PotvinLocalSearchManipulator : PotvinManipulator {
+  public sealed class PotvinLocalSearchManipulator : PotvinManipulator, IVRPLocalSearchManipulator {
     public IValueParameter<IntValue> Iterations {
       get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }

-                      r6607
+                      r7855
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
   [Item("PrinsLSManipulator", "An operator which manipulates a VRP representation by using the Prins local search.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
   [StorableClass]
   public abstract class PrinsLSManipulator : PrinsManipulator {
+  public abstract class PrinsLSManipulator : PrinsManipulator, IVRPLocalSearchManipulator {
     public IValueParameter<IntValue> Iterations {
       get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }

r7689	r7855
190	190	<Compile Include="Encodings\Potvin\Moves\OnePointCrossover\PotvinOnePointCrossoverMultiMoveGenerator.cs" />
191	191	<Compile Include="Encodings\Potvin\Moves\OnePointCrossover\PotvinOnePointCrossoverSingleMoveGenerator.cs" />
	192	<Compile Include="Interfaces\IVRPLocalSearchManipulator.cs" />
192	193	<Compile Include="Properties\AssemblyInfo.cs" />
193	194	<Compile Include="Encodings\Alba\AlbaEncoding.cs" />

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