Changeset 0d111b for molecuilder/src/helpers.cpp

Timestamp:

Apr 29, 2010, 1:55:21 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

070651, 5d1a94

Parents:

90c4460 (diff), 32842d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'VectorRefactoring' into StructureRefactoring

Conflicts:

molecuilder/src/Legacy/oldmenu.cpp
molecuilder/src/Makefile.am
molecuilder/src/analysis_correlation.cpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/config.cpp
molecuilder/src/ellipsoid.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/molecule.cpp
molecuilder/src/molecule_fragmentation.cpp
molecuilder/src/molecule_geometry.cpp
molecuilder/src/molecule_graph.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/tesselationhelpers.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp

File:

• molecuilder/src/helpers.cpp (modified) (3 diffs)

molecuilder/src/helpers.cpp

@@ -6 +6 @@
 
 #include "helpers.hpp"
+#include "Helpers/fast_functions.hpp"
 #include "log.hpp"
 #include "memoryusageobserver.hpp"
@@ -49 +50 @@
   while (*b < lower_bound)
     *b += step;
-};
-
-/** Returns the power of \a n with respect to \a base.
- * \param base basis
- * \param n power
- * \return \f$base^n\f$
- */
-int pot(int base, int n)
-{
-  int res = 1;
-  int j;
-  for (j=n;j--;)
-    res *= base;
-  return res;
 };
 
@@ -175 +162 @@
 };
 
-/** hard-coded determinant of a 3x3 matrix.
- * \param a[9] matrix
- * \return \f$det(a)\f$
- */
-double RDET3(const double a[NDIM*NDIM])
-{
-  return ((a)[0]*(a)[4]*(a)[8] + (a)[3]*(a)[7]*(a)[2] + (a)[6]*(a)[1]*(a)[5] - (a)[2]*(a)[4]*(a)[6] - (a)[5]*(a)[7]*(a)[0] - (a)[8]*(a)[1]*(a)[3]);
-};
-
-/** hard-coded determinant of a 2x2 matrix.
- * \param a[4] matrix
- * \return \f$det(a)\f$
- */
-double RDET2(const double a[4])
-{
-  return ((a[0])*(a[3])-(a[1])*(a[2]));
-};
-
-/** hard-coded determinant of a 2x2 matrix.
- * \param a0 (0,0) entry of matrix
- * \param a1 (0,1) entry of matrix
- * \param a2 (1,0) entry of matrix
- * \param a3 (1,1) entry of matrix
- * \return \f$det(a)\f$
- */
-double RDET2(const double a0, const double a1, const double a2, const double a3)
-{
-  return ((a0)*(a3)-(a1)*(a2));
-};
+
 
 /** Comparison function for GSL heapsort on distances in two molecules.