Changes in src/helpers.hpp [a67d19:920c70]

File:

• src/helpers.hpp (modified) (5 diffs)

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.
@@ -132 +115 @@
 
   // allocate and fill
-  LookupTable = Calloc<T*>(count, "CreateFatherLookupTable - **LookupTable");
+  LookupTable = new T*[count];
   if (LookupTable == NULL) {
     DoeLog(0) && (eLog()<< Verbose(0) << "LookupTable memory allocation failed!" << endl);
@@ -187 +170 @@
 };
 
+#define PLURAL_S(v) (((v)==1)?"":"s")
 
+// this is to allow different modes of access for
+// maps and sets
+template<typename Res,typename T>
+struct _take{
+  Res get(T value) const;
+};
+
+// if we have a set,vector etc we can directly access the result
+template<typename Res>
+struct _take<Res,Res>{
+  static inline Res get(Res value){
+    return value;
+  }
+};
+
+// if we have a map we have to access the second part of
+// the pair
+template<typename Res,typename T1>
+struct _take<Res,std::pair<T1,Res> >{
+  static inline Res get(std::pair<T1,Res> value){
+    return value.second;
+  }
+};
 
 #endif /*HELPERS_HPP_*/