changed the word predicates to be one of the predicates in the vectors rather than a separate check

src/poalses/jonathan/dialect/dialect_nlp.clj

@@ -53,32 +53,29 @@
 
 (def american-words #{"like"})
 
+(def australian-word-predicate #(some australian-words (dl/text (dl/tokens %))))
+(def scottish-word-predicate #(some scottish-words (dl/text (dl/tokens %))))
+(def american-word-predicate #(some american-words (dl/text (dl/tokens %))))
+
 (defn fake-test
   [fake]
   false)
 
 ;; Predicate vectors to check a sentence and see if it grammatically matches a dialect
 
-(def australian-predicates [fake-test])
+(def australian-predicates [fake-test australian-word-predicate])
 
-(def scottish-predicates [fake-test])
+(def scottish-predicates [fake-test scottish-word-predicate])
 
-(def american-predicates [fake-test])
+(def american-predicates [fake-test american-word-predicate])
 
 
 ;; Take a sentence and figure out its dialect
 
 (defn detect-sentence-dialect [sentence]
-  (let [token-text (dl/text (dl/tokens sentence))
-        dialects1  (if (some australian-words token-text)
-                     :australian
-                     (when ((apply some-fn australian-predicates) sentence) :australian))
-        dialects2  (if (some scottish-words token-text)
-                     :scottish
-                     (when ((apply some-fn scottish-predicates) sentence) :scottish))
-        dialects3  (if (some american-words token-text)
-                     :american
-                     (when ((apply some-fn american-predicates) sentence) :american))
+  (let [dialects1  (when ((apply some-fn australian-predicates) sentence) :australian)
+        dialects2  (when ((apply some-fn scottish-predicates) sentence) :scottish)
+        dialects3  (when ((apply some-fn american-predicates) sentence) :american)
         dialects   (remove nil? [dialects1 dialects2 dialects3])]
     (if (empty? dialects)
       [:standard]