Changeset 16077 for branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs

Timestamp:

08/14/18 12:01:42 (6 years ago)

Author:

abeham

Message:

#2936: Added integration branch

Location:

branches/2936_GQAPIntegration

Files:

• . (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms (copied) (copied from branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs (modified) (3 diffs)

branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs

@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP {
+namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
 
   /// <summary>
@@ -159 +159 @@
       Results.Add(new Result("EvaluatedSolutions", new IntValue(Context.EvaluatedSolutions)));
       Results.Add(new Result("BestQuality", new DoubleValue(Context.BestQuality)));
-      Results.Add(new Result("BestSolution", typeof(GQAPSolution)));
+      Results.Add(new Result("BestSolution", typeof(GQAPAssignment)));
     }
 
@@ -249 +249 @@
           ((DoubleValue)result.Value).Value = Context.BestQuality;
         else Results.Add(new Result("BestQuality", new DoubleValue(Context.BestQuality)));
-        if (Results.TryGetValue("BestSolution", out result))
-          result.Value = Context.BestSolution;
-        else Results.Add(new Result("BestSolution", Context.BestSolution));
+        if (Results.TryGetValue("BestSolution", out result)) {
+          var solAssign = (GQAPAssignment)result.Value;
+          if (solAssign != null) {
+            solAssign.Solution = Context.BestSolution;
+          } else {
+            result.Value = new GQAPAssignment(Context.BestSolution, Problem.ProblemInstance);
+          }
+        } else Results.Add(new Result("BestSolution", new GQAPAssignment(Context.BestSolution, Problem.ProblemInstance)));
 
         try {