diff options
| author | Arnur Nigmetov <a.nigmetov@gmail.com> | 2018-06-01 16:01:00 +0200 |
|---|---|---|
| committer | Arnur Nigmetov <a.nigmetov@gmail.com> | 2018-06-01 16:01:00 +0200 |
| commit | 58642131623733ed7360fa146d106cff7f3a057c (patch) | |
| tree | 7b9e4c7fc49849dc9fcf1fd9434bd377cd157800 /geom_matching/wasserstein/include | |
| parent | c563d463ffce73b070b35e62baf980d19d0bc4ac (diff) | |
First trivial test for point cloud version
Diffstat (limited to 'geom_matching/wasserstein/include')
| -rw-r--r-- | geom_matching/wasserstein/include/auction_runner_gs.hpp | 1 | ||||
| -rw-r--r-- | geom_matching/wasserstein/include/auction_runner_jac.hpp | 1 | ||||
| -rw-r--r-- | geom_matching/wasserstein/include/hera_infinity.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/geom_matching/wasserstein/include/auction_runner_gs.hpp b/geom_matching/wasserstein/include/auction_runner_gs.hpp index 960c707..141cb2c 100644 --- a/geom_matching/wasserstein/include/auction_runner_gs.hpp +++ b/geom_matching/wasserstein/include/auction_runner_gs.hpp @@ -287,6 +287,7 @@ void AuctionRunnerGS<R, AO, PC>::run_auction() if (num_bidders == 1) { assign_item_to_bidder(0, 0); wasserstein_cost = get_item_bidder_cost(0,0); + is_distance_computed = true; return; } diff --git a/geom_matching/wasserstein/include/auction_runner_jac.hpp b/geom_matching/wasserstein/include/auction_runner_jac.hpp index c519de1..e623f4a 100644 --- a/geom_matching/wasserstein/include/auction_runner_jac.hpp +++ b/geom_matching/wasserstein/include/auction_runner_jac.hpp @@ -559,6 +559,7 @@ namespace ws { if (num_bidders == 1) { assign_item_to_bidder(0, 0); wasserstein_cost = get_item_bidder_cost(0,0); + is_distance_computed = true; return; } R init_eps = (initial_epsilon > 0.0) ? initial_epsilon : oracle.max_val_ / 4.0; diff --git a/geom_matching/wasserstein/include/hera_infinity.h b/geom_matching/wasserstein/include/hera_infinity.h index 5a446e7..8d86dbb 100644 --- a/geom_matching/wasserstein/include/hera_infinity.h +++ b/geom_matching/wasserstein/include/hera_infinity.h @@ -13,7 +13,7 @@ namespace hera { }; template<class Real = double> - inline Real get_infinity() + inline constexpr Real get_infinity() { return Real(-1); } |