From e8eda690577b10342cf86720f82e3d589210075d Mon Sep 17 00:00:00 2001 From: jope25 Date: Fri, 6 Oct 2017 13:43:35 +0300 Subject: [PATCH 1/2] done --- .travis.yml | 4 ++-- src/predicates.clj | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 14 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: diff --git a/src/predicates.clj b/src/predicates.clj index 158b1ea..02b15d7 100644 --- a/src/predicates.clj +++ b/src/predicates.clj @@ -1,41 +1,42 @@ (ns predicates) (defn sum-f [f g x] - :-) + (+ (f x) (g x))) (defn less-than [n] - :-) + (fn [x] (< x n))) (defn equal-to [n] - :-) + (fn [x] (== x 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] - :-) + (or (empty? string) (every? whitespace? string))) (defn has-award? [book award] - :-) + (contains? (book :awards) award)) (defn HAS-ALL-THE-AWARDS? [book awards] - :-) + (every? (fn [award] (has-award? book award)) awards)) (defn my-some [pred a-seq] - :-) + (first (filter boolean (map pred a-seq)))) (defn my-every? [pred a-seq] - :-) + (empty? (filter (complement boolean) (map pred a-seq)))) (defn prime? [n] - :-) + (let [pred (fn [x] (== 0 (mod n x)))] + (not (some pred (range 2 n))))) ;^^ From 5c6ca4e037a63a18e9c21339eb026b2fa6faaecb Mon Sep 17 00:00:00 2001 From: jope25 Date: Wed, 25 Oct 2017 18:42:05 +0300 Subject: [PATCH 2/2] fixed indentation --- src/predicates.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/predicates.clj b/src/predicates.clj index 02b15d7..1d35a46 100644 --- a/src/predicates.clj +++ b/src/predicates.clj @@ -39,4 +39,3 @@ (defn prime? [n] (let [pred (fn [x] (== 0 (mod n x)))] (not (some pred (range 2 n))))) -;^^