Skip to content

Commit 55b8fcd

Browse files
jlangsonjlangson
committed
Add whitespace back to tree_test.clj
1 parent 0a16328 commit 55b8fcd

File tree

1 file changed

+124
-123
lines changed

1 file changed

+124
-123
lines changed

‎test/com/dean/interval_tree/tree_test.clj‎

Lines changed: 124 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@
2020
(matches (node/-l n1) (node/-l n2))
2121
(matches (node/-r n1) (node/-r n2)))))
2222

23-
(def x1 (tree/node-singleton (gensym) true))
24-
(def x3 (tree/node-create (gensym) true x1 x1))
25-
(def x5 (tree/node-create (gensym) true x3 x1))
26-
(def x7 (tree/node-create (gensym) true x3 x3))
27-
(def x11 (tree/node-create (gensym) true x3 x7))
28-
(def x15 (tree/node-create (gensym) true x7 x7))
29-
(def x23 (tree/node-create (gensym) true x15 x7))
30-
(def x27 (tree/node-create (gensym) true x15 x11))
31-
(def x31 (tree/node-create (gensym) true x15 x15))
32-
(def x39 (tree/node-create (gensym) true x15 x23))
33-
(def x51 (tree/node-create (gensym) true x23 x27))
34-
(def x63 (tree/node-create (gensym) true x31 x31))
35-
(def x127 (tree/node-create (gensym) true x63 x63))
23+
(def x1 (tree/node-singleton (gensym) true))
24+
(def x3 (tree/node-create (gensym) true x1 x1))
25+
(def x5 (tree/node-create (gensym) true x3 x1))
26+
(def x7 (tree/node-create (gensym) true x3 x3))
27+
(def x11 (tree/node-create (gensym) true x3 x7))
28+
(def x15 (tree/node-create (gensym) true x7 x7))
29+
(def x23 (tree/node-create (gensym) true x15 x7))
30+
(def x27 (tree/node-create (gensym) true x15 x11))
31+
(def x31 (tree/node-create (gensym) true x15 x15))
32+
(def x39 (tree/node-create (gensym) true x15 x23))
33+
(def x51 (tree/node-create (gensym) true x23 x27))
34+
(def x63 (tree/node-create (gensym) true x31 x31))
35+
(def x127 (tree/node-create (gensym) true x63 x63))
3636

3737
;; TODO: consolidate
3838

3939
(defn- make-integer-tree
40-
([size] (reduce tree/node-add (node/leaf) (shuffle (range size))))
41-
([start end] (reduce tree/node-add (node/leaf) (shuffle (range start end))))
40+
([size] (reduce tree/node-add (node/leaf) (shuffle (range size))))
41+
([start end] (reduce tree/node-add (node/leaf) (shuffle (range start end))))
4242
([start end step] (reduce tree/node-add (node/leaf) (shuffle (range start end step)))))
4343

