Skip to content

Replace <= with compare<= for key comparisons #2

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.

Sign up for GitHub

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

Merged
erdos merged 2 commits into from
May 7, 2026
Merged

Replace <= with compare<= for key comparisons #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e3312
Replace <= with compare<= for key comparisons
erdos May 7, 2026
f1d272d
Enhance tests for leapfrog-join and union iterators
erdos May 7, 2026
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
6 changes: 3 additions & 3 deletions src/erdos/algo/leapfrog/triejoin.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
(->next [_] (ctor (leapfrog-next iterators)))
(get-key [_] (get-key (first iterators)))
(->seek [this k]
(assert (<= (get-key this) k))
(assert (compare<= (get-key this) k))
(ctor (leapfrog-seek iterators k)))
(deref [_] iterators)
(toString [_] "<Leapfrog-Join>"))))
Expand All @@ -143,9 +143,9 @@
(let [min-key (get-key this)]
(ctor (keep (fn [i] (if (= min-key (get-key i)) (->next i) i)) iterators))))
(->seek [this k]
(assert (<= (get-key this) k))
(assert (compare<= (get-key this) k))
(ctor (keep (fn [i] (if (compare<= k (get-key i)) i (->seek i k))) iterators)))
(get-key [_] (reduce min (map get-key iterators)))
(get-key [_] (reduce (fn [a b] (if (compare<= a b) a b)) (map get-key iterators)))
(trie-open [this]
(let [min-key (get-key this)
min-vec (filterv (fn [i] (= (get-key i) min-key)) iterators)]
Expand Down
20 changes: 19 additions & 1 deletion test/erdos/algo/leapfrog/triejoin_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,16 @@
(is (= [2 8] (vec (leapfrog-join [rel-1 rel-3]))))
(is (= [2 8] (vec (leapfrog-join [rel-1 rel-2 rel-3]))))
(is (= nil (leapfrog-join [rel-1 (sorted-iter (sorted-set -1))])))
#_(is (map? (meta (leapfrog-join [rel-1 rel-2]))))))
#_(is (map? (meta (leapfrog-join [rel-1 rel-2])))))

(testing "leapfrog-join over keyword-keyed iterators, including ->seek"
(let [a (sorted-iter (sorted-set :Esau :Isaac :Jacob :Joseph))
b (sorted-iter (sorted-set :Hank :Isaac :Jacob :Levi))
j (leapfrog-join [a b])]
(is (= [:Isaac :Jacob] (vec j)))
(is (= :Isaac (get-key (->seek j :Isaac))))
(is (= :Jacob (get-key (->seek j :Jacob))))
(is (nil? (->seek j :Zara))))))

(deftest trie-iterator-tests
(let [rels (sorted-set [1 3 4] [1 3 5] [1 4 6] [1 4 8] [1 4 9] [1 5 2] [3 5 2])
Expand Down Expand Up @@ -173,6 +182,15 @@
(are [k val] (= val (some-> iter (->seek k) get-key))
1 1, 4 4, 6 7, 6.5 7, 20 nil)))

(testing "Union over keyword-keyed tries"
(let [iter1 (test-trie-iter [:a] [[:Isaac] [:Jacob]])
iter2 (test-trie-iter [:a] [[:Esau] [:Jacob]])
u (union-iterator [iter1 iter2])]
(is (= [:Esau :Isaac :Jacob] (vec u)))
(is (= :Isaac (get-key (->seek u :Hank))))
(is (= :Jacob (get-key (->seek u :Jacob))))
(is (nil? (->seek u :Zara)))))

#_(testing "All iterators exhausted"
(let [iter1 (sorted-iter (sorted-set 1 2))
iter2 (sorted-iter (sorted-set 1 2))
Expand Down
Loading