Changeset 15172 for trunk/sources

Timestamp:

07/09/17 13:59:36 (7 years ago)

Author:

abeham

Message:

#2736:

• Implemented review comments
• I had to restructure the parser to a greater extent because I found out that some instances defined nodes without edges (which I decided to filter)
• I added a unit test that loads all instances
• I also added export of instances

Location:

trunk/sources

Files:

• HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.GraphColoring/3.3/HeuristicLab.Problems.GraphColoring-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Instances.DIMACS/3.3/GcolInstanceProvider.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.DIMACS/3.3/GcolParser.cs (added)
• HeuristicLab.Problems.Instances.DIMACS/3.3/HeuristicLab.Problems.Instances.DIMACS-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Instances.DIMACS/3.3/Parser.cs (deleted)
• HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/DIMACSGcolInstanceProviderTest.cs (added)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs

@@ -38 +38 @@
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 135)]
   [StorableClass]
-  public sealed class GraphColoringProblem : SingleObjectiveBasicProblem<LinearLinkageEncoding>, IProblemInstanceConsumer<GCPData> {
+  public sealed class GraphColoringProblem : SingleObjectiveBasicProblem<LinearLinkageEncoding>, IProblemInstanceConsumer<GCPData>, IProblemInstanceExporter<GCPData> {
 
     public override bool Maximization {
@@ -115 +115 @@
     private void FitnessFunctionParameterOnValueChanged(object sender, EventArgs eventArgs) {
       fitnessFunctionParameter.Value.ValueChanged += FitnessFunctionOnValueChanged;
-      OnReset();
+      FitnessFunctionOnValueChanged(sender, eventArgs);
     }
 
     private void FitnessFunctionOnValueChanged(object sender, EventArgs eventArgs) {
       BestKnownQualityParameter.Value = null;
+      if (FitnessFunction == FitnessFunction.Prioritized
+        && BestKnownColorsParameter.Value != null
+        && Encoding.Length > 0) {
+        var mag = Math.Pow(10, -(int)Math.Ceiling(Math.Log10(Encoding.Length)));
+        // the value is e.g. 0.051 for 0 conflicts with 51 colors (and less than 1000 nodes)
+        BestKnownQuality = BestKnownColorsParameter.Value.Value * mag;
+      } else BestKnownQualityParameter.Value = null;
       OnReset();
     }
@@ -242 +249 @@
       Description = data.Description;
       OnReset();
+    }
+
+    public GCPData Export() {
+      var instance = new GCPData();
+      instance.Name = Name;
+      instance.Description = Description;
+      instance.Nodes = Encoding.Length;
+      var adjList = AdjacencyListParameter.Value;
+      instance.Adjacencies = new int[adjList.Rows, 2];
+      for (var r = 0; r < adjList.Rows; r++) {
+        instance.Adjacencies[r, 0] = adjList[r, 0];
+        instance.Adjacencies[r, 1] = adjList[r, 1];
+      }
+      if (BestKnownColorsParameter.Value != null)
+        instance.BestKnownColors = BestKnownColorsParameter.Value.Value;
+      return instance;
     }
 

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

@@ -125 +125 @@
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.4\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj">
-      <Project>{166507c9-ef26-4370-bb80-699742a29d4f}</Project>
+      <Project>{be698769-975a-429e-828c-72bb2b6182c8}</Project>
       <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.4</Name>
       <Private>False</Private>

trunk/sources/HeuristicLab.Problems.Instances.DIMACS/3.3/GcolInstanceProvider.cs

@@ -69 +69 @@
 
         using (var stream = entry.Open()) {
-          var parser = new Parser();
+          var parser = new GcolParser();
           parser.Parse(stream);
           var instance = Load(parser);
           instance.Name = id.Name;
-          instance.Description = id.Description;
+          instance.Description += Environment.NewLine + id.Description;
           int bestknown;
           if (bkq.TryGetValue(instance.Name, out bestknown))
@@ -86 +86 @@
     }
     public override GCPData ImportData(string path) {
-      var parser = new Parser();
+      var parser = new GcolParser();
       parser.Parse(path);
       var instance = Load(parser);
       instance.Name = Path.GetFileName(path);
-      instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now.ToString();
+      instance.Description += Environment.NewLine + "Loaded from file \"" + path + "\" on " + DateTime.Now.ToString();
       return instance;
     }
 
-    private GCPData Load(Parser parser) {
+    private GCPData Load(GcolParser parser) {
       var instance = new GCPData();
+      instance.Description = parser.Comments;
       instance.Nodes = parser.Nodes;
       var adjacencies = new int[parser.Edges, 2];
       var i = 0;
       foreach (var a in parser.AdjacencyList) {
-        adjacencies[i, 0] = a.Item1 - 1;
-        adjacencies[i, 1] = a.Item2 - 1;
+        adjacencies[i, 0] = a.Item1;
+        adjacencies[i, 1] = a.Item2;
         i++;
       }
       instance.Adjacencies = adjacencies;
       return instance;
+    }
+    
+    public override bool CanExportData { get { return true; } }
+    public override void ExportData(GCPData instance, string path) {
+      using (var stream = new StreamWriter(File.Create(path)) { AutoFlush = true }) {
+        stream.WriteLine("c " + instance.Name);
+        foreach (var comment in instance.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.None)) {
+          var c = comment;
+          if (!c.StartsWith("c ")) c = "c " + comment;
+          stream.WriteLine(c);
+        }
+        var edges = instance.Adjacencies.GetLength(0);
+        stream.WriteLine("p edge " + instance.Nodes + " " + edges);
+        for (var i = 0; i < edges; i++) {
+          stream.WriteLine("e " + (instance.Adjacencies[i, 0]+1) + " " + (instance.Adjacencies[i, 1]+1));
+        }
+      }
     }
 

trunk/sources/HeuristicLab.Problems.Instances.DIMACS/3.3/HeuristicLab.Problems.Instances.DIMACS-3.3.csproj

@@ -87 +87 @@
     <Compile Include="GcolDataDescriptor.cs" />
     <Compile Include="GcolInstanceProvider.cs" />
-    <Compile Include="Parser.cs" />
+    <Compile Include="GcolParser.cs" />
     <EmbeddedResource Include="Data\col.zip" />
     <None Include="Plugin.cs.frame" />

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -332 +332 @@
     <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3">
       <HintPath>..\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances.DIMACS-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.Problems.Instances.DIMACS-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -586 +591 @@
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\Util.cs" />
+    <Compile Include="HeuristicLab.Problems.Instances-3.3\DIMACSGcolInstanceProviderTest.cs" />
     <Compile Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3\RegressionInstanceProviderTest.cs" />
     <Compile Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3\TableFileParserTest.cs" />