added a test for some of the common functions. Might be extended? Or …

…we could remove some unused functions

include/common.h

@@ -35,18 +35,20 @@ void orderedinsert(std::list<double> & l, double value);
 std::vector<std::string> & split(const std::string &s, char delim, std::vector<std::string> &elems);
 std::vector<std::string> split(const std::string &s, char delim);
 
+bool test_common();
+
 class InternalError: public std::runtime_error {
-    public: 
+    public:
         explicit InternalError(): std::runtime_error("Colibri internal error") {}
 };
 
 class KeyError: public std::runtime_error {
-    public: 
+    public:
         explicit KeyError(): std::runtime_error("Colibri KeyError") {}
 };
 
 class UnknownTokenError: public std::runtime_error {
-    public: 
+    public:
         explicit UnknownTokenError(): std::runtime_error("Colibri TokenError: the input contained an unknown token") {}
 };
 #endif

src/common.cpp

@@ -1,7 +1,9 @@
 #include "common.h"
 #include <glob.h>
 #include <sstream>
+#include <iostream>
 #include <vector>
+#include <numeric>
 
 using namespace std;
 
@@ -32,19 +34,11 @@ bool strip_extension(std::string& filename, const std::string& extension) {
 }
 
 double listproduct(const vector<double> & l) {
-    double p = 1;
-    for ( const auto& iter : l ){
-      p *= iter;
-    }
-    return p;
+  return std::accumulate( l.begin(), l.end(), 1, std::multiplies<double>() );
 }
 
 double listsum(const vector<double> & l) {
-    double p = 0;
-    for ( const auto& iter: l ){
-      p += iter;
-    }
-    return p;
+  return std::accumulate( l.begin(), l.end(), 0 );
 }
 
 void orderedinsert(list<double> & l, double value) {
@@ -72,3 +66,30 @@ vector<string> split(const string &s, char delim) {
     vector<string> elems;
     return split(s, delim, elems);
 }
+
+bool test_common(){
+  int err_cnt = 0;
+  vector<double> v { 1.0, 2.0, 3.0, 4.0 };
+  if ( listproduct( v ) != 24.0 ) {
+    cerr << "listproduct problem: " << listproduct( v ) << " != 24.0" << endl;
+    ++err_cnt;
+  }
+  if ( listsum( v ) != 10.0 ){
+    cerr << "listproduct problem: " << listsum( v ) << " != 10" << endl;
+    ++err_cnt;
+  }
+  list<double> l { 1.0, 2.0, 3.0, 4.0 };
+  orderedinsert( l, 3.14 );
+  if ( l != list<double>({ 1.0, 2.0, 3.0, 3.14, 4.0 }) ){
+    cerr << "orderedinsert problem: { ";
+    for ( const auto& it : l ){
+      cerr << it;
+      if ( &it != &l.back() ){
+	cerr << ", ";
+      }
+    }
+    cerr << " } != { 1.0, 2.0, 3.0, 3.14, 4.0 }" << endl;
+    ++err_cnt;
+  }
+  return err_cnt == 0;
+}

src/test.cpp

@@ -45,7 +45,6 @@ void testgt(unsigned int value , unsigned int ref) {
 
 int main( int argc, const char *argv[] ) {
 
-
 	//string model = argv[1];
 	//string classfile = argv[1];
     bool verbose = false;
@@ -127,6 +126,9 @@ int main( int argc, const char *argv[] ) {
         }
         */
 
+      {
+	cerr << "  common functions "; test(test_common(),true);
+      }
 
       int res = chdir("/tmp");
       if ( res != 0 ){