Changeset 3155 for trunk

Timestamp:

03/22/10 01:41:59 (15 years ago)

Author:

swagner

Message:

Added additional TSP evaluation operators (#924).

Location:

trunk/sources/HeuristicLab.Problems.TSP/3.3

Files:

• Evaluators/TSPEuclideanPathEvaluator.cs (added)
• Evaluators/TSPEvaluator.cs (modified) (1 diff)
• Evaluators/TSPGeoPathEvaluator.cs (added)
• HeuristicLab.Problems.TSP-3.3.csproj (modified) (2 diffs)
• TSP.cs (modified) (1 diff)
• TSPLIBParser.cs (modified) (4 diffs)
• gr666.opt.tour (added)
• gr666.tsp (added)

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

@@ -33 +33 @@
   [StorableClass]
   public abstract class TSPEvaluator : SingleSuccessorOperator, ITSPEvaluator {
+    public override bool CanChangeName {
+      get { return false; }
+    }
+
     public ILookupParameter<DoubleValue> QualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }

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

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
+    <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
     <Compile Include="TSPLIBTourParser.cs" />
     <Compile Include="Interfaces\ICoordinatesTSPSolutionsVisualizer.cs" />
@@ -159 +161 @@
     <None Include="ch130.tsp" />
     <None Include="fl1400.tsp" />
+    <None Include="gr666.opt.tour" />
+    <None Include="gr666.tsp" />
     <None Include="HeuristicLab.snk" />
     <None Include="HeuristicLabProblemsTSPPlugin.cs.frame" />

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

@@ -178 +178 @@
       if (!string.IsNullOrEmpty(tspParser.Comment)) Description = tspParser.Comment;
       Coordinates = new DoubleMatrix(tspParser.Vertices);
+      if (tspParser.WeightType == TSPLIBParser.TSPLIBEdgeWeightType.EUC_2D) {
+        TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator();
+        evaluator.QualityParameter.ActualName = "TSPTourLength";
+        Evaluator = evaluator;
+      } else if (tspParser.WeightType == TSPLIBParser.TSPLIBEdgeWeightType.GEO) {
+        TSPGeoPathEvaluator evaluator = new TSPGeoPathEvaluator();
+        evaluator.QualityParameter.ActualName = "TSPTourLength";
+        Evaluator = evaluator;
+      }
       BestKnownQuality = null;
       BestKnownSolution = null;
+
       if (!string.IsNullOrEmpty(optimalTourFileName)) {
         TSPLIBTourParser tourParser = new TSPLIBTourParser(optimalTourFileName);

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

@@ -29 +29 @@
   /// </summary>
   public class TSPLIBParser {
+    #region Inner Enum TSPLIBEdgeWeightType
+    public enum TSPLIBEdgeWeightType {
+      UNDEFINED,
+      EUC_2D,
+      GEO
+    }
+    #endregion
+
     private const int EOF = 0;
     private const int NAME = 1;
@@ -61 +69 @@
       get { return vertices; }
     }
-    private int weightType;
+    private TSPLIBEdgeWeightType weightType;
     /// <summary>
     /// Gets the weight type of the parsed TSP.
     /// </summary>
-    public int WeightType {
+    public TSPLIBEdgeWeightType WeightType {
       get { return weightType; }
     }
@@ -83 +91 @@
       comment = string.Empty;
       vertices = null;
-      weightType = -1;
+      weightType = TSPLIBEdgeWeightType.UNDEFINED;
     }
 
@@ -193 +201 @@
 
       if (type.Equals("euc_2d", StringComparison.OrdinalIgnoreCase))
-        weightType = 0;
+        weightType = TSPLIBEdgeWeightType.EUC_2D;
       else if (type.Equals("geo", StringComparison.OrdinalIgnoreCase))
-        weightType = 1;
+        weightType = TSPLIBEdgeWeightType.GEO;
       else
         throw new InvalidDataException("Input file contains an unsupported edge weight type (only \"EUC_2D\" and \"GEO\" are supported).");