4444
(defn- make-string-tree [size]
@@ -49,82 +49,82 @@
4949
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
5050

5151
(deftest tree-allocator-check
52-
(is (= 0 (tree/node-size (node/leaf))))
53-
(is (= 1 (tree/node-weight (node/leaf))))
54-
(is (= 1 (tree/node-size (tree/node-singleton :k :v))))
55-
(is (= 2 (tree/node-weight (tree/node-singleton :k :v))))
56-
(is (= 1 (tree/node-size (tree/node-create :k :v (node/leaf) (node/leaf)))))
57-
(is (= 2 (tree/node-weight (tree/node-create :k :v (node/leaf) (node/leaf)))))
58-
(is (= 1 (tree/node-size x1)))
59-
(is (= 2 (tree/node-weight x1)))
60-
(is (= 3 (tree/node-size x3)))
61-
(is (= 4 (tree/node-weight x3)))
62-
(is (= 7 (tree/node-size x7)))
63-
(is (= 8 (tree/node-weight x7)))
64-
(is (= 15 (tree/node-size x15)))
52+
(is (= 0 (tree/node-size (node/leaf))))
53+
(is (= 1 (tree/node-weight (node/leaf))))
54+
(is (= 1 (tree/node-size (tree/node-singleton :k :v))))
55+
(is (= 2 (tree/node-weight (tree/node-singleton :k :v))))
56+
(is (= 1 (tree/node-size (tree/node-create :k :v (node/leaf) (node/leaf)))))
57+
(is (= 2 (tree/node-weight (tree/node-create :k :v (node/leaf) (node/leaf)))))
58+
(is (= 1 (tree/node-size x1)))
59+
(is (= 2 (tree/node-weight x1)))
60+
(is (= 3 (tree/node-size x3)))
61+
(is (= 4 (tree/node-weight x3)))
62+
(is (= 7 (tree/node-size x7)))
63+
(is (= 8 (tree/node-weight x7)))
64+
(is (= 15 (tree/node-size x15)))
6565
(is (= 16 (tree/node-weight x15)))
66-
(is (= 31 (tree/node-size x31)))
66+
(is (= 31 (tree/node-size x31)))
6767
(is (= 32 (tree/node-weight x31)))
68-
(is (= 63 (tree/node-size x63)))
68+
(is (= 63 (tree/node-size x63)))
6969
(is (= 64 (tree/node-weight x63))))
7070

7171
;; (1 2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768
7272
;; 65536 131072 262144 524288 1048576)
7373

7474
(deftest tree-health-check
7575
(doseq [size (take 21 (iterate #(* % 2) 1))]
76-
(is (tree/node-healthy? (make-string-tree size))) ;; string/int tree are structurally
77-
(is (tree/node-healthy? (make-integer-tree size))))) ;; very different due to sort order
76+
(is (tree/node-healthy? (make-string-tree size))) ;; string/int tree are structurally
77+
(is (tree/node-healthy? (make-integer-tree size))))) ;; very different due to sort order
7878

7979
(deftest rotation-check:single-left
8080
(let [node node/->SimpleNode]
8181
(matches (tree/rotate-single-left :AK :AV
82-
(node :XK :XV (node/leaf) (node/leaf) 1)
83-
(node :BK :BV (node :YK :YV (node/leaf) (node/leaf) 1)
84-
(node :ZK :XZ (node/leaf) (node/leaf) 1) 3))
85-
(node :BK :BV
86-
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
87-
(node :YK :YV (node/leaf) (node/leaf) 1) 3)
88-
(node :ZK :XZ (node/leaf) (node/leaf) 1) 5))))
82+
(node :XK :XV (node/leaf) (node/leaf) 1)
83+
(node :BK :BV (node :YK :YV (node/leaf) (node/leaf) 1)
84+
(node :ZK :XZ (node/leaf) (node/leaf) 1) 3))
85+
(node :BK :BV
86+
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
87+
(node :YK :YV (node/leaf) (node/leaf) 1) 3)
88+
(node :ZK :XZ (node/leaf) (node/leaf) 1) 5))))
8989

9090
(deftest rotation-check:double-left
9191
(let [node node/->SimpleNode]
9292
(matches (tree/rotate-double-left :AK :AV
93-
(node :XK :XV (node/leaf) (node/leaf) 1)
94-
(node :CK :CV
95-
(node :BK :BV (node :Y1K :Y1V (node/leaf) (node/leaf) 1)
96-
(node :Y2K :Y2V (node/leaf) (node/leaf) 1) 3)
97-
(node :ZK :ZV (node/leaf) (node/leaf) 1) 5))
98-
(node :BK :BV
99-
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
100-
(node :Y1K :Y1V (node/leaf) (node/leaf) 1) 3)
101-
(node :CK :CV
102-
(node :Y2K :Y2V (node/leaf) (node/leaf) 1)
103-
(node :ZK :ZV (node/leaf) (node/leaf) 1) 3) 7))))
93+
(node :XK :XV (node/leaf) (node/leaf) 1)
94+
(node :CK :CV
95+
(node :BK :BV (node :Y1K :Y1V (node/leaf) (node/leaf) 1)
96+
(node :Y2K :Y2V (node/leaf) (node/leaf) 1) 3)
97+
(node :ZK :ZV (node/leaf) (node/leaf) 1) 5))
98+
(node :BK :BV
99+
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
100+
(node :Y1K :Y1V (node/leaf) (node/leaf) 1) 3)
101+
(node :CK :CV
102+
(node :Y2K :Y2V (node/leaf) (node/leaf) 1)
103+
(node :ZK :ZV (node/leaf) (node/leaf) 1) 3) 7))))
104104

105105
(deftest rotation-check:single-right
106106
(let [node node/->SimpleNode]
107107
(matches (tree/rotate-single-right :BK :BV
108-
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
109-
(node :YK :YV (node/leaf) (node/leaf) 1) 3)
110-
(node :ZK :XZ (node/leaf) (node/leaf) 1))
111-
(node :AK :AV
112-
(node :XK :XV (node/leaf) (node/leaf) 1)
113-
(node :BK :BV (node :YK :YV (node/leaf) (node/leaf) 1)
114-
(node :ZK :XZ (node/leaf) (node/leaf) 1) 3) 5))))
108+
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
109+
(node :YK :YV (node/leaf) (node/leaf) 1) 3)
110+
(node :ZK :XZ (node/leaf) (node/leaf) 1))
111+
(node :AK :AV
112+
(node :XK :XV (node/leaf) (node/leaf) 1)
113+
(node :BK :BV (node :YK :YV (node/leaf) (node/leaf) 1)
114+
(node :ZK :XZ (node/leaf) (node/leaf) 1) 3) 5))))
115115

