Changeset 17952 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs

Timestamp:

04/21/21 11:58:34 (3 years ago)

Author:

abeham

Message:

#2521: working on graph coloring problem

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs

@@ -47 +47 @@
     [Storable] public IValueParameter<IntValue> BestKnownColorsParameter { get; private set; }
     [Storable] public IResult<IntValue> BestSolutionColorsResult { get; private set; }
-    [Storable] public IResult<IntValue> BestSolutionConflicts { get; private set; }
+    [Storable] public IResult<IntValue> BestSolutionConflictsResult { get; private set; }
+    [Storable] public IResult<IntMatrix> BestColoringResult { get; private set; }
 
     public FitnessFunction FitnessFunction {
@@ -61 +62 @@
       FitnessFunctionParameter = cloner.Clone(original.FitnessFunctionParameter);
       BestKnownColorsParameter = cloner.Clone(original.BestKnownColorsParameter);
+      BestSolutionColorsResult = cloner.Clone(original.BestSolutionColorsResult);
+      BestSolutionConflictsResult = cloner.Clone(original.BestSolutionConflictsResult);
+      BestColoringResult = cloner.Clone(original.BestColoringResult);
       RegisterEventHandlers();
     }
@@ -69 +73 @@
       Parameters.Add(BestKnownColorsParameter = new OptionalValueParameter<IntValue>("BestKnownColors", "The least amount of colors in a valid coloring.") { ReadOnly = true });
       Results.Add(BestSolutionColorsResult = new Result<IntValue>("Best Solution Colors", "The number of best solution found so far."));
+      Results.Add(BestSolutionConflictsResult = new Result<IntValue>("Best Solution Conflicts", "The number of conflicts in the the best solution found so far."));
+      Results.Add(BestColoringResult = new Result<IntMatrix>("Best Coloring", "The best coloring that is currently found."));
 
       var imat = new IntMatrix(defaultInstance.Length, 2);
@@ -165 +171 @@
       base.Analyze(solutionContexts, random);
 
-      var lles = solutionContexts.Select(context => context.EncodedSolution).ToArray();
-
-      //TODO: reimplement code below using results directly
-
-      //var orderedIndividuals = lles.Zip(qualities, (i, q) => new { LLE = i, Quality = q }).OrderBy(z => z.Quality);
-      //var best = Maximization ? orderedIndividuals.Last().LLE : orderedIndividuals.First().LLE;
-
-      //var llee = best.ToEndLinks();
-      //var colors = llee.Distinct().Count();
-      //var conflicts = CalculateConflicts(llee);
-
-      //IResult res;
-      //int bestColors = int.MaxValue, bestConflicts = int.MaxValue;
-      //var improvement = false;
-      //if (!results.TryGetValue("Best Solution Conflicts", out res)) {
-      //  bestConflicts = conflicts;
-      //  res = new Result("Best Solution Conflicts", new IntValue(bestConflicts));
-      //  results.Add(res);
-      //} else {
-      //  bestConflicts = ((IntValue)res.Value).Value;
-      //  improvement = conflicts < bestConflicts;
-      //  if (improvement) ((IntValue)res.Value).Value = bestConflicts = conflicts;
-      //}
-      //if (!results.TryGetValue("Best Solution Colors", out res)) {
-      //  bestColors = colors;
-      //  res = new Result("Best Solution Colors", new IntValue(bestColors));
-      //  results.Add(res);
-      //} else {
-      //  bestColors = ((IntValue)res.Value).Value;
-      //  improvement = improvement || conflicts == bestConflicts && colors < bestColors;
-      //  if (improvement)
-      //    ((IntValue)res.Value).Value = bestColors = colors;
-      //}
-      //if (!results.ContainsKey("Best Encoded Solution") || improvement)
-      //  results.AddOrUpdateResult("Best Encoded Solution", (LinearLinkage)best.Clone());
-
-      //if (!results.TryGetValue("Best Solution", out res) || !(res.Value is IntMatrix)) {
-      //  var matrix = new IntMatrix(llee.Length, 2) { ColumnNames = new[] { "Node", "Color" } };
-      //  UpdateMatrix(llee, matrix);
-      //  res = new Result("Best Solution", matrix);
-      //  results.AddOrUpdateResult("Best Solution", matrix);
-      //} else {
-      //  if (improvement) {
-      //    UpdateMatrix(llee, (IntMatrix)res.Value);
-      //  }
-      //}
-
-      //if (conflicts == 0) {
-      //  if (BestKnownColorsParameter.Value == null || BestKnownColorsParameter.Value.Value > colors)
-      //    BestKnownColorsParameter.Value = new IntValue(colors);
-      //}
+      var best = GetBest(solutionContexts);
+      var llee = best.EncodedSolution.ToEndLinks();
+      var colors = llee.Distinct().Count();
+      var conflicts = CalculateConflicts(llee);
+
+      var improvement = !BestSolutionConflictsResult.HasValue
+        || conflicts < BestSolutionConflictsResult.Value.Value
+        || (conflicts == BestSolutionConflictsResult.Value.Value
+          && colors < BestSolutionColorsResult.Value.Value);
+
+      if (improvement) {
+        BestSolutionColorsResult.Value = new IntValue(colors);
+        BestSolutionConflictsResult.Value = new IntValue(conflicts);
+        var matrix = new IntMatrix(llee.Length, 2) { ColumnNames = new[] { "Node", "Color" } };
+        UpdateMatrix(llee, matrix);
+        BestColoringResult.Value = matrix;
+      }
+
+      if (conflicts == 0) {
+        if (BestKnownColorsParameter.Value == null || colors < BestKnownColorsParameter.Value.Value)
+          BestKnownColorsParameter.Value = new IntValue(colors);
+      }
     }