[pipeline] Reuse savePairsToFile() in imageMatching

alicevision · Oct 11, 2022 · ab47199 · ab47199
1 parent ec9c01f
commit ab47199
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/src/aliceVision/imageMatching/ImageMatching.cpp b/src/aliceVision/imageMatching/ImageMatching.cpp
@@ -24,20 +24,6 @@ std::ostream& operator<<(std::ostream& os, const PairList& pl)
     return os;
 }
 
-std::ostream& operator<<(std::ostream& os, const OrderedPairList & pl)
-{
-  for(OrderedPairList::const_iterator plIter = pl.begin(); plIter != pl.end(); ++plIter)
-  {
-    os << plIter->first;
-    for(ImageID id : plIter->second)
-    {
-      os << " " << id;
-    }
-    os << "\n";
-  }
-  return os;
-}
-
 std::string EImageMatchingMethod_enumToString(EImageMatchingMethod m)
 {
     switch(m)

diff --git a/src/aliceVision/imageMatching/ImageMatching.hpp b/src/aliceVision/imageMatching/ImageMatching.hpp
@@ -45,14 +45,6 @@ using OrderedPairList = std::map<ImageID, OrderedListOfImageID>;
  */
 std::ostream& operator<<(std::ostream& os, const PairList& pl);
 
-/**
- * @brief Function that prints a OrderedPairList
- * @param os The stream on which to print
- * @param pl The pair list
- * @return the stream
- */
-std::ostream& operator<<(std::ostream& os, const OrderedPairList & pl);
-
 /**
  * @brief Mode to select the type of image matching
  */

diff --git a/src/software/pipeline/CMakeLists.txt b/src/software/pipeline/CMakeLists.txt
@@ -77,6 +77,7 @@ if(ALICEVISION_BUILD_SFM)
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
           aliceVision_imageMatching
+          aliceVision_matchingImageCollection
           aliceVision_sfm
           aliceVision_sfmData
           aliceVision_sfmDataIO

diff --git a/src/software/pipeline/main_imageMatching.cpp b/src/software/pipeline/main_imageMatching.cpp
@@ -6,6 +6,7 @@
 
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
+#include <aliceVision/matchingImageCollection/ImagePairListIO.hpp>
 #include <aliceVision/imageMatching/ImageMatching.hpp>
 #include <aliceVision/voctree/descriptorLoader.hpp>
 #include <aliceVision/sfm/FrustumFilter.hpp>
@@ -300,10 +301,13 @@ int aliceVision_main(int argc, char** argv)
   }
 
   // write it to file
-  std::ofstream fileout;
-  fileout.open(outputFile, std::ofstream::out);
-  fileout << selectedPairs;
-  fileout.close();
+  PairSet selectedPairsSet;
+  for (const auto& imagePairs : selectedPairs) {
+      for (const auto& index : imagePairs.second) {
+          selectedPairsSet.emplace(imagePairs.first, index);
+      }
+  }
+  savePairsToFile(outputFile, selectedPairsSet);
 
   ALICEVISION_LOG_INFO("pairList exported in: " << outputFile);