Changeset 3074 for trunk/sources/HeuristicLab.Problems.TSP

Timestamp:

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

Author:

abeham

Message:

updated tabu search #840

Location:

trunk/sources/HeuristicLab.Problems.TSP/3.3

Files:

• HeuristicLab.Problems.TSP-3.3.csproj (modified) (1 diff)
• Interfaces/ITSPMoveEvaluator.cs (added)
• Interfaces/ITSPPathMoveEvaluator.cs (added)
• MoveEvaluators/TSPMoveEvaluator.cs (added)
• MoveEvaluators/TSPPathMoveEvaluator.cs (added)
• MoveEvaluators/TwoOptMoveTSPCoordinatesPathEvaluator.cs (added)
• MoveEvaluators/TwoOptMoveTSPEvaluator.cs (deleted)
• MoveEvaluators/TwoOptMoveTSPRoundedEuclideanPathEvaluator.cs (added)
• TSP.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.TSP/3.3/HeuristicLab.Problems.TSP-3.3.csproj

@@ -89 +89 @@
     <Compile Include="Interfaces\ITSPCoordinatesPathEvaluator.cs" />
     <Compile Include="Interfaces\ITSPEvaluator.cs" />
+    <Compile Include="Interfaces\ITSPMoveEvaluator.cs" />
     <Compile Include="Interfaces\ITSPPathEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsTSPPlugin.cs" />
-    <Compile Include="MoveEvaluators\TwoOptMoveTSPEvaluator.cs">
+    <Compile Include="Interfaces\ITSPPathMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\TwoOptMoveTSPRoundedEuclideanPathEvaluator.cs" />
+    <Compile Include="MoveEvaluators\TSPPathMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\TSPMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\TwoOptMoveTSPCoordinatesPathEvaluator.cs">
       <SubType>Code</SubType>
     </Compile>

trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs

@@ -196 +196 @@
       OnEvaluatorChanged();
     }
+    private void MoveGenerator_TwoOptMoveParameter_ActualNameChanged(object sender, EventArgs e) {
+      string name = ((ILookupParameter<TwoOptMove>)sender).ActualName;
+      foreach (ITwoOptPermutationMoveOperator op in Operators.OfType<ITwoOptPermutationMoveOperator>()) {
+        if (!(op is IMoveGenerator)) op.TwoOptMoveParameter.ActualName = name;
+      }
+    }
+    private void MoveGenerator_ThreeOptMoveParameter_ActualNameChanged(object sender, EventArgs e) {
+      string name = ((ILookupParameter<ThreeOptMove>)sender).ActualName;
+      foreach (IThreeOptPermutationMoveOperator op in Operators.OfType<IThreeOptPermutationMoveOperator>()) {
+        if (!(op is IMoveGenerator)) op.ThreeOptMoveParameter.ActualName = name;
+      }
+    }
     #endregion
 
@@ -228 +240 @@
         ParameterizeOperators();
       }
+      InitializeMoveGenerators();
     }
     private void ParameterizeOperators() {
@@ -237 +250 @@
         op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
       }
-    }
+      foreach (IPermutationMoveOperator op in Operators.OfType<IPermutationMoveOperator>()) {
+        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+      }
+      foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>()) {
+        op.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        op.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
+        op.UseDistanceMatrixParameter.ActualName = UseDistanceMatrixParameter.Name;
+      }
+    }
+    private void InitializeMoveGenerators() {
+      foreach (ITwoOptPermutationMoveOperator op in Operators.OfType<ITwoOptPermutationMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.TwoOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TwoOptMoveParameter_ActualNameChanged);
+        }
+      }
+      foreach (IThreeOptPermutationMoveOperator op in Operators.OfType<IThreeOptPermutationMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.ThreeOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_ThreeOptMoveParameter_ActualNameChanged);
+        }
+      }
+    }
+
     private void ClearDistanceMatrix() {
       DistanceMatrixParameter.Value = null;