From a608b6e2c1d3220cdc902298c23622ca900287b8 Mon Sep 17 00:00:00 2001 From: Tyler Wardhaugh Date: Thu, 25 Nov 2021 11:54:48 -0800 Subject: Ch140 (Clojure): prep for challenge --- challenge-140/tyler-wardhaugh/clojure/README.md | 14 +++++++------- challenge-140/tyler-wardhaugh/clojure/bb.edn | 2 +- challenge-140/tyler-wardhaugh/clojure/deps.edn | 3 +-- challenge-140/tyler-wardhaugh/clojure/pom.xml | 8 ++++---- .../tyler-wardhaugh/clojure/src/tw/weekly/c140/core.clj | 12 ++++++++++++ .../tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj | 13 +++++++++++++ .../tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj | 14 ++++++++++++++ .../clojure/test/tw/weekly/c140/t1_test.clj | 7 +++++++ .../clojure/test/tw/weekly/c140/t2_test.clj | 7 +++++++ 9 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/core.clj create mode 100644 challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj create mode 100644 challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj create mode 100644 challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj create mode 100644 challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj diff --git a/challenge-140/tyler-wardhaugh/clojure/README.md b/challenge-140/tyler-wardhaugh/clojure/README.md index 17ac43fedd..213f1884bc 100644 --- a/challenge-140/tyler-wardhaugh/clojure/README.md +++ b/challenge-140/tyler-wardhaugh/clojure/README.md @@ -1,7 +1,7 @@ -# tw.weekly.c139 +# tw.weekly.c140 -The Weekly Challenge - #139 - Tyler Wardhaugh +The Weekly Challenge - #140 - Tyler Wardhaugh ## Usage @@ -9,7 +9,7 @@ Clojure ([installation instructions](https://clojure.org/guides/getting_started# Run the project directly (shows default output from both tasks): - $ clojure -M -m tw.weekly.c139.core + $ clojure -M -m tw.weekly.c140.core # ... or ... $ bb run both @@ -21,15 +21,15 @@ Run the project's tests (which are samples from the task descriptions): Run Task #1 with input - $ clojure -M -m tw.weekly.c139.t1 COLL + $ clojure -M -m tw.weekly.c140.t1 A B # ... or ... - $ bb run task-1 COLL + $ bb run task-1 A B Run Task #2 with input: - $ clojure -M -m tw.weekly.c139.t2 + $ clojure -M -m tw.weekly.c140.t2 I J K # ... or ... - $ bb run task-2 + $ bb run task-2 I J K View available tasks Babashka can run: diff --git a/challenge-140/tyler-wardhaugh/clojure/bb.edn b/challenge-140/tyler-wardhaugh/clojure/bb.edn index ec79e59292..e053ec5de1 100644 --- a/challenge-140/tyler-wardhaugh/clojure/bb.edn +++ b/challenge-140/tyler-wardhaugh/clojure/bb.edn @@ -82,7 +82,7 @@ :task (run-task :t2 *command-line-args*)} task-2-bb {:doc "Run Task 2 (via Babashka)" - :task (bb-no-go :t2 *command-line-args*)} + :task (run-task-bb :t2 *command-line-args*)} both {:doc "Run both tasks (via clojure)" :task (do diff --git a/challenge-140/tyler-wardhaugh/clojure/deps.edn b/challenge-140/tyler-wardhaugh/clojure/deps.edn index 3386938e59..5b1400b27e 100644 --- a/challenge-140/tyler-wardhaugh/clojure/deps.edn +++ b/challenge-140/tyler-wardhaugh/clojure/deps.edn @@ -1,6 +1,5 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.10.3"} - com.hypirion/primes {:mvn/version "0.2.2"}} + :deps {org.clojure/clojure {:mvn/version "1.10.3"}} :aliases {:test {:extra-paths ["test"] :extra-deps {org.clojure/test.check {:mvn/version "1.1.0"} diff --git a/challenge-140/tyler-wardhaugh/clojure/pom.xml b/challenge-140/tyler-wardhaugh/clojure/pom.xml index 66472e6504..e51de32ab2 100644 --- a/challenge-140/tyler-wardhaugh/clojure/pom.xml +++ b/challenge-140/tyler-wardhaugh/clojure/pom.xml @@ -2,11 +2,11 @@ 4.0.0 tw.weekly - tw.weekly.c139 + tw.weekly.c140 0.1.0-SNAPSHOT - tw.weekly.c139 - Challenge #139 - https://github.com/tw.weekly/tw.weekly.c139 + tw.weekly.c140 + Challenge #140 + https://github.com/tw.weekly/tw.weekly.c140 Eclipse Public License diff --git a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/core.clj b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/core.clj new file mode 100644 index 0000000000..7ac37537e6 --- /dev/null +++ b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/core.clj @@ -0,0 +1,12 @@ +(ns tw.weekly.c140.core + (:require [tw.weekly.c140.t1 :as t1]) + (:require [tw.weekly.c140.t2 :as t2]) + (:gen-class)) + +(defn -main + "Run all tasks" + [& _] + (println "Task #1:") + (t1/-main) + (println "\nTask #2:") + (t2/-main)) diff --git a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj new file mode 100644 index 0000000000..7a33bbec1a --- /dev/null +++ b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj @@ -0,0 +1,13 @@ +(ns tw.weekly.c140.t1) + +;;; +; Task description for TASK #1 › Add Binary +;;; +(def DEFAULT-INPUT [11 1]) + +(defn -main + "Run Task 1 with a given input A B, defaulting to the first example from the + task description." + [& args] + (let [[A B] (or args DEFAULT-INPUT)] + )) diff --git a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj new file mode 100644 index 0000000000..d7507b7942 --- /dev/null +++ b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj @@ -0,0 +1,14 @@ +(ns tw.weekly.c140.t2 + (:require [clojure.edn :as edn])) + +;;; +; Task description for TASK #2 › Multiplication Table +;;; +(def DEFAULT-INPUT [2 3 4]) + +(defn -main + "Run Task 2 with a given input I J K, defaulting to the first example from + the task description." + [& args] + (let [[I J K] (or (some->> args (map edn/read-string)) DEFAULT-INPUT)] + )) diff --git a/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj new file mode 100644 index 0000000000..037e36191e --- /dev/null +++ b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj @@ -0,0 +1,7 @@ +(ns tw.weekly.c140.t1-test + (:require [clojure.test :refer [deftest is testing]] + [tw.weekly.c140.t1 :refer []])) + +(deftest examples + (testing "Examples from description" + )) diff --git a/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj new file mode 100644 index 0000000000..4e3fa291dc --- /dev/null +++ b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj @@ -0,0 +1,7 @@ +(ns tw.weekly.c140.t2-test + (:require [clojure.test :refer [deftest is testing]] + [tw.weekly.c140.t2 :refer []])) + +(deftest examples + (testing "Examples from description" + )) -- cgit From 5a37dbd484586b60ad2509e98e7282eb439cd58c Mon Sep 17 00:00:00 2001 From: Tyler Wardhaugh Date: Thu, 25 Nov 2021 12:06:43 -0800 Subject: Ch140 (Clojure): Task 1 --- .../tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj | 18 ++++++++++++++++-- .../clojure/test/tw/weekly/c140/t1_test.clj | 6 ++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj index 7a33bbec1a..8de084f8c1 100644 --- a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj +++ b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t1.clj @@ -3,11 +3,25 @@ ;;; ; Task description for TASK #1 › Add Binary ;;; -(def DEFAULT-INPUT [11 1]) +(def DEFAULT-INPUT ["11" "1"]) + +(defn binstr->num + [s] + (Long/parseLong s 2)) + +(defn num->binstr + [n] + (Long/toString n 2)) + +(defn add-binary + [& binstrs] + (->> binstrs + (transduce (map binstr->num) +) + num->binstr)) (defn -main "Run Task 1 with a given input A B, defaulting to the first example from the task description." [& args] (let [[A B] (or args DEFAULT-INPUT)] - )) + (println (add-binary A B)))) diff --git a/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj index 037e36191e..93d9b2b9de 100644 --- a/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj +++ b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t1_test.clj @@ -1,7 +1,9 @@ (ns tw.weekly.c140.t1-test (:require [clojure.test :refer [deftest is testing]] - [tw.weekly.c140.t1 :refer []])) + [tw.weekly.c140.t1 :refer [add-binary]])) (deftest examples (testing "Examples from description" - )) + (is (= "100" (add-binary "11" "1"))) + (is (= "110" (add-binary "101" "1"))) + (is (= "111" (add-binary "100" "11"))))) -- cgit From 47c7c038c04618222b67439d9bbe7e482ef3b3f2 Mon Sep 17 00:00:00 2001 From: Tyler Wardhaugh Date: Thu, 25 Nov 2021 12:20:21 -0800 Subject: Ch140 (Clojure): Task 2 --- .../tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj | 10 +++++++++- .../tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj index d7507b7942..940fe5d069 100644 --- a/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj +++ b/challenge-140/tyler-wardhaugh/clojure/src/tw/weekly/c140/t2.clj @@ -6,9 +6,17 @@ ;;; (def DEFAULT-INPUT [2 3 4]) +(defn get-kth-in-multi + [i j k] + (-> (for [i (range 1 (inc i)) + j (range 1 (inc j))] + (* i j)) + sort + (nth (dec k)))) + (defn -main "Run Task 2 with a given input I J K, defaulting to the first example from the task description." [& args] (let [[I J K] (or (some->> args (map edn/read-string)) DEFAULT-INPUT)] - )) + (println (get-kth-in-multi I J K)))) diff --git a/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj index 4e3fa291dc..2f41471ce8 100644 --- a/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj +++ b/challenge-140/tyler-wardhaugh/clojure/test/tw/weekly/c140/t2_test.clj @@ -1,7 +1,8 @@ (ns tw.weekly.c140.t2-test (:require [clojure.test :refer [deftest is testing]] - [tw.weekly.c140.t2 :refer []])) + [tw.weekly.c140.t2 :refer [get-kth-in-multi]])) (deftest examples (testing "Examples from description" - )) + (is (= 3 (get-kth-in-multi 2 3 4))) + (is (= 4 (get-kth-in-multi 3 3 6))))) -- cgit