diff options
author | Arnur Nigmetov <a.nigmetov@gmail.com> | 2018-05-19 20:33:33 +0200 |
---|---|---|
committer | Arnur Nigmetov <a.nigmetov@gmail.com> | 2018-05-19 20:33:33 +0200 |
commit | 9693f140d91e751aabe46b76b89c332c7f307e17 (patch) | |
tree | 0fc707a72eabe7496e79de4ddd46e9c945e16bf3 /geom_matching/wasserstein/include/wasserstein.h | |
parent | 75cf0745e95a37c8d65e7a283a11cd500ab6edc2 (diff) |
Add inline qualifier to Wasserstein code.
To avoid linking problems.
Diffstat (limited to 'geom_matching/wasserstein/include/wasserstein.h')
-rw-r--r-- | geom_matching/wasserstein/include/wasserstein.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/geom_matching/wasserstein/include/wasserstein.h b/geom_matching/wasserstein/include/wasserstein.h index b90a545..2d0cffc 100644 --- a/geom_matching/wasserstein/include/wasserstein.h +++ b/geom_matching/wasserstein/include/wasserstein.h @@ -73,7 +73,7 @@ namespace ws // compare as multisets template<class PairContainer> - bool are_equal(const PairContainer& dgm1, const PairContainer& dgm2) + inline bool are_equal(const PairContainer& dgm1, const PairContainer& dgm2) { if (dgm1.size() != dgm2.size()) { return false; @@ -97,7 +97,7 @@ namespace ws // to handle points with one coordinate = infinity template<class RealType> - RealType get_one_dimensional_cost(std::vector<RealType>& set_A, + inline RealType get_one_dimensional_cost(std::vector<RealType>& set_A, std::vector<RealType>& set_B, const RealType wasserstein_power) { @@ -210,7 +210,7 @@ namespace ws // this function assumes that all coordinates are finite // points at infinity are processed in wasserstein_cost template<class RealType> - RealType wasserstein_cost_vec(const std::vector<DiagramPoint<RealType>>& A, + inline RealType wasserstein_cost_vec(const std::vector<DiagramPoint<RealType>>& A, const std::vector<DiagramPoint<RealType>>& B, const AuctionParams<RealType>& params, const std::string& _log_filename_prefix) @@ -245,7 +245,7 @@ namespace ws template<class PairContainer> -typename DiagramTraits<PairContainer>::RealType +inline typename DiagramTraits<PairContainer>::RealType wasserstein_cost(const PairContainer& A, const PairContainer& B, const AuctionParams< typename DiagramTraits<PairContainer>::RealType >& params, @@ -332,7 +332,7 @@ wasserstein_cost(const PairContainer& A, } template<class PairContainer> -typename DiagramTraits<PairContainer>::RealType +inline typename DiagramTraits<PairContainer>::RealType wasserstein_dist(PairContainer& A, PairContainer& B, const AuctionParams<typename DiagramTraits<PairContainer>::RealType> params, |