Changeset 0d111b for molecuilder/src/helpers.hpp

Timestamp:

Apr 29, 2010, 1:55:21 PM (15 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.hpp (modified) (3 diffs)

molecuilder/src/helpers.hpp

@@ -24 +24 @@
 /********************************************** definitions *********************************/
 
-// some algebraic matrix stuff
-double RDET3(const double a[NDIM*NDIM]);
-double RDET2(const double a[4]);
-double RDET2(const double a0, const double a1, const double a2, const double a3);
-
 /********************************************** helpful functions *********************************/
 
@@ -53 +48 @@
 bool check_bounds(double *x, double *cell_size);
 void bound(double *b, double lower_bound, double upper_bound);
-int pot(int base, int n);
 int CountLinesinFile(ifstream &InputFile);
 char *FixedDigitNumber(const int FragmentNumber, const int digits);
@@ -64 +58 @@
 /********************************************** helpful template functions *********************************/
 
-/** Flips two values.
- * \param x first value
- * \param y second value
- */
-template <typename T> void flip(T &x, T &y)
-{
-  T tmp;
-  tmp = x;
-  x = y;
-  y = tmp;
-};
 
 /** returns greater of the two values.