diff --git a/README.md b/README.md index fb545995b..56e3e6b16 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,7 @@ have any questions or want more direction before you start pitching in. - Alex Robbins - Jaskirat Singh Veen - Mark Simpson +- Mike Jansen ### Credits diff --git a/ideaboard.txt b/ideaboard.txt index 182f3097e..57775b663 100644 --- a/ideaboard.txt +++ b/ideaboard.txt @@ -19,7 +19,6 @@ Pre and Post conditions of functions Particular Functions ===== vector-of -case flatten frequencies group-by diff --git a/src/koans/conditionals.clj b/src/koans/conditionals.clj index be71a3da5..9d76c192e 100644 --- a/src/koans/conditionals.clj +++ b/src/koans/conditionals.clj @@ -1,3 +1,12 @@ +(defn explain-defcon-level [exercise-term] + (case exercise-term + :fade-out :you-and-what-army + :double-take :call-me-when-its-important + :round-house :o-rly + :fast-pace :thats-pretty-bad + :cocked-pistol :sirens + :say-what?)) + (meditations "You will face many decisions" (= __ (if (false? (= 4 5)) @@ -8,7 +17,7 @@ (= __ (if (> 4 3) [])) - "And in such a case you may have nothing" + "And in such a situation you may have nothing" (= nil (if (nil? __) [:a :b :c])) @@ -26,5 +35,13 @@ "Or your fate may be sealed" (= __ (if-not (zero? __) 'doom - 'doom))) + 'doom)) + + "In case of emergency, sound the alarms" + (= :sirens + (explain-defcon-level __)) + + "But admit it when you don't know what to do" + (= __ + (explain-defcon-level :yo-mama))) diff --git a/src/path_to_answer_sheet.clj b/src/path_to_answer_sheet.clj index eabee6687..e9d56a4d5 100644 --- a/src/path_to_answer_sheet.clj +++ b/src/path_to_answer_sheet.clj @@ -70,7 +70,9 @@ 0 :glory 4 6 :your_road - ''doom 0 ]} + ''doom 0 + :cocked-pistol + :say-what?]} "higher_order_functions" {"__" [4 8 12 '(* x x)