Changeset 10275 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/ConvexHullMeasures.cs

Timestamp:

01/04/14 01:39:50 (11 years ago)

Author:

ascheibe

Message:

#1886 added calculation of diameter and updated convex hull modifier to calculate the new measures

File:

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

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

@@ -90 +90 @@
     }
 
-    public static double[] CalculateCentroid(List<double[]> convexHull) {
+    public static double[] CalculateCentroids(List<double[]> convexHull) {
       int n = convexHull.Count;
       int dim = convexHull.First().Length;
@@ -132 +132 @@
       double ca = c.EuclideanDistance(a);
 
-      return Math.Acos((ab * ab + bc * bc - ca * ca) / (2 * ab * bc));
+      //return degrees
+      return Math.Acos((ab * ab + bc * bc - ca * ca) / (2 * ab * bc)) * 180.0 / Math.PI;
     }
 
@@ -145 +146 @@
       return thetas;
     }
+
+    public static double CalculateMaxDiameter(List<double[]> convexHull) {
+      double maxDist = double.MinValue;
+
+      for (int i = 0; i < convexHull.Count; i++) {
+        for (int j = 0; j < convexHull.Count; j++) {
+          if (i != j) {
+            double dist = convexHull[i].EuclideanDistance(convexHull[j]);
+            if (dist > maxDist)
+              maxDist = dist;
+          }
+        }
+      }
+      return maxDist;
+    }
   }
 }