Changeset 10119 for branches

Timestamp:

11/10/13 22:12:04 (11 years ago)

Author:

ascheibe

Message:

#1886 improved RealVectorConvexHullModifier

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RunCollectionModifiers/RealVectorConvexHullModifier.cs (modified) (3 diffs)
• HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RunCollectionModifiers/RealVectorConvexHullModifier.cs

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
@@ -53 +54 @@
 
         var sols = solutionCache.GetSolutionsFromGeneration(i);
-        DataTable dt = new DataTable("Convex Hull Volume over Generations");
+        DataTable volDataTable = new DataTable("Convex hull volume over generations");
+        DataTable nrOfPointsTable = new DataTable("Nr. of points of convex hull");
+        DoubleValue overallVolumn = new DoubleValue();
+
         DataRow dtVolumeRow = new DataRow("Volume");
-        DataRow dtNrPointsRow = new DataRow("Nr. of Points");
-        dt.Rows.Add(dtVolumeRow);
-        dt.Rows.Add(dtNrPointsRow);
+        DataRow dtNrPointsRow = new DataRow("Nr. of points");
+        volDataTable.Rows.Add(dtVolumeRow);
+        nrOfPointsTable.Rows.Add(dtNrPointsRow);
+
+        List<double[]> curHull = null;
 
         while (sols.Count != 0) {
@@ -66 +72 @@
           dtNrPointsRow.Values.Add(convexHull.Count);
 
+          if (curHull == null) {
+            curHull = convexHull;
+          } else {
+            var newPHull = curHull.Union(convexHull).ToArray();
+            curHull = LPHull.Calculate(newPHull);
+          }
+
           sols = solutionCache.GetSolutionsFromGeneration(++i);
         }
+        overallVolumn.Value = ConvexHullMeasures.CalculateVolume(curHull);
 
-        run.Results.Add("Convex Hull Measures", dt);
+        run.Results.Add("Overall volumn: ", overallVolumn);
+        run.Results.Add("Convex hull volumn", volDataTable);
+        run.Results.Add("Convex nr. of points", nrOfPointsTable);
       }
     }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs

@@ -30 +30 @@
   [StorableClass]
   public class RunCollectionModifierTask : ItemTask {
-    /*public override bool IsParallelizable {
-      get { return false; }
-    } */
-
     public new RunCollectionModifierExecutable Item {
       get { return (RunCollectionModifierExecutable)base.Item; }