diff options
author | Gard Spreemann <gspr@nonempty.org> | 2022-04-29 13:54:09 +0200 |
---|---|---|
committer | Gard Spreemann <gspr@nonempty.org> | 2022-04-29 13:54:09 +0200 |
commit | fb4866e1d827389db17d74e5986d848617c8ef72 (patch) | |
tree | 46093502435ec117b137991a51acbe7f67b41dbc /wasserstein/example/wasserstein_dist_dipha.cpp | |
parent | 66702d9cf122703964dbe22319ae8d97424d496f (diff) | |
parent | 8fbae1d789b3c9d7e9b079284c85489d8dcd7e65 (diff) |
Merge tag 'v1.0.0' into dfsg/latestdfsg/latest
Version 1.0.0
Diffstat (limited to 'wasserstein/example/wasserstein_dist_dipha.cpp')
-rw-r--r-- | wasserstein/example/wasserstein_dist_dipha.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/wasserstein/example/wasserstein_dist_dipha.cpp b/wasserstein/example/wasserstein_dist_dipha.cpp index 2ed9c2c..1bfc41b 100644 --- a/wasserstein/example/wasserstein_dist_dipha.cpp +++ b/wasserstein/example/wasserstein_dist_dipha.cpp @@ -32,8 +32,6 @@ derivative works thereof, in binary and source code form. #include <iomanip> #include <vector> -//#define LOG_AUCTION - //#include "auction_runner_fr.h" //#include "auction_runner_fr.hpp" @@ -50,7 +48,7 @@ int main(int argc, char* argv[]) hera::AuctionParams<double> params; if (argc < 4 ) { - std::cerr << "Usage: " << argv[0] << " file1 file2 ph_dim [wasserstein_degree] [relative_error] [internal norm] [initial epsilon] [epsilon_factor] [max_bids_per_round] [gamma_threshold][log_filename_prefix]. By default power is 1.0, relative error is 0.01, internal norm is l_infinity, initall epsilon is chosen automatically, epsilon factor is 5.0, Jacobi variant is used (max bids per round is maximal), gamma_threshold = 0.0." << std::endl; + std::cerr << "Usage: " << argv[0] << " file1 file2 ph_dim [wasserstein_degree] [relative_error] [internal norm] [initial epsilon] [epsilon_factor] [max_bids_per_round] [gamma_threshold]. By default power is 1.0, relative error is 0.01, internal norm is l_infinity, initall epsilon is chosen automatically, epsilon factor is 5.0, Jacobi variant is used (max bids per round is maximal), gamma_threshold = 0.0." << std::endl; return 1; } @@ -116,15 +114,9 @@ int main(int argc, char* argv[]) params.gamma_threshold = (11 <= argc) ? atof(argv[10]) : 0.0; - std::string log_filename_prefix = ( 12 <= argc ) ? argv[11] : ""; - params.max_num_phases = 800; -#ifdef LOG_AUCTION - spdlog::set_level(spdlog::level::info); -#endif - - double res = hera::wasserstein_dist(diagramA, diagramB, params, log_filename_prefix); + double res = hera::wasserstein_dist(diagramA, diagramB, params); std::cout << std::setprecision(15) << res << std::endl; |