Context Navigation

Changeset 4047

Timestamp:

07/19/10 16:50:39 (14 years ago)

Author:

abeham

Message:

#1084

Location:

trunk/sources

Files:

-                      r3789
+                      r4047
+    }
     private void UpdateMoveEvaluators() {
+      foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>().ToList())
+        operators.Remove(op);
+      operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       foreach (ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())
         if (op.EvaluatorType == Evaluator.GetType()) {

r3991	r4047
34	34	[Item("AlbaTranslocationMoveGenerator", "An operator which generates translocation moves for the alba representation.")]
35	35	[StorableClass]
36		public sealed class AlbaTranslocationMoveGenerator : AlbaMoveOperator, I~~Permutation~~TranslocationMoveOperator, IMultiMoveGenerator {
	36	public sealed class AlbaTranslocationMoveGenerator : AlbaMoveOperator, IAlbaTranslocationMoveOperator, IMultiMoveGenerator {
37	37	public IValueLookupParameter<TranslocationMoveGenerator> TranslocationMoveGeneratorParameter {
38	38	get { return (IValueLookupParameter<TranslocationMoveGenerator>)Parameters["TranslocationMoveGenerator"]; }

r3938	r4047
34	34	[Item("AlbaTranslocationMoveHardTabuCriterion", "An operator which checks if translocation moves are tabu using a hard criterion.")]
35	35	[StorableClass]
36		public sealed class AlbaTranslocationMoveHardTabuCriterion : AlbaMoveOperator, I~~Permutation~~TranslocationMoveOperator, ITabuChecker {
	36	public sealed class AlbaTranslocationMoveHardTabuCriterion : AlbaMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
37	37	private TranslocationMoveHardTabuCriterion tabuChecker;
38	38	protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

r3938	r4047
34	34	[Item("AlbaTranslocationMoveMaker", "An operator which makes translocation moves for the alba representation.")]
35	35	[StorableClass]
36		public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, I~~Permutation~~TranslocationMoveOperator, IMoveMaker {
	36	public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, IAlbaTranslocationMoveOperator, IMoveMaker {
37	37	private TranslocationMoveMaker moveMaker;
38	38	protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

r3938	r4047
34	34	[Item("AlbaTranslocationMoveSoftTabuCriterion", "An operator which checks if translocation moves are tabu using a soft criterion.")]
35	35	[StorableClass]
36		public sealed class AlbaTranslocationMoveSoftTabuCriterion : AlbaMoveOperator, I~~Permutation~~TranslocationMoveOperator, ITabuChecker {
	36	public sealed class AlbaTranslocationMoveSoftTabuCriterion : AlbaMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
37	37	private TranslocationMoveSoftTabuCriterion tabuChecker;
38	38	protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

r3938	r4047
34	34	[Item("AlbaTranslocationMoveTabuMaker", "An operator which makes translocation moves tabu for the alba representation.")]
35	35	[StorableClass]
36		public sealed class AlbaTranslocationMoveTabuMaker : AlbaMoveOperator, I~~Permutation~~TranslocationMoveOperator, ITabuMaker {
	36	public sealed class AlbaTranslocationMoveTabuMaker : AlbaMoveOperator, IAlbaTranslocationMoveOperator, ITabuMaker {
37	37	private TranslocationMoveTabuMaker moveTabuMaker;
38	38	protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

r3938	r4047
86	86	<Compile Include="Analyzers\BestVRPSolutionAnalyzer.cs" />
87	87	<Compile Include="Encodings\Alba\Crossovers\AlbaPermutationCrossover.cs" />
	88	<Compile Include="Encodings\Alba\Interfaces\IAlbaTranslocationMoveOperator.cs" />
88	89	<Compile Include="Encodings\Alba\Manipulators\AlbaPermutationManipulator.cs" />
89	90	<Compile Include="Encodings\Alba\Creators\AlbaPushForwardInsertionCreator.cs" />

-                      r4015
+                      r4047
+    }
     private void InitializeMoveGenerators() {
       foreach (AlbaTranslocationMoveGenerator op in Operators.OfType<AlbaTranslocationMoveGenerator>()) {
+      foreach (IAlbaTranslocationMoveOperator op in Operators.OfType<IAlbaTranslocationMoveOperator>()) {
         if (op is IMoveGenerator) {
           op.TranslocationMoveParameter.ActualNameChanged += new EventHandler(TranslocationMoveParameter_ActualNameChanged);
 …
         op.TardinessPenalty.ActualName = TardinessPenalty.Name;
+      }
       string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName;
       foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>())
+      string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IAlbaTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName;
+      foreach (IAlbaTranslocationMoveOperator op in Operators.OfType<IAlbaTranslocationMoveOperator>())
         op.TranslocationMoveParameter.ActualName = translocationMove;

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