Changeset 10272

Timestamp:

12/31/13 01:24:27 (11 years ago)

Author:

ascheibe

Message:

#1886 improved convex hull modifier for test functions

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3

Files:

• ConvexHullMeasures.cs (modified) (1 diff)
• RunCollectionModifiers/RealVectorConvexHullModifier.cs (modified) (3 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/ConvexHullMeasures.cs

@@ -53 +53 @@
         throw new ArgumentException("Nr. of points for volume calculation must be greater than dimension", "convexHull");
 
-      var triangulation = Triangulation.CreateDelaunay(ConvertToVertex(convexHull));
+      ITriangulation<DefaultVertex, DefaultTriangulationCell<DefaultVertex>> triangulation = null;
+      try {
+        //Under certain circumstances MIConvexHull is not able to calculate the triangulation
+        triangulation = Triangulation.CreateDelaunay(ConvertToVertex(convexHull));
+      }
+      catch {
+        return double.NaN;
+      }
       var simplices = ConvertFromTriangulation(triangulation);
       foreach (var simplex in simplices) {

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

@@ -53 +53 @@
         DataTable volDataTable = new DataTable("Convex hull volume over generations");
         DataTable nrOfPointsTable = new DataTable("Nr. of points of convex hull");
-        DoubleValue overallVolumn = new DoubleValue();
+        DoubleValue overallVolume = new DoubleValue();
 
         DataRow dtVolumeRow = new DataRow("Volume");
@@ -65 +65 @@
           var input = sols.Select(x => ConvertRealVectorToVertexArray(x)).ToArray();
           var convexHull = LPHull.Calculate(input);
-          var volume = ConvexHullMeasures.CalculateVolume(convexHull);
-          dtVolumeRow.Values.Add(volume);
+          if (convexHull.First().Length < convexHull.Count) {
+            var volume = ConvexHullMeasures.CalculateVolume(convexHull);
+            dtVolumeRow.Values.Add(volume);
+          } else {
+            dtVolumeRow.Values.Add(double.NaN);
+          }
           dtNrPointsRow.Values.Add(convexHull.Count);
 
@@ -78 +82 @@
           sols = solutionCache.GetSolutionsFromGeneration(++i);
         }
-        overallVolumn.Value = ConvexHullMeasures.CalculateVolume(curHull);
 
-        run.Results.Add("Overall volumn: ", overallVolumn);
-        run.Results.Add("Convex hull volumn", volDataTable);
-        run.Results.Add("Convex nr. of points", nrOfPointsTable);
+        if (curHull != null && curHull.Any() && curHull.First().Length < curHull.Count) {
+          overallVolume.Value = ConvexHullMeasures.CalculateVolume(curHull);
+        } else {
+          overallVolume.Value = double.NaN;
+        }
+
+        run.Results["Overall volume"] = overallVolume;
+        run.Results["Convex hull volume"] = volDataTable;
+        run.Results["Nr. of points on convex hull"] = nrOfPointsTable;
       }
     }