Changeset 3074 for trunk/sources/HeuristicLab.Algorithms.TS/3.3/TSMainLoop.cs

Timestamp:

03/16/10 21:29:10 (14 years ago)

Author:

abeham

Message:

updated tabu search #840

File:

• trunk/sources/HeuristicLab.Algorithms.TS/3.3/TSMainLoop.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Algorithms.TS/3.3/TSMainLoop.cs

@@ -42 +42 @@
       get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    public SubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public LookupParameter<DoubleValue> QualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["Quality"]; }
+    }
+    public LookupParameter<DoubleValue> MoveQualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
     public ValueLookupParameter<IntValue> MaximumIterationsParameter {
@@ -57 +60 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["MoveGenerator"]; }
     }
-    public ValueLookupParameter<IOperator> MoveQualityEvaluatorParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["MoveQualityEvaluator"]; }
-    }
-    public ValueLookupParameter<IOperator> MoveTabuEvaluatorParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["MoveTabuEvaluator"]; }
-    }
-    public ValueLookupParameter<IOperator> TabuSelectorParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["TabuSelector"]; }
-    }
-    public ValueLookupParameter<IOperator> MoveTabuMakerParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["MoveTabuMaker"]; }
+    public ValueLookupParameter<IOperator> MoveEvaluatorParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["MoveEvaluator"]; }
     }
     public ValueLookupParameter<IOperator> MoveMakerParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["MoveMaker"]; }
+    }
+    public ValueLookupParameter<IOperator> TabuMoveEvaluatorParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["TabuMoveEvaluator"]; }
+    }
+    public ValueLookupParameter<IOperator> TabuMoveMakerParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["TabuMoveMaker"]; }
     }
 
@@ -86 +86 @@
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The value which represents the quality of a move."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed."));
       Parameters.Add(new ValueLookupParameter<IntValue>("TabuTenure", "The length of the tabu list, and also means the number of iterations a move is kept tabu"));
@@ -92 +93 @@
 
       Parameters.Add(new ValueLookupParameter<IOperator>("MoveGenerator", "The operator that generates the moves."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("MoveQualityEvaluator", "The operator that evaluates the quality of a move."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("MoveTabuEvaluator", "The operator that evaluates whether a move is tabu."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("MoveTabuMaker", "The operator that declares a move tabu."));
       Parameters.Add(new ValueLookupParameter<IOperator>("MoveMaker", "The operator that performs a move and updates the quality."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("MoveEvaluator", "The operator that evaluates a move."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("TabuMoveEvaluator", "The operator that evaluates whether a move is tabu."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("TabuMoveMaker", "The operator that declares a move tabu."));
 
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the TS should be applied."));
@@ -108 +109 @@
       Placeholder moveGenerator = new Placeholder();
       UniformSequentialSubScopesProcessor moveEvaluationProcessor = new UniformSequentialSubScopesProcessor();
-      Placeholder moveQualityEvaluator = new Placeholder();
-      Placeholder moveTabuEvaluator = new Placeholder();
+      Placeholder moveEvaluator = new Placeholder();
+      Placeholder tabuMoveEvaluator = new Placeholder();
       SubScopesSorter moveQualitySorter = new SubScopesSorter();
       BestAverageWorstQualityCalculator bestAverageWorstMoveQualityCalculator = new BestAverageWorstQualityCalculator();
@@ -115 +116 @@
       RightReducer rightReducer = new RightReducer();
       UniformSequentialSubScopesProcessor moveMakingProcessor = new UniformSequentialSubScopesProcessor();
-      Placeholder moveTabuMaker = new Placeholder();
+      Placeholder tabuMoveMaker = new Placeholder();
       Placeholder moveMaker = new Placeholder();
       DataTableValuesCollector valuesCollector = new DataTableValuesCollector();
@@ -143 +144 @@
       moveGenerator.OperatorParameter.ActualName = "MoveGenerator";
 
-      moveQualityEvaluator.Name = "MoveQualityEvaluator (placeholder)";
-      moveQualityEvaluator.OperatorParameter.ActualName = "MoveQualityEvaluator";
-
-      moveTabuEvaluator.Name = "MoveTabuEvaluator (placeholder)";
-      moveTabuEvaluator.OperatorParameter.ActualName = "MoveTabuEvaluator";
+      moveEvaluator.Name = "MoveEvaluator (placeholder)";
+      moveEvaluator.OperatorParameter.ActualName = "MoveEvaluator";
+
+      tabuMoveEvaluator.Name = "TabuMoveEvaluator (placeholder)";
+      tabuMoveEvaluator.OperatorParameter.ActualName = "TabuMoveEvaluator";
 
       moveQualitySorter.DescendingParameter.ActualName = "Maximization";
@@ -162 +163 @@
       moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
 
-      moveTabuMaker.Name = "MoveTabuMaker (placeholder)";
-      moveTabuMaker.OperatorParameter.ActualName = "MoveTabuMaker";
+      tabuMoveMaker.Name = "TabuMoveMaker (placeholder)";
+      tabuMoveMaker.OperatorParameter.ActualName = "TabuMoveMaker";
 
       moveMaker.Name = "MoveMaker (placeholder)";
@@ -198 +199 @@
       mainProcessor.Successor = valuesCollector;
       moveGenerator.Successor = moveEvaluationProcessor;
-      moveEvaluationProcessor.Operator = moveQualityEvaluator;
+      moveEvaluationProcessor.Operator = moveEvaluator;
       moveEvaluationProcessor.Successor = moveQualitySorter;
-      moveQualityEvaluator.Successor = moveTabuEvaluator;
+      moveEvaluator.Successor = tabuMoveEvaluator;
       moveQualitySorter.Successor = bestAverageWorstMoveQualityCalculator;
       bestAverageWorstMoveQualityCalculator.Successor = tabuSelector;
       tabuSelector.Successor = rightReducer;
       rightReducer.Successor = moveMakingProcessor;
-      moveMakingProcessor.Operator = moveTabuMaker;
+      moveMakingProcessor.Operator = tabuMoveMaker;
       moveMakingProcessor.Successor = subScopesRemover;
-      moveTabuMaker.Successor = moveMaker;
+      tabuMoveMaker.Successor = moveMaker;
       valuesCollector.Successor = iterationsCounter;
       iterationsCounter.Successor = iterationsComparator;