Changeset 10222

Timestamp:

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

Author:

ascheibe

Message:

#1886

• improved qhull wrapper
• cleaned up unit tests

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj (modified) (1 diff)
• AlgorithmBehaviorUnitTests/ConvexHullTest.cs (modified) (3 diffs)
• AlgorithmBehaviorUnitTests/LPConvexHullTest.cs (modified) (2 diffs)
• AlgorithmBehaviorUnitTests/VolumeCalculationTest.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/QhullWrapper.cs (modified) (3 diffs)
• PerformanceTests/Program.cs (modified) (2 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj

@@ -26 +26 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/ConvexHullTest.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using HeuristicLab.Analysis.AlgorithmBehavior.Analyzers;
-using MIConvexHull;
+using HeuristicLab.Common;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -32 +30 @@
   public class ConvexHullTest {
     [TestMethod]
-    public void TestMethod1() {
+    public void TestConvexHullAlgorithms() {
       int nrOfSamples = 50;
-      int sampleSize = 120;
-      double[][] inputs = CreateRandomData(nrOfSamples, sampleSize);
-      var convAlgData = ConvertPermutationToVertex(inputs);
+      int dimension = 4;
+      double[][] inputs = CreateRandomData(nrOfSamples, dimension);
 
-      Stopwatch watch = new Stopwatch();
-      watch.Start();
-      var result2 = HyperHull.CalculateUsingSMO(inputs);
-      watch.Stop();
-      Console.WriteLine("HyperHull: " + watch.ElapsedMilliseconds);
-      watch.Restart();
-      var result1 = ConvexHull.Create(convAlgData).Points.Select(x => x.Position).ToList();
-      watch.Stop();
-      Console.WriteLine("MIConvexHull: " + watch.ElapsedMilliseconds);
+      var lpResult = LPHull.Calculate(inputs);
+      var qhResult = QhullWrapper.Calculate(inputs.ToList());
 
-      int k = 0;
-      foreach (var d in result1) {
+      foreach (var qhr in qhResult) {
         bool found = false;
-        foreach (var e in result2) {
+        foreach (var lpr in lpResult) {
           int i = 0;
-          for (i = 0; i < e.Count(); i++) {
-            if (d[i] != e[i]) {
+          for (i = 0; i < lpr.Count(); i++) {
+            if (!qhr[i].IsAlmost(lpr[i])) {
               break;
             }
           }
-          if (i == e.Count()) {
+          if (i == lpr.Count()) {
             found = true;
-            k++;
             break;
           }
@@ -66 +54 @@
         Assert.IsTrue(found);
       }
-      Console.WriteLine("Ratio: " + k + "/" + result1.Count);
-      Assert.AreEqual(k, result1.Count);
-    }
-
-    private List<DefaultVertex> ConvertPermutationToVertex(double[][] data) {
-      List<DefaultVertex> result = new List<DefaultVertex>();
-      for (int i = 0; i < data.Count(); i++) {
-        double[] d = data[i];
-
-        DefaultVertex vertex = new DefaultVertex();
-        vertex.Position = d;
-        result.Add(vertex);
-
-      }
-      return result;
     }
 

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/LPConvexHullTest.cs

@@ -35 +35 @@
       int nrOfSamples = 70;
       int sampleSize = 2;
-      double[][] inputs = CreateRandomData(nrOfSamples, sampleSize);
+      double[][] inputs = ConvexHullTest.CreateRandomData(nrOfSamples, sampleSize);
       var convAlgData = ConvertPermutationToVertex(inputs);
 
@@ -151 +151 @@
       return result;
     }
-
-    private double[][] CreateRandomData(int n, int m) {
-      double[][] result = new double[n][];
-      Random rand = new Random();
-
-      for (int i = 0; i < n; i++) {
-        result[i] = new double[m];
-        for (int j = 0; j < m; j++) {
-          result[i][j] = (double)rand.Next(1, 60);
-        }
-      }
-      return result;
-    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/VolumeCalculationTest.cs

@@ -31 +31 @@
     [TestMethod]
     public void TestVolumeCalculation() {
-      const int numPoints = 8;
-      const int dimension = 3;
-
       var points = new List<double[]>();
       points.Add(new double[] { -0.72045174, 1.44667601, -1.75159125 });
@@ -54 +51 @@
     }
 
-
     [TestMethod]
     public void TestVolumeCalculationQhull() {
-      const int numPoints = 8;
-      const int dimension = 3;
-
       var points = new List<double[]>();
       points.Add(new double[] { -0.72045174, 1.44667601, -1.75159125 });

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;
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/PerformanceTests/Program.cs

@@ -30 +30 @@
     static void Main(string[] args) {
       // TestSimpleVolumeCalculation();
-      //   TestVolCalc();
+      // TestVolCalc();
       //TestQHullVolumeCalculation();
       TestQhull();
@@ -50 +50 @@
       Console.WriteLine("Volume is: " + volume);
 
-      QhullWrapper.CalculateConvexHull(points);
+      var result = QhullWrapper.Calculate(points);
     }