Changeset 7316

Timestamp:

01/11/12 15:07:10 (12 years ago)

Author:

svonolfe

Message:

Added Picture generator (#1696)

Location:

branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer

Files:

• PictureGenerator.cs (added)
• Program.cs (modified) (7 diffs)
• SolutionParser.cs (added)
• TSPLIBParser.cs (modified) (1 diff)
• Utils.cs (modified) (1 diff)
• VRPProblemAnalyzer.csproj (modified) (3 diffs)

branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/Program.cs

@@ -5 +5 @@
 using System.Text;
 using System.IO;
+using System.Drawing;
 
 namespace VRPProblemAnalyzer {
   
   public class Program {
-
-    private static double GetDistance(double[,] vertices, int source, int target) {
-      return Math.Sqrt(
-        Math.Pow((vertices[source, 0] - vertices[target, 0]), 2) + 
-        Math.Pow((vertices[source, 1] - vertices[target, 1]), 2));
-    }
 
     private static double[] GetDistances(double[,] vertices) {
@@ -23 +18 @@
         for (int j = 0; j < cities; j++) {
           if (i != j) {
-            result.Add(GetDistance(vertices, i, j));
+            result.Add(Utils.GetDistance(vertices, i, j));
           }
         }
@@ -39 +34 @@
         for (int j = 0; j < cities; j++) {
           if (i != j) {
-            distance += GetDistance(vertices, i, j);
+            distance += Utils.GetDistance(vertices, i, j);
           }
         }
@@ -187 +182 @@
           instance.Demands[i] = instance.Demands[i] / instance.Capacity;
       }
+      instance.Capacity = 1.0;
 
       //normalize coordinates
@@ -199 +195 @@
       var factor = Math.Sqrt(0.5)/Math.Max(rangeX, rangeY);
 
-
       for (int i = 0; i < instance.Vertices.GetLength(0); i++) {
         instance.Vertices[i, 0] = (cities[i].X-minX)*factor;
@@ -221 +216 @@
           Normalize(parser);
 
-          sw.Write(Path.GetFileNameWithoutExtension(instance));
+          string instanceName = Path.GetFileNameWithoutExtension(instance);
+
+          string solutionName = Path.Combine(Path.GetDirectoryName(instance), Path.GetFileNameWithoutExtension(instance) + ".opt");
+          SolutionParser solution = new SolutionParser(solutionName);
+          solution.Parse();
+
+          sw.Write(instanceName);
           sw.Write(';');
           sw.Write(parser.Vertices.Length / 2 - 1);
@@ -242 +243 @@
           sw.Write(';');
           sw.WriteLine();
-        }
-      }
-      Console.WriteLine("Done. Press Enter...");
-      Console.ReadLine();
+
+
+          Image picture = PictureGenerator.GeneratePicture(parser, solution);
+          picture.Save(Path.Combine(path, instanceName + ".png"));
+        }
+      }
+      //Console.WriteLine("Done. Press Enter...");
+      //Console.ReadLine();
     }
   }

branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/TSPLIBParser.cs

@@ -89 +89 @@
       get {
         return capacity;
+      }
+      set {
+        capacity = value;
       }
     }

branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/Utils.cs

@@ -15 +15 @@
       return points;
     }
+
+    public static double GetDistance(double[,] vertices, int source, int target) {
+      return Math.Sqrt(
+        Math.Pow((vertices[source, 0] - vertices[target, 0]), 2) +
+        Math.Pow((vertices[source, 1] - vertices[target, 1]), 2));
+    }
   }
 }

branches/FitnessLandscapeAnalysis/VRPProblemAnalyzer/VRPProblemAnalyzer.csproj

@@ -104 +104 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -112 +115 @@
   <ItemGroup>
     <Compile Include="EnumerableExtensions.cs" />
+    <Compile Include="PictureGenerator.cs" />
     <Compile Include="PointD.cs" />
     <Compile Include="DepotExcentricityCalculator.cs" />
@@ -117 +121 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SolutionParser.cs" />
     <Compile Include="TSPLIBParser.cs" />
     <Compile Include="Utils.cs" />