Changeset bb56cf

Timestamp:

Sep 28, 2009, 6:46:25 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

60cbe5

Parents:

4cbac2

Message:

new function CalculateVolumeofGeneralTetraeder().

• is used when a point is removed to evaluate the loss of volume in the envelope.

Location:

molecuilder/src

Files:

• tesselationhelpers.cpp (modified) (1 diff)
• tesselationhelpers.hpp (modified) (3 diffs)

molecuilder/src/tesselationhelpers.cpp

@@ -386 +386 @@
 
   return result;
-}
-
+};
+
+
+/** Calculates the volume of a general tetraeder.
+ * \param *a first vector
+ * \param *a first vector
+ * \param *a first vector
+ * \param *a first vector
+ * \return \f$ \frac{1}{6} \cdot ((a-d) \times (a-c) \cdot  (a-b)) \f$
+ */
+double CalculateVolumeofGeneralTetraeder(Vector *a, Vector *b, Vector *c, Vector *d)
+{
+  Vector Point, TetraederVector[3];
+  double volume;
+
+  TetraederVector[0].CopyVector(a);
+  TetraederVector[1].CopyVector(b);
+  TetraederVector[2].CopyVector(c);
+  for (int j=0;j<3;j++)
+    TetraederVector[j].SubtractVector(d);
+  Point.CopyVector(&TetraederVector[0]);
+  Point.VectorProduct(&TetraederVector[1]);
+  volume = 1./6. * fabs(Point.ScalarProduct(&TetraederVector[2]));
+  return volume;
+};
+

molecuilder/src/tesselationhelpers.hpp

@@ -18 +18 @@
 #endif
 
-#define HULLEPSILON 1e-7
-
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_matrix.h>
@@ -26 +24 @@
 #include <gsl/gsl_vector.h>
 
+#include "defs.hpp"
 #include "vector.hpp"
+
+#define HULLEPSILON 1e-10
 
 double DetGet(gsl_matrix *A, int inPlace);
@@ -35 +36 @@
 double MinIntersectDistance(const gsl_vector * x, void *params);
 bool existsIntersection(Vector point1, Vector point2, Vector point3, Vector point4);
+double CalculateVolumeofGeneralTetraeder(Vector *a, Vector *b, Vector *c, Vector *d);
+
 
 #endif /* TESSELATIONHELPERS_HPP_ */