Merge branch 'master' of /home/lavaux/Dropbox/gitRoot/CosmoToolbox

sample/CMakeLists.txt

@@ -22,6 +22,9 @@ target_link_libraries(testDelaunay ${tolink})
 add_executable(testNewton testNewton.cpp)
 target_link_libraries(testNewton ${tolink})
 
+add_executable(testPool testPool.cpp)
+target_link_libraries(testPool ${tolink})
+
 if (HDF5_FOUND)
 	  add_executable(testReadFlash testReadFlash.cpp)
 	  target_link_libraries(testReadFlash ${tolink})
@@ -29,4 +32,7 @@ endif (HDF5_FOUND)
 
 
 add_executable(testEskow testEskow.cpp)
-target_link_libraries(testEskow ${tolink})
+target_link_libraries(testEskow ${tolink})
+
+add_executable(testAlgo testAlgo.cpp)
+target_link_libraries(testAlgo ${tolink})

sample/testAlgo.cpp

@@ -0,0 +1,20 @@
+#include <iostream>
+#include <stdio.h>
+#include "algo.hpp"
+
+using namespace CosmoTool;
+using namespace std;
+
+int main(int argc, char **argv)
+{
+  cout << square(2) << endl;
+  cout << cube(2) << endl;
+  cout << square(2.1f) << endl;
+  cout << cube(2.1f) << endl;
+  
+  cout << spower<2>(2.1f) << endl;
+  cout << spower<3>(2.1f) << endl;
+  cout << spower<4>(2.1f) << endl;
+  cout << spower<5>(2.1f) << endl;
+  return 0;
+}

sample/testPool.cpp

@@ -0,0 +1,19 @@
+#include "pool.hpp"
+
+using namespace CosmoTool;
+
+int main(int argc, char **argv)
+{
+  MemoryPool<int> pool(1024);
+  int **j = new int *[3000];
+
+  for (int i = 0; i < 3000; i++)
+    {
+      j[i] = pool.alloc();
+      j[i][0] = i;
+    }
+
+  pool.free_all();
+
+  return 0;
+}

sample/testkd2.cpp

@@ -5,14 +5,16 @@
 #include <fstream>
 #define __KD_TREE_NUMNODES
 #include "mykdtree.hpp"
+#include "kdtree_splitters.hpp"
 
-#define NTRY 100 
+#define NTRY 10
 #define ND 3
 
 using namespace std;
 using namespace CosmoTool;
 
-typedef KDTree<ND,char> MyTree;
+typedef KDTree<ND,char,ComputePrecision,KD_homogeneous_cell_splitter<ND, char> > MyTree;
+//typedef KDTree<ND,char,ComputePrecision > MyTree;
 typedef KDCell<ND,char> MyCell;
 
 MyCell *findNearest(MyTree::coords& xc, MyCell *cells, uint32_t Ncells)
@@ -38,7 +40,7 @@ MyCell *findNearest(MyTree::coords& xc, MyCell *cells, uint32_t Ncells)
 
 int main()
 {
-  uint32_t Ncells = 100000;
+  uint32_t Ncells = 10000000;
   MyCell *cells = new MyCell[Ncells];
   
   for (int i = 0; i < Ncells; i++)
@@ -48,8 +50,16 @@ int main()
 	cells[i].coord[l] = drand48();
     }
   
+  // Check timing
+  clock_t startTimer = clock();
   MyTree tree(cells, Ncells);
-  
+  clock_t endTimer = clock();
+
+  clock_t delta = endTimer-startTimer;
+  double myTime = delta*1.0/CLOCKS_PER_SEC * 1.0;
+
+  cout << "KDTree build = " << myTime << " s" << endl;
+
   MyTree::coords *xc = new MyTree::coords[NTRY];
 
   cout << "Generating seeds..." << endl;
@@ -68,31 +78,39 @@ int main()
   for (int k = 0; k < NTRY; k++) {
     cout << "Seed = " << xc[k][0] << " " << xc[k][1] << " " << xc[k][2] << endl;
     tree.getNearestNeighbours(xc[k], 12, ngb, distances);
+    int last = -1;
 
     for (uint32_t i = 0; i < 12; i++)
       {
+	if (ngb[i] == 0)
+	  continue;
+
+	last = i;
+
 	double d2 = 0;
 	for (int l = 0; l < 3; l++)
 	  d2 += ({double delta = xc[k][l] - ngb[i]->coord[l]; delta*delta;});
 	fngb << ngb[i]->coord[0] << " " << ngb[i]->coord[1] << " " << ngb[i]->coord[2] << " " << sqrt(d2) << endl;
       }
-	fngb << endl << endl;
-    double farther_dist = distances[11];
+    fngb << endl << endl;
+    double farther_dist = distances[last];
     for (uint32_t i = 0; i < Ncells; i++)
       {
          bool found = false;
-         // If the points is not in the list, it means it is farther than the farther point
-        for (int j =0; j < 12; j++)
+         // If the points is not in the list, it means it is farther than the farthest  point
+	 for (int j =0; j < 12; j++)
           {
              if (&cells[i] == ngb[j]) {
                found = true;
                break;
              }
           } 
-            double dist_to_seed = 0;
-            for (int l = 0; l < 3; l++)
-		{ double delta = xc[k][l]-cells[i].coord[l];
-              dist_to_seed += delta*delta; }
+	 double dist_to_seed = 0;
+	 for (int l = 0; l < 3; l++)
+	   {
+	     double delta = xc[k][l]-cells[i].coord[l];
+	     dist_to_seed += delta*delta; 
+	   }
         if (!found) 
           { 
 	    if (dist_to_seed <= farther_dist)