task05 added cameras.out for saharov32 and herzjesu25 datasets

I-7 · Jun 16, 2024 · 6523c66 · 6523c66
1 parent d730ce6
commit 6523c66
Show file tree

Hide file tree

Showing 7 changed files with 150,261 additions and 14 deletions.
diff --git a/data/src/datasets/herzjesu25/.gitignore b/data/src/datasets/herzjesu25/.gitignore
@@ -1,4 +1,5 @@
-# Ignore everything in this directory
 *
-# Except this file
-!.gitignore
+!.gitignore
+!cameras.out
+!LINK.txt
+!ordered_filenames.txt
diff --git a/data/src/datasets/herzjesu25/cameras.out b/data/src/datasets/herzjesu25/cameras.out
diff --git a/data/src/datasets/saharov32/.gitignore b/data/src/datasets/saharov32/.gitignore
diff --git a/data/src/datasets/saharov32/cameras.out b/data/src/datasets/saharov32/cameras.out
diff --git a/src/phg/mvs/depth_maps/pm_depth_maps.cpp b/src/phg/mvs/depth_maps/pm_depth_maps.cpp
@@ -7,8 +7,6 @@
 #include "pm_geometry.h"
 #include "pm_depth_maps_defines.h"
 
-#define SOFT_PERTURBATION 1
-
 namespace phg {
 
     matrix3d extractR(const matrix34d &P)

diff --git a/src/phg/mvs/depth_maps/pm_depth_maps_defines.h b/src/phg/mvs/depth_maps/pm_depth_maps_defines.h
@@ -14,6 +14,8 @@
 #define COSTS_K_RATIO               1.2f
 #define COSTS_BEST_K_LIMIT          5
 
+#define SOFT_PERTURBATION           1
+
 #define VERBOSE_LOGGING
 #ifdef VERBOSE_LOGGING
 	#define verbose_cout std::cout

diff --git a/tests/test_depth_maps_pm.cpp b/tests/test_depth_maps_pm.cpp
@@ -20,11 +20,11 @@
 // Datasets:
 
 // достаточно чтобы у вас работало на этом датасете, тестирование на Travis CI тоже ведется на нем
-//#define DATASET_DIR                  "saharov32"
-//#define DATASET_DOWNSCALE            4
+#define DATASET_DIR                  "saharov32"
+#define DATASET_DOWNSCALE            4
 
-#define DATASET_DIR                  "temple47"
-#define DATASET_DOWNSCALE            8
+//#define DATASET_DIR                  "temple47"
+//#define DATASET_DOWNSCALE            8
 
 // скачайте картинки этого датасета в папку data/src/datasets/herzjesu25/ по ссылке из файла LINK.txt в папке датасета
 //#define DATASET_DIR                  "herzjesu25"
@@ -69,7 +69,7 @@ TEST (test_depth_maps_pm, AllDepthMaps) {
                                                  all_points, all_colors, all_normals);
         ++ndepth_maps;
 
-        std::string tie_points_filename = std::string("data/debug/test_depth_maps_pm/") + getTestName() + "/all_points_" + to_string(ndepth_maps) + ".ply";
+        std::string tie_points_filename = std::string("data/debug/test_depth_maps_pm/") + getTestName() + "/" + DATASET_DIR + "_all_points_" + to_string(ndepth_maps) + ".ply";
         phg::exportPointCloud(all_points, tie_points_filename, all_colors, all_normals);
     }
 }