Update trinary

- Restructure per #84 and #88 - Be explicit in :require from of trinary_test.clj - Use single-pass loop/recur implementation
exercism · Dec 29, 2015 · 4c51343 · 4c51343
1 parent 9681aed
commit 4c51343
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/trinary/example.clj b/trinary/example.clj
diff --git a/trinary/project.clj b/trinary/project.clj
@@ -1,6 +1,4 @@
 (defproject trinary "0.1.0-SNAPSHOT"
   :description "trinary exercise."
   :url "https://github.com/exercism/xclojure/tree/master/trinary"
-  :source-paths [""]
-  :test-paths [""]
   :dependencies [[org.clojure/clojure "1.7.0"]])
diff --git a/trinary/src/example.clj b/trinary/src/example.clj
@@ -0,0 +1,10 @@
+(ns trinary)
+
+(defn to-decimal [num]
+  (loop [sum 0, num num]
+    (if (empty? num)
+      sum
+      (let [diff (.compareTo (first num) \0)]
+        (if (<= 0 diff 2)
+          (recur (+ (* sum 3) diff) (next num))
+          0)))))
diff --git a/trinary/trinary_test.clj → trinary/test/trinary_test.clj b/trinary/trinary_test.clj → trinary/test/trinary_test.clj
@@ -1,6 +1,6 @@
 (ns trinary-test
-  (:require [clojure.test :refer :all]
-            [trinary :refer :all]))
+  (:require [clojure.test :refer [deftest is testing]]
+            [trinary :refer [to-decimal]]))
 
 (deftest trinary-1-is-decimal-1
   (testing "1 should still be 1"
@@ -40,4 +40,4 @@
 
 (deftest invalid-input-with-digits-is-decimal-0
   (testing "0a1b2c should be 0"
-    (is (= 0 (to-decimal "0a1b2c")))))
+    (is (= 0 (to-decimal "0a1b2c")))))