Changeset 10222 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers

Timestamp:

12/11/13 23:36:52 (10 years ago)

Author:

ascheibe

Message:

#1886

• improved qhull wrapper
• cleaned up unit tests

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/QhullWrapper.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
   public static class QhullWrapper {
+    [System.Runtime.InteropServices.DllImportAttribute("HeuristicLab.qhull.dll", EntryPoint = "qhull_volume", CallingConvention = CallingConvention.Cdecl)]
+    public static extern double qhull_volume(int dim, int numpoints, [In]double[] data);
+
+    [System.Runtime.InteropServices.DllImportAttribute("HeuristicLab.qhull.dll", EntryPoint = "qhull_convex_hull", CallingConvention = CallingConvention.Cdecl)]
+    public unsafe static extern IntPtr qhull_convex_hull(int dim, int numpoints, [In]double[] data, [Out] Int32* retCode, [Out] Int32* nrOfFacets);
+
+    [System.Runtime.InteropServices.DllImportAttribute("HeuristicLab.qhull.dll", EntryPoint = "qhull_free", CallingConvention = CallingConvention.Cdecl)]
+    public static extern void qhull_free(IntPtr data);
+
     public static double CalculateVolume(List<double[]> points) {
       double result = 0.0;
@@ -43 +52 @@
     }
 
-    public unsafe static List<int> CalculateConvexHull(List<double[]> points) {
+    public unsafe static List<int> CalculateConvexHullIndices(List<double[]> points) {
       int dimension = points.First().Length;
       int numPoints = points.Count();
@@ -73 +82 @@
     }
 
-    [System.Runtime.InteropServices.DllImportAttribute("HeuristicLab.qhull.dll", EntryPoint = "qhull_volume", CallingConvention = CallingConvention.Cdecl)]
-    public static extern double qhull_volume(int dim, int numpoints, [In]double[] data);
-
-    [System.Runtime.InteropServices.DllImportAttribute("HeuristicLab.qhull.dll", EntryPoint = "qhull_convex_hull", CallingConvention = CallingConvention.Cdecl)]
-    public unsafe static extern IntPtr qhull_convex_hull(int dim, int numpoints, [In]double[] data, [Out] Int32* retCode, [Out] Int32* nrOfFacets);
-
-    [System.Runtime.InteropServices.DllImportAttribute("HeuristicLab.qhull.dll", EntryPoint = "qhull_free", CallingConvention = CallingConvention.Cdecl)]
-    public static extern void qhull_free(IntPtr data);
+    public static List<double[]> Calculate(List<double[]> points) {
+      var ret = new List<double[]>();
+      List<int> indices = CalculateConvexHullIndices(points);
+      foreach (var d in indices) {
+        ret.Add(points[d]);
+      }
+      return ret;
+    }
   }
 }