116116
(deftest rotation-check:double-right
117117
(let [node node/->SimpleNode]
118118
(matches (tree/rotate-double-right :CK :CV
119-
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
120-
(node :BK :BV (node :Y1K :Y1V (node/leaf) (node/leaf) 1)
121-
(node :Y2K :Y2V (node/leaf) (node/leaf) 1) 3) 5)
122-
(node :ZK :ZV (node/leaf) (node/leaf) 1))
123-
(node :BK :BV
124-
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
125-
(node :Y1K :Y1V (node/leaf) (node/leaf) 1) 3)
126-
(node :CK :CV (node :Y2K :Y2V (node/leaf) (node/leaf) 1)
127-
(node :ZK :ZV (node/leaf) (node/leaf) 1) 3) 7))))
119+
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
120+
(node :BK :BV (node :Y1K :Y1V (node/leaf) (node/leaf) 1)
121+
(node :Y2K :Y2V (node/leaf) (node/leaf) 1) 3) 5)
122+
(node :ZK :ZV (node/leaf) (node/leaf) 1))
123+
(node :BK :BV
124+
(node :AK :AV (node :XK :XV (node/leaf) (node/leaf) 1)
125+
(node :Y1K :Y1V (node/leaf) (node/leaf) 1) 3)
126+
(node :CK :CV (node :Y2K :Y2V (node/leaf) (node/leaf) 1)
127+
(node :ZK :ZV (node/leaf) (node/leaf) 1) 3) 7))))
128128

129129
(deftest join-check:single-left
130130
(let [rot:1L (tree/node-stitch :root true x1 x7)]
@@ -147,63 +147,63 @@
147147
(deftest join-check:double-left
148148
(let [node node/->SimpleNode]
149149
(matches (tree/node-stitch :AK :AV
150-
(node :XK :XV (node/leaf) (node/leaf) 1)
151-
(node :CK :CV
152-
(node :BK :BV
153-
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2)
154-
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2) 5)
155-
(node :ZK :ZV (node/leaf) (node/leaf) 1) 7))
156-
(node :BK :BV
157-
(node :AK :AV
158-
(node :XK :XV (node/leaf) (node/leaf) 1)
159-
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2) 4)
160-
(node :CK :CV
161-
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2)
162-
(node :ZK :ZV (node/leaf) (node/leaf) 1) 4) 9))))
150+
(node :XK :XV (node/leaf) (node/leaf) 1)
151+
(node :CK :CV
152+
(node :BK :BV
153+
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2)
154+
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2) 5)
155+
(node :ZK :ZV (node/leaf) (node/leaf) 1) 7))
156+
(node :BK :BV
157+
(node :AK :AV
158+
(node :XK :XV (node/leaf) (node/leaf) 1)
159+
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2) 4)
160+
(node :CK :CV
161+
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2)
162+
(node :ZK :ZV (node/leaf) (node/leaf) 1) 4) 9))))
163163

164164
(deftest join-check:double-right
165165
(let [node node/->SimpleNode]
166166
(matches (tree/node-stitch :CK :CV
167-
(node :AK :AV
168-
(node :XK :XV (node/leaf) (node/leaf) 1)
169-
(node :BK :BV
170-
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2)
171-
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2) 5) 7)
172-
(node :ZK :ZV (node/leaf) (node/leaf) 1))
173-
(node :BK :BV
174-
(node :AK :AV
175-
(node :XK :XV (node/leaf) (node/leaf) 1)
176-
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2) 4)
177-
(node :CK :CV
178-
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2)
179-
(node :ZK :ZV (node/leaf) (node/leaf) 1) 4) 9))))
167+
(node :AK :AV
168+
(node :XK :XV (node/leaf) (node/leaf) 1)
169+
(node :BK :BV
170+
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2)
171+
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2) 5) 7)
172+
(node :ZK :ZV (node/leaf) (node/leaf) 1))
173+
(node :BK :BV
174+
(node :AK :AV
175+
(node :XK :XV (node/leaf) (node/leaf) 1)
176+
(node :Y1K :Y1V (node :Q1K :Q1V (node/leaf) (node/leaf) 1) (node/leaf) 2) 4)
177+
(node :CK :CV
178+
(node :Y2K :Y2V (node :Q2K :Q2V (node/leaf) (node/leaf) 1) (node/leaf) 2)
179+
(node :ZK :ZV (node/leaf) (node/leaf) 1) 4) 9))))
180180

