diff --git a/src/com/owoga/prhyme/lymeric.clj b/src/com/owoga/prhyme/lymeric.clj index 1b2ab2a..8717781 100644 --- a/src/com/owoga/prhyme/lymeric.clj +++ b/src/com/owoga/prhyme/lymeric.clj @@ -1,10 +1,8 @@ (ns com.owoga.prhyme.lymeric (:require [com.owoga.prhyme.gen :as gen] - [com.owoga.prhyme.util :as util] [com.owoga.prhyme.generation.weighted-selection :as weighted-selection] [clojure.string :as string] [com.owoga.prhyme.frp :as frp] - [com.owoga.prhyme.util.nlp :as nlp] [com.owoga.corpus.darklyrics :as darklyrics])) @@ -30,7 +28,7 @@ darklyrics/darkov-2 0.99) (when (rhymes pattern) - (weighted-selection/adjust-for-rhymes 0.99))])) + (weighted-selection/adjust-for-tail-rhyme 0.99))])) rhyme (if (nil? (get rhymes pattern)) (gen/gen-sentence-with-syllable-count adj diff --git a/src/com/owoga/prhyme/util/nlp.clj b/src/com/owoga/prhyme/util/nlp.clj index f163e9b..5d93ce3 100644 --- a/src/com/owoga/prhyme/util/nlp.clj +++ b/src/com/owoga/prhyme/util/nlp.clj @@ -1,11 +1,12 @@ (ns com.owoga.prhyme.util.nlp (:require [opennlp.nlp :as nlp] [opennlp.treebank :as tb] - [clojure.string :as string])) + [clojure.string :as string] + [clojure.java.io :as io])) -(def tokenize (nlp/make-tokenizer "models/en-token.bin")) -(def get-sentences (nlp/make-sentence-detector "models/en-sent.bin")) -(def parse (tb/make-treebank-parser "en-parser-chunking.bin")) +(def tokenize (nlp/make-tokenizer (io/resource "models/en-token.bin"))) +(def get-sentences (nlp/make-sentence-detector (io/resource "models/en-sent.bin"))) +(def parse (tb/make-treebank-parser (io/resource "models/en-parser-chunking.bin"))) (defn valid-sentence? "Tokenizes and parses the phrase using OpenNLP models from