Switch to opts, tolerate max-iterations-exceeded.

1. Use opts.h for command-line parsing in wasserstein_dist.
2. Real relative error at the end of auction is stored in params,
   params is passed by reference.
3. If -e command line option is given to wasserstein_dist,
    relative error will be printed.
4. If -t option is given to wasserstein_dist,
   no exception will be thrown, if maximum number of iterations is
   exceeded.
5. Run wasserstein_dist -h to see all options.

1 files changed, 3 insertions, 1 deletions

diff --git a/geom_matching/wasserstein/include/basic_defs_ws.h b/geom_matching/wasserstein/include/basic_defs_ws.h
index 1c5928f..1712ccf 100644
--- a/geom_matching/wasserstein/include/basic_defs_ws.h
+++ b/geom_matching/wasserstein/include/basic_defs_ws.h
@@ -88,8 +88,10 @@ struct AuctionParams
     Real epsilon_common_ratio { 5.0 };
     Real gamma_threshold { 0.0 };  // for experiments, not in use now
     int max_num_phases { std::numeric_limits<decltype(max_num_phases)>::max() };
-    size_t max_bids_per_round { 1 };  // imitate Gauss-Seidel is default behaviour
+    int max_bids_per_round { 1 };  // imitate Gauss-Seidel is default behaviour
     unsigned int dim { 2 }; // for pure geometric version only; ignored in persistence diagrams
+    Real final_relative_error;  // out parameter - after auction terminates, contains the real relative error
+    bool tolerate_max_iter_exceeded { false }; // whether auction should throw an exception on max. iterations exceeded
 };
 
 namespace ws