Changeset 11261 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering

Timestamp:

08/04/14 14:12:16 (10 years ago)

Author:

pfleck

Message:

#2208

• Added Schilde instances zip
• Implemented additional InstanceConsumer of OPData in OrienteeringProblem

Location:

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3

Files:

• Data (added)
• Data/SchildeOP.zip (added)
• HeuristicLab.Problems.Instances.Orienteering-3.3.csproj (modified) (1 diff)
• SchildeOPParser.cs (modified) (11 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/HeuristicLab.Problems.Instances.Orienteering-3.3.csproj

@@ -45 +45 @@
   <ItemGroup>
     <Compile Include="SchildeOPParser.cs" />
+    <EmbeddedResource Include="Data\SchildeOP.zip" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeOPParser.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -26 +28 @@
 namespace HeuristicLab.Problems.Instances.Orienteering {
   public class SchildeOPParser {
+    private static readonly IFormatProvider FormatProvider = new CultureInfo("en-US");
+
     private int currentPoint;
     private int currentDistance;
@@ -112 +116 @@
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
 
-          Coordinates[currentPoint, 0] = double.Parse(positionX);
-          Coordinates[currentPoint, 1] = double.Parse(positionY);
+          Coordinates[currentPoint, 0] = double.Parse(positionX, FormatProvider);
+          Coordinates[currentPoint, 1] = double.Parse(positionY, FormatProvider);
 
           // Extract all score values for this point
@@ -122 +126 @@
               score = inputString.Substring(0, inputString.IndexOf(','));
               inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
-              Scores[currentPoint, scoreIndex++] = int.Parse(score);
+              Scores[currentPoint, scoreIndex++] = int.Parse(score, FormatProvider);
             } else {
               score = inputString;
-              Scores[currentPoint, scoreIndex++] = int.Parse(score);
+              Scores[currentPoint, scoreIndex++] = int.Parse(score, FormatProvider);
               break;
             }
@@ -148 +152 @@
               distance = inputString.Substring(0, inputString.IndexOf(','));
               inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
-              Distances[currentDistance, distanceIndex++] = double.Parse(distance);
+              Distances[currentDistance, distanceIndex++] = double.Parse(distance, FormatProvider);
             } else {
               distance = inputString;
-              Distances[currentDistance, distanceIndex++] = double.Parse(distance);
+              Distances[currentDistance, distanceIndex++] = double.Parse(distance, FormatProvider);
               break;
             }
@@ -165 +169 @@
           // Extract the number of points
 
-          pointCount = int.Parse(inputString);
+          pointCount = int.Parse(inputString, FormatProvider);
           Coordinates = new double[pointCount, 2];
           break;
@@ -196 +200 @@
           // Remove the 's,'
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
-          int scoreCount = int.Parse(inputString);
-
-          pointCount = int.Parse(inputString);
+          int scoreCount = int.Parse(inputString, FormatProvider);
+
+          pointCount = Coordinates.GetLength(0);
           Scores = new double[pointCount, scoreCount];
 
@@ -209 +213 @@
           // Remove the 'b,'
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
-          StartingPoint = int.Parse(inputString);
+          StartingPoint = int.Parse(inputString, FormatProvider);
           break;
 
@@ -218 +222 @@
           // Remove the 'e,'
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
-          TerminusPoint = int.Parse(inputString);
+          TerminusPoint = int.Parse(inputString, FormatProvider);
           break;
 
@@ -232 +236 @@
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
 
-          UpperBoundConstraint = double.Parse(inputString);
+          UpperBoundConstraint = double.Parse(inputString, FormatProvider);
           break;
 
@@ -246 +250 @@
           inputString = inputString.Remove(0, inputString.IndexOf(',') + 1);
 
-          LowerConstraint = double.Parse(inputString);
+          LowerConstraint = double.Parse(inputString, FormatProvider);
           break;