summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnur Nigmetov <nigmetov@tugraz.at>2020-02-18 15:35:02 +0100
committerArnur Nigmetov <nigmetov@tugraz.at>2020-02-18 15:35:02 +0100
commit4c3eca516693a333facbb6c6a952da735e902846 (patch)
tree35aca43764656809ddc1f4dfdc7bd5446da48dc0
parentee65fce990b1dc683e1220c18c5f404a82373e55 (diff)
README and boost/progress changes from master.
-rw-r--r--README.txt22
-rw-r--r--wasserstein/include/dnn/parallel/tbb.h2
2 files changed, 19 insertions, 5 deletions
diff --git a/README.txt b/README.txt
index 4a132fd..ae3f6a0 100644
--- a/README.txt
+++ b/README.txt
@@ -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/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