181181
(deftest concat3-check
182182
(is
183183
(= \A
184-
(first
185-
(name
186-
(node/-k
187-
(tree/node-least
188-
(tree/node-concat3
189-
(gensym "A") true (node/leaf) x5)))))))
184+
(first
185+
(name
186+
(node/-k
187+
(tree/node-least
188+
(tree/node-concat3
189+
(gensym "A") true (node/leaf) x5)))))))
190190
(is
191191
(= \Z
192-
(first
193-
(name
194-
(node/-k
195-
(tree/node-greatest
196-
(tree/node-concat3
197-
(gensym "Z") true x5 (node/leaf))))))))
192+
(first
193+
(name
194+
(node/-k
195+
(tree/node-greatest
196+
(tree/node-concat3
197+
(gensym "Z") true x5 (node/leaf))))))))
198198
(is
199199
(= \A
200-
(first
201-
(name
202-
(node/-k
203-
(tree/node-least
204-
(tree/node-concat3
205-
(gensym "C") true
206-
(tree/node-singleton (gensym "A") true) x7))))))))
200+
(first
201+
(name
202+
(node/-k
203+
(tree/node-least
204+
(tree/node-concat3
205+
(gensym "C") true
206+
(tree/node-singleton (gensym "A") true) x7))))))))
207207

208208
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
209209
;; Operational Tests
@@ -226,11 +226,11 @@
226226
(deftest extrema-check
227227
(doseq [size [10 100 1000 10000 100000]]
228228
(let [tree (make-string-tree size)]
229-
(is (= "0" (-> tree tree/node-least node/-k)))
229+
(is (= "0" (-> tree tree/node-least node/-k)))
230230
(is (= (-> size dec str) (-> tree tree/node-greatest node/-k)))
231231
(is (= "1" (-> tree tree/node-remove-least tree/node-least node/-k)))
232232
(is (= (-> size dec dec str)
233-
(-> tree tree/node-remove-greatest tree/node-greatest node/-k))))))
233+
(-> tree tree/node-remove-greatest tree/node-greatest node/-k))))))
234234

235235
(deftest node-seq-check
236236
(doseq [size [1 10 100 1000 10000 100000]]
@@ -271,7 +271,7 @@
271271
(deftest node-reduction-check
272272
(doseq [size [1 10 100 1000 10000 100000]]
273273
(let [tree (make-integer-tree size)
274-
sum (reduce + (range size))]
274+
sum (reduce + (range size))]
275275
(is (= sum (reduce + (map node/-k (tree/node-seq tree)))))
276276
(dotimes [_ 1000]
277277
(is (= sum (tree/node-chunked-fold (inc (rand-int size))
@@ -280,18 +280,19 @@
280280
(deftest node-comparison-check
281281
(let [nums #(-> % (repeatedly (partial rand-int 1000000000)))
282282
tree #(->> % nums (reduce tree/node-add (node/leaf)))
283-
chk #(let [m0 (node/-k (tree/node-least %1))
284-
m1 (node/-k (tree/node-least %2))]
285-
(is (zero? (tree/node-set-compare %1 %1)))
286-
(is (zero? (tree/node-set-compare %2 %2)))
287-
(cond
288-
(< m0 m1) (is (= -1 (tree/node-set-compare %1 %2)))
289-
(< m1 m0) (is (= 1 (tree/node-set-compare %1 %2)))
290-
true (recur (tree/node-remove-least %1)
291-
(tree/node-remove-least %2))))]
283+
chk #(let [m0 (node/-k (tree/node-least %1))
284+
m1 (node/-k (tree/node-least %2))]
285+
(is (zero? (tree/node-set-compare %1 %1)))
286+
(is (zero? (tree/node-set-compare %2 %2)))
287+
(cond
288+
(< m0 m1) (is (= -1 (tree/node-set-compare %1 %2)))
289+
(< m1 m0) (is (= 1 (tree/node-set-compare %1 %2)))
290+
true (recur (tree/node-remove-least %1)
291+
(tree/node-remove-least %2))))]
292292
(doseq [size [1 10 100 1000 10000 100000]]
293293
(chk (tree size) (tree size)))))
294294

295+
295296
(defspec add-remove-node-maintains-health
296297
(prop/for-all [k gen/small-integer
297298
size gen/nat]

0 commit comments

Comments
 (0)