Fixed issue #3 - bug introduced in 0.0.3 handling related synsets

rm-hull · Oct 19, 2013 · 3e85e19 · 3e85e19
1 parent daf6d28
commit 3e85e19
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,3 +17,7 @@ Changelog
 -----------------------
 * Fixed reflection warnings
 * Nil and empty/trimmed string short circuiting
+
+0.0.5 (Sat Oct 19 2013)
+-----------------------
+* Fixed issue #3 - bug introduced in 0.0.3 handling related synsets
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ There is an initial version hosted at [Clojars](https://clojars.org/clj-wordnet/
 For leiningen include a dependency:
 
 ```clojure
-[clj-wordnet "0.0.4"]
+[clj-wordnet "0.0.5"]
 ```
 
 For maven-based projects, add the following to your `pom.xml`:
@@ -31,7 +31,7 @@ For maven-based projects, add the following to your `pom.xml`:
 <dependency>
   <groupId>clj-wordnet</groupId>
   <artifactId>clj-wordnet</artifactId>
-  <version>0.0.4</version>
+  <version>0.0.5</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ separately from [here](http://wordnet.princeton.edu/wordnet/download/current-ver
 
 (def frump (first (wordnet "frump" :noun)))
 
-(map :lemma (related-words frump :derivationally-related))) 
+(map :lemma (related-words frump :derivationally-related))
 => ("frumpy")
 
 (map :lemma (flatten (vals (related-synsets dog :hypernym))))

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject clj-wordnet "0.0.4"
+(defproject clj-wordnet "0.0.5"
   :description "A WordNet/JWI wrapper library"
   :url "https://github.com/delver/clj-wordnet"
   :license {:name "Creative Commons 3.0"

diff --git a/src/clj_wordnet/core.clj b/src/clj_wordnet/core.clj
@@ -64,8 +64,7 @@
         ^IWord word (:word m)]
     (apply merge-with concat
       (for [synset-id (.getRelatedSynsets (.getSynset word) (coerce/pointer pointer))
-            ^ISynset synset (locking coarse-lock (.getSynset dict synset-id))
-            word      (.getWords synset) ]
+            word      (.getWords (locking coarse-lock (.getSynset dict synset-id)))]
         { synset-id [(from-java dict word)] }))))
 
 (defn related-words

diff --git a/test/clj_wordnet/test/client.clj b/test/clj_wordnet/test/client.clj
@@ -19,4 +19,8 @@
 (deftest fetch-nil-word
   (is (empty? (wordnet nil))))
 
+(deftest relational-synset-test
+  (let [dog (first (wordnet "dog" :noun))]
+    (is (= '("domestic_animal" "domesticated_animal" "canine" "canid")
+           (map :lemma (flatten (vals (related-synsets dog :hypernym))))))))