From dc45a646fe6958a3b878aae9c6ceef2b51ecbc65 Mon Sep 17 00:00:00 2001 From: pmoulon Date: Mon, 28 Sep 2015 15:06:56 +0200 Subject: [PATCH] Set default distance ratio threshold value to 0.8. #335 --- src/software/SfM/SfM_GlobalPipeline.py.in | 2 +- src/software/SfM/SfM_SequentialPipeline.py.in | 2 +- src/software/SfM/main_ComputeMatches.cpp | 4 ++-- src/software/SfM/tutorial_demo.py.in | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in index 50949bcbce..092d308020 100644 --- a/src/software/SfM/SfM_GlobalPipeline.py.in +++ b/src/software/SfM/SfM_GlobalPipeline.py.in @@ -54,7 +54,7 @@ pFeatures = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_Compu pFeatures.wait() print ("3. Compute matches") -pMatches = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeMatches"), "-i", matches_dir+"/sfm_data.json", "-o", matches_dir, "-r", "0.8", "-g", "e"] ) +pMatches = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeMatches"), "-i", matches_dir+"/sfm_data.json", "-o", matches_dir, "-g", "e"] ) pMatches.wait() # Create the reconstruction if not present diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in index 12ee3c3b18..50fd8218df 100644 --- a/src/software/SfM/SfM_SequentialPipeline.py.in +++ b/src/software/SfM/SfM_SequentialPipeline.py.in @@ -54,7 +54,7 @@ pFeatures = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_Compu pFeatures.wait() print ("3. Compute matches") -pMatches = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeMatches"), "-i", matches_dir+"/sfm_data.json", "-o", matches_dir, "-r", "0.8"] ) +pMatches = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeMatches"), "-i", matches_dir+"/sfm_data.json", "-o", matches_dir] ) pMatches.wait() # Create the reconstruction if not present diff --git a/src/software/SfM/main_ComputeMatches.cpp b/src/software/SfM/main_ComputeMatches.cpp index cf96fb01a2..33cba7861b 100644 --- a/src/software/SfM/main_ComputeMatches.cpp +++ b/src/software/SfM/main_ComputeMatches.cpp @@ -64,7 +64,7 @@ int main(int argc, char **argv) std::string sSfM_Data_Filename; std::string sMatchesDirectory = ""; std::string sGeometricModel = "f"; - float fDistRatio = .6f; + float fDistRatio = 0.8f; int iMatchingVideoMode = -1; std::string sPredefinedPairList = ""; bool bUpRight = false; @@ -96,7 +96,7 @@ int main(int argc, char **argv) << "\n[Optional]\n" << "[-f|--force] Force to recompute data]\n" << "[-r|--ratio] Distance ratio to discard non meaningful matches\n" - << " 0.6: (default); you can use 0.8 to have more matches.\n" + << " 0.8: (default).\n" << "[-g|--geometric_model]\n" << " (pairwise correspondences filtering thanks to robust model estimation):\n" << " f: (default) fundamental matrix,\n" diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in index 977361f200..de930ce71d 100644 --- a/src/software/SfM/tutorial_demo.py.in +++ b/src/software/SfM/tutorial_demo.py.in @@ -53,7 +53,7 @@ pFeatures = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_Compu pFeatures.wait() print ("2. Compute matches") -pMatches = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeMatches"), "-i", matches_dir+"/sfm_data.json", "-o", matches_dir, "-r", "0.8", "-f", "1"] ) +pMatches = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeMatches"), "-i", matches_dir+"/sfm_data.json", "-o", matches_dir, "-f", "1"] ) pMatches.wait() reconstruction_dir = os.path.join(output_dir,"reconstruction_sequential")