Changeset 10092

Timestamp:

10/28/13 18:27:17 (11 years ago)

Author:

ascheibe

Message:

#1886 fixed volume calculation of polytopes

Location:

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

Files:

• ConvexHullMeasures.cs (modified) (1 diff)
• DoubleArrayExtensions.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)

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

@@ -26 +26 @@
   public static class ConvexHullMeasures {
     //Calculates the volumne of a d-simplex
-    private static double CalculateSimplexVolume(List<double[]> hyperHull) {
-      double[,] diffs = new double[hyperHull.Count, hyperHull.Count];
+    private static double CalculateSimplexVolume(List<double[]> simplex) {
+      double[,] diffs = new double[simplex.Count, simplex.Count];
 
-      for (int i = 0; i < hyperHull.Count; i++) {
-        for (int j = 0; j < hyperHull.Count; j++) {
-          diffs[i, j] = CalculateVectorDiff(hyperHull[i], hyperHull[j]);
+      for (int i = 0; i < simplex.Count; i++) {
+        for (int j = 0; j < simplex.Count; j++) {
+          diffs[i, j] = simplex[i].EuclideanDistance(simplex[j]);
         }
       }
 
       double det = alglib.rmatrixdet(diffs);
-      double result = det / hyperHull[0].Count().Fact();
-
-      return result;
-    }
-
-    private static double CalculateVectorDiff(double[] vector1, double[] vector2) {
-      double result = 0.0;
-
-      for (int i = 0; i < vector1.Length; i++) {
-        result += vector1[i] - vector2[i];
-      }
+      double result = det / simplex[0].Count().Fact();
 
       return result;

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

@@ -123 +123 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DoubleArrayExtensions.cs" />
     <Compile Include="RealVectorConvexHullSolutionCacheAnalyzer.cs" />
     <Compile Include="DistanceMatrixToPoints.cs" />