From c029e28b3414316593da00c9ed2c3401f5a52de9 Mon Sep 17 00:00:00 2001 From: Hristo Popov Date: Wed, 11 Oct 2017 22:27:15 +0300 Subject: [PATCH] Predicates day --- .travis.yml | 4 ++-- src/predicates.clj | 29 +++++++++++++++++------------ 2 files changed, 19 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..00f4c61 100644 --- a/src/predicates.clj +++ b/src/predicates.clj @@ -1,41 +1,46 @@ (ns predicates) (defn sum-f [f g x] - :-) + (+ (f x) (g x))) + +(defn greater-than [n] + (fn [k] (> k n))) (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? (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] - :-) + (= (count (filter pred a-seq)) (count a-seq))) (defn prime? [n] - :-) + (let [divides? (fn [x] (= 0 (mod n x)))] + (not (some divides? (range 2 n))))) + ;^^