summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnur Nigmetov <a.nigmetov@gmail.com>2016-06-16 14:55:41 +0200
committerArnur Nigmetov <a.nigmetov@gmail.com>2016-06-16 14:55:41 +0200
commit5226e1038a0f621c45f98e178e5a9f4073ccc7b1 (patch)
tree284f516e6a0f89d86a54874150eacfe3726b37d3
parent4c496f8f2f8de667e6f2f8b321c6b49f6fd7907b (diff)
parentacb6079989a92bc700c78b35673e32ca74121552 (diff)
Merge branch 'master' of bitbucket.org:grey_narn/hera
-rw-r--r--README.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/README.txt b/README.txt
index 8ff6b7e..2f11858 100644
--- a/README.txt
+++ b/README.txt
@@ -4,8 +4,10 @@ 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
-Unfortunately, the license for the two parts is different. The bottleneck
-part is licensed under LGPL (because it uses ANN library), the Wasserstein
-part is licensed under less restrictive license. If you are going to use
-this software for research purposes, you probably do not need to worry about
-that. \ No newline at end of file
+The two parts of the library come with different licenses. The bottleneck
+part (geom_bottleneck/) is licensed under LGPL (because it uses ANN library),
+the Wasserstein part (in geom_matching/) is licensed under a less restrictive
+BSD license. 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. \ No newline at end of file