diff options
-rw-r--r-- | README.txt | 22 | ||||
-rw-r--r-- | wasserstein/include/auction_oracle_kdtree_restricted.hpp | 2 | ||||
-rw-r--r-- | wasserstein/include/dnn/parallel/tbb.h | 2 |
3 files changed, 20 insertions, 6 deletions
@@ -1,8 +1,5 @@ This repository contains software to compute bottleneck and Wasserstein distances between persistence diagrams. -See Michael Kerber, Dmitriy Morozov, and Arnur Nigmetov, -"Geometry Helps to Compare Persistence Diagrams.", ALENEX 2016. -http://dx.doi.org/10.1137/1.9781611974317.9 The software is licensed under BSD license, see license.txt file. @@ -10,3 +7,22 @@ If you are going to use this software for research purposes, you probably do not need to worry about that. See README files in subdirectories for usage and building. + +If you use Hera in your project, we would appreciate if you +cite the corresponding paper: +Michael Kerber, Dmitriy Morozov, and Arnur Nigmetov, +"Geometry Helps to Compare Persistence Diagrams.", +Journal of Experimental Algorithmics, vol. 22, 2017, pp. 1--20. +(conference version: ALENEX 2016). +The BibTeX is below: + + +@article{jea_hera, + title={Geometry helps to compare persistence diagrams}, + author={Kerber, Michael and Morozov, Dmitriy and Nigmetov, Arnur}, + journal={Journal of Experimental Algorithmics (JEA)}, + volume={22}, + pages={1--20}, + year={2017}, + publisher={ACM New York, NY, USA} +} diff --git a/wasserstein/include/auction_oracle_kdtree_restricted.hpp b/wasserstein/include/auction_oracle_kdtree_restricted.hpp index 3c3cba3..8613ee1 100644 --- a/wasserstein/include/auction_oracle_kdtree_restricted.hpp +++ b/wasserstein/include/auction_oracle_kdtree_restricted.hpp @@ -293,7 +293,7 @@ IdxValPair<Real_> AuctionOracleKDTreeRestricted<Real_, PointContainer_>::get_opt // and vice versa. size_t best_item_idx { k_invalid_index }; - size_t second_best_item_idx __attribute__((unused)) { k_invalid_index }; + size_t second_best_item_idx { k_invalid_index }; size_t best_diagonal_item_idx { k_invalid_index }; Real best_item_value; Real second_best_item_value; diff --git a/wasserstein/include/dnn/parallel/tbb.h b/wasserstein/include/dnn/parallel/tbb.h index 3f811d6..712f812 100644 --- a/wasserstein/include/dnn/parallel/tbb.h +++ b/wasserstein/include/dnn/parallel/tbb.h @@ -135,7 +135,6 @@ namespace boost #include <algorithm> #include <map> -#include <boost/progress.hpp> namespace hera { @@ -215,7 +214,6 @@ namespace dnn typedef type range; }; - using boost::progress_timer; } // dnn } // ws } // hera |