Merge pull request #12 from eigenhombre/use-alternate-metrics

Use alternate metrics
abscondment · Oct 24, 2015 · 84e16c9 · 84e16c9
2 parents d749c5a + f4283ea
commit 84e16c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ Meta: {:value Hello}
 
 ## License
 
-Copyright (C) 2009-2013 Brendan Ribera [and contributors](https://github.com/abscondment/clj-kdtree/graphs/contributors). All rights reserved.
+Copyright (C) 2009-2015 Brendan Ribera [and contributors](https://github.com/abscondment/clj-kdtree/graphs/contributors). All rights reserved.
 
 Distributed under the MIT License; see the file LICENSE at the root of
 this distribution.
diff --git a/project.clj b/project.clj
@@ -1,11 +1,11 @@
-(defproject clj-kdtree "1.2.0"
+(defproject clj-kdtree "1.2.1-SNAPSHOT"
   :description "kd-trees for Clojure"
   :url "https://github.com/abscondment/clj-kdtree"
   :license {:name "The MIT License"
             :url "http://opensource.org/licenses/MIT"
             :distribution :repo}
-  :dependencies [[org.clojure/clojure "1.6.0"]]
-  :profiles {:dev {:dependencies [[criterium "0.4.1"]
+  :dependencies [[org.clojure/clojure "1.7.0"]]
+  :profiles {:dev {:dependencies [[criterium "0.4.3"]
                                   [net.sf/javaml "0.1.7"]]
                    :repositories [["javaml" {:url "http://corp.array.ca/nest-web/mavenrepo/"
                                              :checksum :warn}]]}}

diff --git a/src/kdtree.clj b/src/kdtree.clj
@@ -7,8 +7,9 @@
 (defrecord Result [point ^double dist-squared])
 
 
-(defn- dist-squared [^doubles a ^doubles b]
+(defn- dist-squared
   "Compute the K-dimensional distance between two points"
+  [^doubles a ^doubles b]
   (loop [res (double 0.0)
          ind (long 0)]
     (if (== ind (alength a))