From cf32aa105ed851f244dea97c38e61610b73da3ab Mon Sep 17 00:00:00 2001 From: Joni Toivonen Date: Tue, 5 Sep 2017 19:25:59 +0300 Subject: [PATCH 1/2] Fix code so that tests pass --- src/predicates.clj | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/predicates.clj b/src/predicates.clj index 158b1ea..93f56ae 100644 --- a/src/predicates.clj +++ b/src/predicates.clj @@ -1,41 +1,45 @@ (ns predicates) (defn sum-f [f g x] - :-) + (+ (f x) (g x))) (defn less-than [n] - :-) + (fn [k] (< k n))) (defn equal-to [n] - :-) + (fn [k] (== k n))) (defn set->predicate [a-set] - :-) + (fn [x] (contains? a-set x))) (defn pred-and [pred1 pred2] - :-) + (fn [x] (and (pred1 x) + (pred2 x)))) (defn pred-or [pred1 pred2] - :-) + (fn [x] (or (pred1 x) + (pred2 x)))) (defn whitespace? [character] (Character/isWhitespace character)) (defn blank? [string] - :-) + (every? whitespace? string)) (defn has-award? [book award] - :-) + (contains? (:awards book) award)) (defn HAS-ALL-THE-AWARDS? [book awards] - :-) + (every? (:awards book) awards)) (defn my-some [pred a-seq] - :-) + (first (filter boolean (map pred a-seq)))) (defn my-every? [pred a-seq] - :-) + (== (count (filter pred a-seq)) + (count a-seq))) (defn prime? [n] - :-) + (let [pred (fn [x] (== 0 (mod n x)))] + (not (some pred (range 2 n))))) ;^^ From 4cd38a3594db37b416c5de38271340d616d5c0b7 Mon Sep 17 00:00:00 2001 From: Joni Toivonen Date: Tue, 17 Oct 2017 18:33:36 +0300 Subject: [PATCH 2/2] Fix lein version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 455f3c0..45c29f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: clojure -lein: lein2 -script: lein2 midje :config .midje-grading-config.clj +lein: lein +script: lein midje :config .midje-grading-config.clj jdk: - openjdk7 notifications: