Changeset 15615

Timestamp:

01/15/18 09:37:50 (6 years ago)

Author:

abeham

Message:

#1614:

• fixed a bug in the run collection RLD view when BestKnownQuality is set to double.NaN
• fixed a bug in evolution strategy's solution not being a storable class

Location:

branches/GeneralizedQAP

Files:

• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/ESGQAPSolution.cs (modified) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs

@@ -1016 +1016 @@
               let target = r.Parameters.ContainsKey("BestKnownQuality")
                            && r.Parameters["BestKnownQuality"] is DoubleValue
+                           && !double.IsNaN(((DoubleValue)r.Parameters["BestKnownQuality"]).Value)
                 ? ((DoubleValue)r.Parameters["BestKnownQuality"]).Value
                 : (r.Results.ContainsKey(table) && r.Results[table] is IndexedDataTable<double>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/ESGQAPSolution.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
@@ -26 +27 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
+  [StorableClass]
+  [Item("ES-specific GQAP Solution", "GQAP Solution that holds a strategy parameter")]
   public class ESGQAPSolution : GQAPSolution {