Changeset 17745 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring

Timestamp:

09/15/20 13:53:11 (4 years ago)

Author:

mkommend

Message:

#2971: Added first draft of results implementation and problem adaptation.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs (modified) (1 diff)

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

@@ -170 +170 @@
     }
 
-    public override void Analyze(LinearLinkage[] lles, double[] qualities, ResultCollection results, IRandom random) {
-      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);
-      }
+    public override void Analyze(ISingleObjectiveSolutionContext<LinearLinkage>[] solutionContexts, IRandom random) {
+      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);
+      //}
     }