diff options
author | Arnur Nigmetov <a.nigmetov@gmail.com> | 2017-04-04 14:20:16 +0200 |
---|---|---|
committer | Arnur Nigmetov <a.nigmetov@gmail.com> | 2017-04-04 14:20:16 +0200 |
commit | 1607071fcd9d473eae295693fc97bee8c50d6a11 (patch) | |
tree | 3cfb964a926b7c839c9b00cc2abdc963ee822b88 /geom_matching/wasserstein/src/auction_runner_gs.cpp | |
parent | 2b48644a5a7d0549cc1d8e5f5cd05da984bc0669 (diff) |
Prepare to output real relative error.
In Wasserstein distance computation AuctionRunner class now has a field
relativeError which contains the relative error which we can guarantee,
so if the user asked for 0.1 accuracy, but the result is 0.03 accurate,
this information can be retrieved.
Diffstat (limited to 'geom_matching/wasserstein/src/auction_runner_gs.cpp')
-rw-r--r-- | geom_matching/wasserstein/src/auction_runner_gs.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/geom_matching/wasserstein/src/auction_runner_gs.cpp b/geom_matching/wasserstein/src/auction_runner_gs.cpp index bd25442..5865325 100644 --- a/geom_matching/wasserstein/src/auction_runner_gs.cpp +++ b/geom_matching/wasserstein/src/auction_runner_gs.cpp @@ -122,6 +122,7 @@ void AuctionRunnerGS::flushAssignment(void) void AuctionRunnerGS::runAuction(void) { + relativeError = std::numeric_limits<double>::max(); #ifdef PRINT_DETAILED_TIMING std::chrono::high_resolution_clock hrClock; std::chrono::time_point<std::chrono::high_resolution_clock> startMoment; @@ -169,6 +170,7 @@ void AuctionRunnerGS::runAuction(void) std::cout << "; error bound: " << numerator / denominator << std::endl; #endif #endif + relativeError = numerator / denominator; // if relative error is greater than delta, continue notDone = ( numerator / denominator > delta ); } @@ -243,6 +245,7 @@ double AuctionRunnerGS::getDistanceToQthPowerInternal(void) auto pA = bidders[bIdx]; assert( 0 <= biddersToItems[bIdx] and biddersToItems[bIdx] < static_cast<int>(items.size()) ); auto pB = items[biddersToItems[bIdx]]; + std::cout << "pA = " << pA << ", pB = " << pB << ", pow(distLp(pA, pB, internal_p), wassersteinPower) = " << pow(distLp(pA, pB, internal_p), wassersteinPower) << ", dist = " << distLp(pA, pB, internal_p) << std::endl; result += pow(distLp(pA, pB, internal_p), wassersteinPower); } wassersteinCost = result; |