Fix tracks filtering

src/aliceVision/sfm/pipeline/global/GlobalSfMTranslationAveragingSolver.cpp

@@ -373,7 +373,7 @@ void GlobalSfMTranslationAveragingSolver::ComputePutativeTranslation_EdgesCovera
       {
         aliceVision::track::TracksBuilder tracksBuilder;
         tracksBuilder.build(map_triplet_matches);
-        tracksBuilder.filter(3);
+        tracksBuilder.filter(true,3);
 
         #pragma omp critical
         map_tracksPerTriplets[i] = tracksBuilder.nbTracks(); //count the # of matches in the UF tree
@@ -612,7 +612,7 @@ bool GlobalSfMTranslationAveragingSolver::Estimate_T_triplet(
 
   aliceVision::track::TracksBuilder tracksBuilder;
   tracksBuilder.build(map_triplet_matches);
-  tracksBuilder.filter(3);
+  tracksBuilder.filter(true,3);
   tracksBuilder.exportToSTL(tracks);
 
   if (tracks.size() < 30)

src/aliceVision/sfm/pipeline/global/ReconstructionEngine_globalSfM.cpp

@@ -281,7 +281,7 @@ bool ReconstructionEngine_globalSfM::Compute_Initial_Structure(matching::Pairwis
     // Use triplet validated matches
     tracksBuilder.build(tripletWise_matches);
 #endif
-    tracksBuilder.filter(3);
+    tracksBuilder.filter(true,3);
     TracksMap map_selectedTracks; // reconstructed track (visibility per 3D point)
     tracksBuilder.exportToSTL(map_selectedTracks);
 

src/aliceVision/sfm/pipeline/structureFromKnownPoses/StructureEstimationFromKnownPoses.cpp

@@ -198,7 +198,7 @@ void StructureEstimationFromKnownPoses::filter(
 
         if (map_matchesIJK.size() >= 2) {
           tracksBuilder.build(map_matchesIJK);
-          tracksBuilder.filter(3, false);
+          tracksBuilder.filter(true,3, false);
           tracksBuilder.exportToSTL(map_tracksCommon);
         }
 
@@ -251,7 +251,7 @@ void StructureEstimationFromKnownPoses::triangulate(
   track::TracksMap map_tracksCommon;
   track::TracksBuilder tracksBuilder;
   tracksBuilder.build(_tripletMatches);
-  tracksBuilder.filter(3);
+  tracksBuilder.filter(true,3);
   tracksBuilder.exportToSTL(map_tracksCommon);
   matching::PairwiseMatches().swap(_tripletMatches);
 

src/aliceVision/track/Track.hpp

@@ -123,7 +123,7 @@ inline std::ostream& operator<<(std::ostream& os, const KeypointId& k)
  *  TracksBuilder tracksBuilder;
  *  track::Tracks tracks;
  *  tracksBuilder.build(matches); // build: Efficient fusion of correspondences
- *  tracksBuilder.filter();           // filter: Remove track that have conflict
+ *  tracksBuilder.filter(true, 2);           // filter: Remove track that have conflict
  *  tracksBuilder.exportToSTL(tracks); // build tracks with STL compliant type
  * @endcode
  */
@@ -166,7 +166,7 @@ struct TracksBuilder
    * @param[in] minTrackLength: minimal number of observations to keep the track
    * @param[in] multithreaded Is multithreaded
    */
-  void filter(bool clearForks = true, std::size_t minTrackLength = 2, bool multithreaded = true);
+  void filter(bool clearForks, std::size_t minTrackLength, bool multithreaded = true);
 
   /**
    * @brief Export to stream

src/aliceVision/track/track_test.cpp

@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(Track_Conflict) {
   trackBuilder.build( map_pairwisematches );
 
   BOOST_CHECK_EQUAL(3, trackBuilder.nbTracks());
-  trackBuilder.filter(); // Key feature tested here to kill the conflicted track
+  trackBuilder.filter(true, 2); // Key feature tested here to kill the conflicted track
   BOOST_CHECK_EQUAL(2, trackBuilder.nbTracks());
 
   TracksMap map_tracks;

src/software/export/main_exportTracks.cpp

@@ -50,6 +50,8 @@ int main(int argc, char ** argv)
   std::string outputFolder;
   std::vector<std::string> featuresFolders;
   std::vector<std::string> matchesFolders;
+  bool clearForks = true;
+  int minTrackLength = 2;
 
   // user optional parameters
 
@@ -70,6 +72,10 @@ int main(int argc, char ** argv)
 
   po::options_description optionalParams("Optional parameters");
   optionalParams.add_options()
+    ("clearForks", po::value<bool>(&clearForks),
+      "Filter tracks forks.")
+    ("minTrackLength", po::value<int>(&minTrackLength),
+      "Minimum track length.")
     ("describerTypes,d", po::value<std::string>(&describerTypesName)->default_value(describerTypesName),
       feature::EImageDescriberType_informations().c_str());
 
@@ -153,7 +159,7 @@ int main(int argc, char ** argv)
     const aliceVision::matching::PairwiseMatches& map_Matches = pairwiseMatches;
     track::TracksBuilder tracksBuilder;
     tracksBuilder.build(map_Matches);
-    tracksBuilder.filter();
+    tracksBuilder.filter(clearForks, minTrackLength);
     tracksBuilder.exportToSTL(mapTracks);
 
     ALICEVISION_LOG_INFO("# tracks: " << tracksBuilder.nbTracks());