diff options
9 files changed, 61 insertions, 15 deletions
diff --git a/challenge-137/tyler-wardhaugh/clojure/README.md b/challenge-137/tyler-wardhaugh/clojure/README.md index d05825bedb..371f142e4e 100644 --- a/challenge-137/tyler-wardhaugh/clojure/README.md +++ b/challenge-137/tyler-wardhaugh/clojure/README.md @@ -1,7 +1,7 @@ -# tw.weekly.c136 +# tw.weekly.c137 -The Weekly Challenge - #136 - Tyler Wardhaugh +The Weekly Challenge - #137 - 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.c136.core + $ clojure -M -m tw.weekly.c137.core # ... or ... $ bb run both @@ -21,13 +21,13 @@ Run the project's tests (which are samples from the task descriptions): Run Task #1 with input - $ clojure -M -m tw.weekly.c136.t1 M N + $ clojure -M -m tw.weekly.c137.t1 # ... or ... - $ bb run task-1 M N + $ bb run task-1 Run Task #2 with input: - $ clojure -M -m tw.weekly.c136.t2 N + $ clojure -M -m tw.weekly.c137.t2 N # ... or ... $ bb run task-2 N diff --git a/challenge-137/tyler-wardhaugh/clojure/bb.edn b/challenge-137/tyler-wardhaugh/clojure/bb.edn index 2299ced5c9..69331331eb 100644 --- a/challenge-137/tyler-wardhaugh/clojure/bb.edn +++ b/challenge-137/tyler-wardhaugh/clojure/bb.edn @@ -70,9 +70,7 @@ :task (run-task :t2 *command-line-args*)} task-2-bb {:doc "Run Task 2 (via Babashka)" - :task (binding [*out* *err*] - (println "error: can't run Task 2 via Babashka because it depends on some incompatible libraries.") - (System/exit 1))} + :task (run-task-bb :t2 *command-line-args*)} both {:doc "Run both tasks (via clojure)" :task (do diff --git a/challenge-137/tyler-wardhaugh/clojure/deps.edn b/challenge-137/tyler-wardhaugh/clojure/deps.edn index 99b46a9e15..5b1400b27e 100644 --- a/challenge-137/tyler-wardhaugh/clojure/deps.edn +++ b/challenge-137/tyler-wardhaugh/clojure/deps.edn @@ -1,6 +1,5 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.10.3"} - org.clojure/math.combinatorics {:mvn/version "0.1.6"}} + :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-137/tyler-wardhaugh/clojure/pom.xml b/challenge-137/tyler-wardhaugh/clojure/pom.xml index fbbe52d202..03a691f300 100644 --- a/challenge-137/tyler-wardhaugh/clojure/pom.xml +++ b/challenge-137/tyler-wardhaugh/clojure/pom.xml @@ -2,11 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>tw.weekly</groupId> - <artifactId>tw.weekly.c136</artifactId> + <artifactId>tw.weekly.c137</artifactId> <version>0.1.0-SNAPSHOT</version> - <name>tw.weekly.c136</name> - <description>Challenge #136</description> - <url>https://github.com/tw.weekly/tw.weekly.c136</url> + <name>tw.weekly.c137</name> + <description>Challenge #137</description> + <url>https://github.com/tw.weekly/tw.weekly.c137</url> <licenses> <license> <name>Eclipse Public License</name> diff --git a/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/core.clj b/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/core.clj new file mode 100644 index 0000000000..53ca78eb2c --- /dev/null +++ b/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/core.clj @@ -0,0 +1,12 @@ +(ns tw.weekly.c137.core + (:require [tw.weekly.c137.t1 :as t1]) + (:require [tw.weekly.c137.t2 :as t2]) + (:gen-class)) + +(defn -main + "Run all tasks" + [& _] + (println "Task #1:") + (t1/-main) + (println "\nTask #2:") + (t2/-main)) diff --git a/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/t1.clj b/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/t1.clj new file mode 100644 index 0000000000..167c4a8269 --- /dev/null +++ b/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/t1.clj @@ -0,0 +1,12 @@ +(ns tw.weekly.c137.t1 + (:require [clojure.edn :as edn])) + +;;; +; Task description for TASK #1 › Long Year +;;; + + +(defn -main + "Run Task 1 with a given input M and N, defaulting to the first example from + the task description." + [& args]) diff --git a/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/t2.clj b/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/t2.clj new file mode 100644 index 0000000000..8b7cf78fc2 --- /dev/null +++ b/challenge-137/tyler-wardhaugh/clojure/src/tw/weekly/c137/t2.clj @@ -0,0 +1,13 @@ +(ns tw.weekly.c137.t2 + (:require [clojure.edn :as edn])) + +;;; +; Task description for TASK #2 › Lychrel Number +;;; +(def DEFAULT-INPUT [56]) + +(defn -main + "Run Task 2 with a given input N, defaulting to the first example from the + task description." + [& args] + (let [[N] (or (some->> args (map edn/read-string)) DEFAULT-INPUT)])) diff --git a/challenge-137/tyler-wardhaugh/clojure/test/tw/weekly/c137/t1_test.clj b/challenge-137/tyler-wardhaugh/clojure/test/tw/weekly/c137/t1_test.clj new file mode 100644 index 0000000000..ddbab3e1c6 --- /dev/null +++ b/challenge-137/tyler-wardhaugh/clojure/test/tw/weekly/c137/t1_test.clj @@ -0,0 +1,6 @@ +(ns tw.weekly.c137.t1-test + (:require [clojure.test :refer [deftest is testing]] + [tw.weekly.c137.t1 :refer []])) + +(deftest examples + (testing "Examples from description")) diff --git a/challenge-137/tyler-wardhaugh/clojure/test/tw/weekly/c137/t2_test.clj b/challenge-137/tyler-wardhaugh/clojure/test/tw/weekly/c137/t2_test.clj new file mode 100644 index 0000000000..04d601a7d2 --- /dev/null +++ b/challenge-137/tyler-wardhaugh/clojure/test/tw/weekly/c137/t2_test.clj @@ -0,0 +1,6 @@ +(ns tw.weekly.c137.t2-test + (:require [clojure.test :refer [deftest is testing]] + [tw.weekly.c137.t2 :refer []])) + +(deftest examples + (testing "Examples from description")) |