Changeset 15172 for trunk/sources/HeuristicLab.Problems.GraphColoring

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/HeuristicLab.Problems.GraphColoring/3.3

Files:

• GraphColoringProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.GraphColoring-3.3.csproj (modified) (1 diff)

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>