Changeset 15713 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Timestamp:

02/02/18 16:31:42 (7 years ago)

Author:

abeham

Message:

#1614:

• added additional constraint to benchmark data generator and updated one instance that was affected by this
• added fitness landscape characteristics for the GQAP
• fixed RLD analysis view to compensate for empty convergence graphs
• fixed CPLEX solvers not using the obj value when the solver terminates (callback is not called if proven optimal solution is found)
• added code for local solver to also check on final quality

File:

• branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs (modified) (4 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs

@@ -327 +327 @@
                      where pd.Equals(new ProblemInstance(run))
                      let cgraph = ((IndexedDataTable<double>)run.Results[table])
+                     where cgraph.Rows.Count > 0 && cgraph.Rows.First().Values.Count > 0
                      group cgraph by pd into g
                      select g;
@@ -565 +566 @@
         }
 
-        if (!labelPrinted) {
+        if (!labelPrinted && row.Points.Count > 0) {
           var point = row.Points.Last();
           if (showLabelsInTargetChart)
@@ -754 +755 @@
       var runs = Content.Where(x => x.Results.ContainsKey(table) && x.Results[table] is IndexedDataTable<double>)
                         .Select(x => (IndexedDataTable<double>)x.Results[table])
-                        .Where(x => x.Rows.Count > 0)
+                        .Where(x => x.Rows.Count > 0 && x.Rows.First().Values.Count > 0)
                         .Select(x => x.Rows.First())
                         .ToList();
@@ -1129 +1130 @@
         if (r.Results.TryGetValue(table, out item)) {
           var dt = item as IndexedDataTable<double>;
-          if (dt != null) {
+          if (dt != null && dt.Rows.Count > 0 && dt.Rows.First().Values.Count > 0) {
             var last = dt.Rows.First().Values.Last().Item2;
             if (!double.IsNaN(last))