Merge branch 'release/v1.1.5' into master

main/CMakeLists.txt

@@ -8,6 +8,7 @@ add_executable(rawls_merge_MON_incr rawls_merge_MON_incr.cpp)
 add_executable(rawls_merge_MON_pct_incr rawls_merge_MON_pct_incr.cpp)
 add_executable(rawls_update rawls_update.cpp)
 add_executable(extract_stats_images extract_stats_images.cpp)
+add_executable(extract_stats_images_all extract_stats_images_all.cpp)
 
 target_link_libraries(rawls_convert LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_mean LINK_PUBLIC rawls)
@@ -18,6 +19,7 @@ target_link_libraries(rawls_merge_median_incr LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_MON_incr LINK_PUBLIC rawls)
 target_link_libraries(rawls_merge_MON_pct_incr LINK_PUBLIC rawls)
 target_link_libraries(extract_stats_images LINK_PUBLIC rawls)
+target_link_libraries(extract_stats_images_all LINK_PUBLIC rawls)
 target_link_libraries(rawls_update LINK_PUBLIC rawls rawls_v1)
 
 set_property(TARGET rawls_merge_mean PROPERTY CXX_STANDARD 17)
@@ -29,4 +31,5 @@ set_property(TARGET rawls_merge_median_incr PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_merge_MON_incr PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_merge_MON_pct_incr PROPERTY CXX_STANDARD 17)
 set_property(TARGET extract_stats_images PROPERTY CXX_STANDARD 17)
+set_property(TARGET extract_stats_images_all PROPERTY CXX_STANDARD 17)
 set_property(TARGET rawls_update PROPERTY CXX_STANDARD 17)

main/extract_stats_images_all.cpp

