Changes in src/helpers.cpp [a67d19:112b09]

File:

• src/helpers.cpp (modified) (9 diffs)

src/helpers.cpp

@@ -4 +4 @@
  */
 
+#include "Helpers/MemDebug.hpp"
 
 #include "helpers.hpp"
+#include "Helpers/fast_functions.hpp"
 #include "log.hpp"
 #include "memoryusageobserver.hpp"
@@ -51 +53 @@
 };
 
-/** 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;
-};
-
 /** Counts lines in file.
  * Note we are scanning lines from current position, not from beginning.
@@ -71 +59 @@
 int CountLinesinFile(ifstream &InputFile)
 {
-  char *buffer = Malloc<char>(MAXSTRINGSIZE, "CountLinesinFile: *buffer");
+  char *buffer = new char[MAXSTRINGSIZE];
   int lines=0;
 
@@ -83 +71 @@
   }
   InputFile.seekg(PositionMarker, ios::beg);
-  Free(&buffer);
+  delete[](buffer);
   return lines;
 };
@@ -103 +91 @@
   }
   // allocate string
-  returnstring = Malloc<char>(order + 2, "FixedDigitNumber: *returnstring");
+  returnstring = new char[order + 2];
   // terminate  and fill string array from end backward
   returnstring[order] = '\0';
@@ -135 +123 @@
 double * ReturnFullMatrixforSymmetric(const double * const symm)
 {
-  double *matrix = Malloc<double>(NDIM * NDIM, "molecule::ReturnFullMatrixforSymmetric: *matrix");
+  double *matrix = new double[NDIM * NDIM];
   matrix[0] = symm[0];
   matrix[1] = symm[1];
@@ -153 +141 @@
 double * InverseMatrix( const double * const A)
 {
-  double *B = Malloc<double>(NDIM * NDIM, "Vector::InverseMatrix: *B");
+  double *B = new double[NDIM * NDIM];
   double detA = RDET3(A);
   double detAReci;
@@ -175 +163 @@
 };
 
-/** 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.
@@ -221 +181 @@
 
 
-/** Allocates a memory range using malloc().
- * Prints the provided error message in case of a failure.
- *
- * \param number of memory slices of type X to allocate
- * \param failure message which is printed if the allocation fails
- * \return pointer to the allocated memory range, will be NULL if a failure occurred
- */
-template <> char* Malloc<char>(size_t size, const char* output)
-{
-  char* buffer = NULL;
-  buffer = (char*) malloc(sizeof(char) * (size + 1));
-  for (size_t i = size; i--;)
-    buffer[i] = (i % 2 == 0) ? 'p': 'c';
-  buffer[size] = '\0';
-
-  if (buffer != NULL) {
-    MemoryUsageObserver::getInstance()->addMemory(buffer, size);
-  } else {
-    Log() << Verbose(0) << "Malloc for datatype " << typeid(char).name()
-      << " failed - pointer is NULL: " << output << endl;
-  }
-
-  return buffer;
-};
-
 /**
- * Frees all memory registered by the memory observer and calls exit(225) afterwards.
+ * Calls exit(255).
  */
 void performCriticalExit() {
-  map<void*, size_t> pointers = MemoryUsageObserver::getInstance()->getPointersToAllocatedMemory();
-  for (map<void*, size_t>::iterator runner = pointers.begin(); runner != pointers.end(); runner++) {
-    Free(((void**) &runner->first));
-  }
-
   exit(255);
 }