Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #969

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #969

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
28 changes: 16 additions & 12 deletions src/predicates.clj
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
(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]
:-)
(every? whitespace? string))

(defn has-award? [book award]
:-)
(contains? (:awards book) award))

(defn HAS-ALL-THE-AWARDS? [book awards]
:-)
(let [book-has-award? (fn [award] (has-award? book award))]
(every? book-has-award? awards)))

(defn my-some [pred a-seq]
:-)
(first (filter identity (map pred a-seq))))

(defn my-every? [pred a-seq]
:-)
(=
(count a-seq)
(count (filter true? (map pred a-seq)))))

(defn prime? [n]
:-)
(let [n-divides? (fn [divisor] (zero? (mod n divisor)))]
(nil? (some n-divides? (range 2 n)))))
;^^