@@ -0,0 +1,368 @@
+#include <stdio.h>
+#include <string.h>
+#include <sstream>
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <tuple>
+#include <cmath>
+#include <numeric>  
+#include <map>
+#include <algorithm>
+#include <filesystem>
+#include <unistd.h> 
+
+#include <bits/stdc++.h> 
+#include <iostream> 
+#include <sys/stat.h> 
+#include <sys/types.h> 
+
+#include "rawls.h"
+
+struct Point {
+    unsigned x;
+    unsigned y;
+};
+
+struct Tile {
+    Point p1;
+    Point p2;
+};
+
+std::vector<std::string> split(const std::string& s, char delimiter)
+{
+   std::vector<std::string> tokens;
+   std::string token;
+   std::istringstream tokenStream(s);
+   while (std::getline(tokenStream, token, delimiter))
+   {
+      tokens.push_back(token);
+   }
+   return tokens;
+}
+
+void writeProgress(float progress, bool moveUp = false){
+    int barWidth = 200;
+
+    if (moveUp){
+        // move up line
+        std::cout << "\e[A";
+        std::cout.flush();
+    }
+
+    std::cout << "[";
+    int pos = barWidth * progress;
+    for (int i = 0; i < barWidth; ++i) {
+        if (i < pos) std::cout << "=";
+        else if (i == pos) std::cout << ">";
+        else std::cout << " ";
+    }
+    std::cout << "] " << int(progress * 100.0) << " %\r";
+    std::cout.flush();
+}
+
+float getEstimator(std::string estimator, std::vector<float> values) {
+
+    if (estimator == "median") {
+        
+        std::sort(values.begin(), values.end());
+
+        unsigned size = values.size();
+
+        if (size % 2 == 0)
+        {
+            return (values[size / 2 - 1] + values[size / 2]) / 2;
+        }
+        else 
+        {
+            return values[size / 2];
+        }
+    } else if (estimator == "mean") {
+
+        return std::accumulate(values.begin(), values.end(), 0.0) / values.size(); 
+
+    } else if (estimator == "var") {
+        // Calculate the mean
+        const float mean = std::accumulate(values.begin(), values.end(), 0.0) / values.size();
+
+        // Now calculate the variance
+        auto variance_func = [&mean](float accumulator, const float& val) {
+            return accumulator + pow(val - mean, 2);
+        };
+
+        return std::accumulate(values.begin(), values.end(), 0.0, variance_func) / values.size();
+
+    } else if (estimator == "std") {
+
+        return sqrt(getEstimator("var", values));
+
+    } else if (estimator == "skewness") {
+
+        unsigned size = values.size();
+
+        float mean = getEstimator("mean", values);
+        float std = getEstimator("std", values);
+
+        // Now calculate the sum of pow 3
+        auto order3_func = [&mean, &std](float accumulator, const float& val) {
+            return accumulator + pow((val - mean) / std, 3);
+        };
+
+        float order3 = std::accumulate(values.begin(), values.end(), 0.0, order3_func);
+
+        return order3 / size;
+
+    } else if (estimator == "kurtosis") {
+        
+        unsigned size = values.size();
+
+        float mean = getEstimator("mean", values);
+        float std = getEstimator("std", values);
+
+        // Now calculate the sum of pow 4
+        auto order4_func = [&mean, &std](float accumulator, const float& val) {
+            return accumulator + pow((val - mean) / std, 4);
+        };
+
+        float order4 = std::accumulate(values.begin(), values.end(), 0.0, order4_func);
+
+        return order4 / size;
+
+    } else if (estimator == "mode") {
+
+        std::vector<float> pvalues;
+
+        for (unsigned i = 0; i < values.size(); i++){
+            pvalues.push_back(roundf(values.at(i) * 100) / 100.0);
+        }
+
+        typedef std::map<float,unsigned int> CounterMap;
+        CounterMap counts;
+        for (int i = 0; i < pvalues.size(); ++i)
+        {
+            CounterMap::iterator it(counts.find(pvalues[i]));
+            if (it != counts.end()){
+                it->second++;   
+            } else {
+                counts[pvalues[i]] = 1;
+            }
+        }
+
+        // Create a map iterator and point to beginning of map
+        std::map<float, unsigned int>::iterator it = counts.begin();
+        unsigned noccurences = 0;
+        float modeValue = 0.;
+        // Iterate over the map using Iterator till end.
+        while (it != counts.end())
+        {
+            // Accessing KEY from element pointed by it.
+            float potentialMode = it->first;
+            // Accessing VALUE from element pointed by it.
+            unsigned count = it->second;
+
+            if (count > noccurences) {
+                noccurences = count;
+                modeValue = potentialMode;
+            }
+
+            // Increment the Iterator to point to next entry
+            it++;
+        }
+
+        return modeValue;
+    }
+
+    // by default
+    return 0.;
+}
+
+int main(int argc, char *argv[]){
+
+    std::string folderName;
+    std::vector<std::string> estimators = {"median", "var", "std", "skewness", "kurtosis", "mode"};
+    unsigned blockHeight;
+    unsigned blockWidth;
+    unsigned nfiles = 10000;
+    std::string outputFolder;
+
+    for (int i = 1; i < argc; ++i) {
+        if (!strcmp(argv[i], "--folder") || !strcmp(argv[i], "-folder")) {
+            folderName = argv[++i];
+        } else if (!strcmp(argv[i], "--bwidth") || !strcmp(argv[i], "-bwidth")) {
+            blockHeight = atoi(argv[++i]);
+        } else if (!strcmp(argv[i], "--bheight") || !strcmp(argv[i], "-bheight")) {
+            blockWidth = atoi(argv[++i]);
+        } else if (!strcmp(argv[i], "--output") || !strcmp(argv[i], "-output")) {
+            outputFolder = argv[++i];
+        } else if (!strcmp(argv[i], "--nfiles") || !strcmp(argv[i], "-nfiles")) {
+            nfiles = atoi(argv[++i]);
+        }
+    }
+
+    // create outputs directory
+    mkdir(outputFolder.c_str(), 0755);
+
+    auto elements = split(folderName, '/');
+    std::string sceneName = elements.at(elements.size() - 1);
+
+    for (int i = 0; i < estimators.size(); i++) {
+
+        mkdir((outputFolder + "/" + estimators[i]).c_str(), 0755);
+        mkdir((outputFolder + "/" + estimators[i] + "/" + sceneName).c_str(), 0755);
+    }
+
+
+    // get all files path
+    std::vector<std::string> imagesPath;
+
+    for (const auto & entry : std::filesystem::directory_iterator(folderName)){
+        std::string imageName = entry.path().string();
+        if (rawls::HasExtension(imageName, ".rawls") || rawls::HasExtension(imageName, ".rawls_20")){
+            imagesPath.push_back(imageName);
+        }
+    }
+
+    if (imagesPath.size() != nfiles) {
+        return 0;
+    }
+
+    std::sort(imagesPath.begin(), imagesPath.end());
+
+    std::tuple<unsigned, unsigned, unsigned> data = rawls::getDimensionsRAWLS(imagesPath.at(0));
+
+    unsigned outputWidth = std::get<0>(data);
+    unsigned outputHeight = std::get<1>(data);
+    unsigned nbChanels = std::get<2>(data);
+
+    std::vector<float*> outputBuffers;
+    std::vector<std::string> outputFiles;
+    std::vector<std::string> selectedEstimators;
+    // new buffer size as new output buffer image (default 3 channels)
+
+    for (int i = 0; i < estimators.size(); i++) {
+
+        std::string outputFile = outputFolder + "/" + estimators[i] + "/" + sceneName + "/" + sceneName + ".rawls";
+
+        std::ifstream ifile;
+        ifile.open(outputFile);
+        if(!ifile) {
+        
+            // create new buffer entry
+            selectedEstimators.push_back(estimators[i]);
+            outputFiles.push_back(outputFile);
+            outputBuffers.push_back(new float[outputHeight * outputWidth * nbChanels]);
+        
+        } else {
+            ifile.close();
+        }
+    }
+
+    // get all tiles to apply
+    unsigned nWidth = ceil(outputWidth / (float)blockWidth);
+    unsigned nHeight = ceil(outputHeight / (float)blockHeight);
+
+    std::vector<Tile> tiles;
+
+    for (unsigned i = 0; i < nWidth; i++) {
+        for (unsigned j = 0; j < nHeight; j++) {
+
+            unsigned x1 = i * blockWidth;
+            unsigned y1 = j * blockHeight;
+
+            unsigned x2 = i * blockWidth + blockWidth;
+            unsigned y2 = j * blockHeight + blockHeight;
+
+            x2 = x2 > outputWidth ? outputWidth: x2;
+            y2 = y2 > outputHeight ? outputHeight: y2;
+            
+            Point p1 = {x1, y1};
+            Point p2 = {x2, y2};
+
+            Tile tile = {p1, p2};
+            tiles.push_back(tile);
+        }
+    }
+
+    unsigned nsamples = imagesPath.size();
+    unsigned nloop = tiles.size() * nsamples;
+    unsigned nloopCounter = 0;
+
+    for (unsigned t_index = 0; t_index < tiles.size(); t_index++){
+
+        Tile tile = tiles.at(t_index);
+
+        //std::cout << "Tile: (" << tile.p1.x << ", " << tile.p1.y << ")" << " => " << "(" << tile.p2.x << ", " << tile.p2.y << ")" << std::endl;
+
+        unsigned nvalues = (tile.p2.x - tile.p1.x) * (tile.p2.y - tile.p1.y) * 3;
+
+        std::vector<std::vector<float>> rgbValues(nvalues);
+
+        for (unsigned i = 0; i < nsamples; i++) {
+            
+            try {
+                
+                float* RGBpixels = rawls::getPixelsRAWLS(imagesPath.at(i));
+
+                unsigned index = 0;
+                for (int y = tile.p1.y; y < tile.p2.y; ++y) {
+                    for (int x = tile.p1.x; x < tile.p2.x; ++x) {
+            
+                        rgbValues.at(index).push_back(RGBpixels[3 * (y * outputWidth + x) + 0]);
+                        rgbValues.at(index + 1).push_back(RGBpixels[3 * (y * outputWidth + x) + 1]);
+                        rgbValues.at(index + 2).push_back(RGBpixels[3 * (y * outputWidth + x) + 2]);
+
+                        index += 3;
+                    
+                    }
+                }
+
+                delete RGBpixels;
+
+            } catch(std::exception& e){
+                std::cout << "Error occurs when reading file" << std::endl;
+            }
+
+            // display progress
+            nloopCounter += 1;
+            writeProgress(nloopCounter / (float)nloop);
+        }
+
+
+        for (int i = 0; i < outputFiles.size(); i++) {
+        
+            // extract stat and add predicted value into output buffer
+            unsigned index = 0;
+
+            for (int y = tile.p1.y; y < tile.p2.y; ++y) {
+                for (int x = tile.p1.x; x < tile.p2.x; ++x) {
+                    
+                    outputBuffers.at(i)[3 * (y * outputWidth + x) + 0] = getEstimator(selectedEstimators.at(i), rgbValues.at(index + 0));
+                    outputBuffers.at(i)[3 * (y * outputWidth + x) + 1] = getEstimator(selectedEstimators.at(i), rgbValues.at(index + 1));
+                    outputBuffers.at(i)[3 * (y * outputWidth + x) + 2] = getEstimator(selectedEstimators.at(i), rgbValues.at(index + 2));
+
+                    index += 3;
+                }
+            }
+        }
+    }
+
+    // Save here new rawls image
+    std::string comments = rawls::getCommentsRAWLS(imagesPath.at(0));
+
+    for (int i = 0; i < outputFiles.size(); i++) {
+
+        // construct specific outfile name
+        bool success = rawls::saveAsRAWLS(outputWidth, outputHeight, nbChanels, comments, outputBuffers[i], outputFiles[i]);
+
+        if (success) {
+            std::cout << "New image saved into " << outputFiles[i] << std::endl;
+        }
+        else
+        {
+            std::cout << "Error while saving current image " << outputFiles[i] << std::endl;
+        }
+
+        delete outputBuffers[i];
+    }
+
+}

