PerfTest descriptor: extract the progress bar from the loader

Tests/noDist/PerfTest/Descriptors.hpp

@@ -304,43 +304,54 @@ struct uniform_tree_descriptor {
 
 
 // Basic loader descriptor ///////////////////////
-
-#include "Files/FFmaGenericLoader.hpp"
 #include <thread>
 
+struct progress_bar {
+    std::stringstream sstr;
+    std::thread t;
+
+    progress_bar() {
+        this->sstr.precision(3);
+    }
+
+    template<typename Loader>
+    void follow(FSize& idx, Loader& l) {
+        this->t = std::thread(
+            [this,&idx,&l]() {
+                bool run = true;
+                while(run) {
+                    sstr.str("");
+                    sstr.clear();
+                    sstr.precision(4);
+                    double p = static_cast<double>(idx) * 100.
+                        / static_cast<double>(l.getNumberOfParticles());
+                    sstr << "Loading particles: [";
+                    for(double i = 0; i < 100; i += 7.5) {
+                        sstr << (i < p ? '|' : ' ');
+                    }
+                    sstr << "] " << p << "%    ";
+                    std::cout << '\r' << sstr.str() << std::flush;
+                    run = idx < l.getNumberOfParticles();
+                    std::this_thread::sleep_for(std::chrono::milliseconds(200));
+                }
+            });
+    }
+
+    void finish() {
+        this->t.join();
+    }
+};
+
+#include "Files/FFmaGenericLoader.hpp"
 
 template<typename FReal>
 struct default_loader_descriptor {
     struct loader_t : public FFmaGenericLoader<FReal> {
 
-        std::stringstream sstr;
-        std::thread t;
-
-        void setup_progress(FSize& idx) {
-            this->t = std::thread(
-                [this,&idx]() {
-                    bool run = true;
-                    while(run) {
-                        sstr.str("");
-                        sstr.clear();
-                        sstr.precision(4);
-                        double p = static_cast<double>(idx) * 100.
-                            / static_cast<double>(this->getNumberOfParticles());
-                        sstr << "Loading particles: [";
-                        for(double i = 0; i < 100; i += 7.5) {
-                            sstr << (i < p ? '|' : ' ');
-                        }
-                        sstr << "] " << p << "%    ";
-                        std::cout << '\r' << sstr.str() << std::flush;
-                        run = idx < this->getNumberOfParticles();
-                        std::this_thread::sleep_for(std::chrono::milliseconds(200));
-                    }
-                });
-        }
+        progress_bar progress;
 
         loader_t(const FPerfTestParams& params)
             : FFmaGenericLoader<FReal>(params.filename){
-            this->sstr.precision(3);
         }
 
         template<typename tree_t>
@@ -351,7 +362,7 @@ struct default_loader_descriptor {
             FPoint<FReal> position;
             FReal physicalValue = 0.0;
 
-            this->setup_progress(idxPart);
+            progress.follow(idxPart,*this);
 
             for(idxPart = 0 ; idxPart < this->getNumberOfParticles() ; ++idxPart){
                 // Read particle per particle from file
@@ -359,7 +370,7 @@ struct default_loader_descriptor {
                 // put particle in octree
                 tree.insert(position, idxPart, physicalValue);
             }
-            this->t.join();
+            progress.finish();
             std::cout << "done." << std::endl;
         }
     };