main/rawls_merge_mean_incr_v2.cpp

@@ -9,6 +9,11 @@
 #include <filesystem>
 #include <regex>
 
+#include <bits/stdc++.h> 
+#include <iostream> 
+#include <sys/stat.h> 
+#include <sys/types.h> 
+
 void writeProgress(float progress, bool moveUp = false){
     int barWidth = 200;
 
@@ -86,6 +91,9 @@ int main(int argc, char *argv[]){
         }
     }
 
+    // create output directory
+    mkdir(outputFolder.c_str(), 0755);
+
     std::vector<std::string> imagesPath;
 
     for (const auto & entry : std::filesystem::directory_iterator(folderName)){
@@ -95,6 +103,11 @@ int main(int argc, char *argv[]){
         }
     }
 
+    // check number of files
+    if (maxSamples > imagesPath.size()) {
+        maxSamples = imagesPath.size();
+    }
+
     // sort or shuffle the images path
     if (!random){
         std::sort(imagesPath.begin(), imagesPath.end(), std::less<std::string>());
@@ -147,7 +160,6 @@ int main(int argc, char *argv[]){
 
         double w1 = (double)i / (double)(i + 1.);
         double w2 = 1. / ((double)i + 1.);
-        std::cout << w1 << " - " << w2 << std::endl;
         
         for(unsigned y = 0; y < height; y++){
 

run/run_all_estimators.py

@@ -8,6 +8,7 @@ def main():
     parser = argparse.ArgumentParser("Run estimators reconstruction")
     parser.add_argument('--folder', type=str, help='folder with rawls scene data', required=True)
     parser.add_argument('--nfiles', type=int, help='expected number of rawls files', required=True)
+    parser.add_argument('--est', type=str, help='estimator to use', choices=estimators, required=True)
     parser.add_argument('--tiles', type=str, help='tiles size: 100,100', default="100,100")
     parser.add_argument('--output', type=str, help='output folder', required=True)
 
@@ -15,30 +16,30 @@ def main():
 
     p_folder = args.folder
     p_nfiles = args.nfiles
-    x_tile, y_tile   = list(map(int, args.tiles.split(',')))
+    p_est = args.est
+    x_tile, y_tile = list(map(int, args.tiles.split(',')))
     p_output = args.output
 
     scenes = sorted(os.listdir(p_folder))
 
-    for est in estimators:
-        for scene in scenes:
-            scene_path = os.path.join(p_folder, scene)
-            nelements = len(os.listdir(scene_path))
+    for scene in scenes:
+        scene_path = os.path.join(p_folder, scene)
+        nelements = len(os.listdir(scene_path))
 
-            if nelements == p_nfiles:
-                print('Extraction of {0} estimator for {1} scene'.format(est, scene))
+        if nelements == p_nfiles:
+            print('Extraction of {0} estimator for {1} scene'.format(p_est, scene))
 
-                output_folder = os.path.join(p_output, est, scene)
+            output_folder = os.path.join(p_output, p_est, scene)
 
-                if not os.path.exists(output_folder):
-                    os.makedirs(output_folder)
+            if not os.path.exists(output_folder):
+                os.makedirs(output_folder)
 
-                outfilename = os.path.join(output_folder, scene + '_10000.rawls')
+            outfilename = os.path.join(output_folder, scene + '_10000.rawls')
 
-                if not os.path.exists(outfilename):
-                    os.system('./build/main/extract_stats_images --folder {0} --bwidth {1} --bheight {2} --outfile {3} --estimator {4}'.format(scene_path, x_tile, y_tile, est, outfilename))
-                else:
-                    print('Already generated')
+            if not os.path.exists(outfilename):
+                os.system('./build/main/extract_stats_images --folder {0} --bwidth {1} --bheight {2} --outfile {3} --estimator {4}'.format(scene_path, x_tile, y_tile, p_est, outfilename))
+            else:
+                print('Already generated')