@@ -308,8 +308,8 @@ In prior versions of the combinatorics library, there were two similar functions
308
308
309
309
(defn- factorial [n]
310
310
{:pre [(integer? n) (not (neg? n))]}
311
- ; (Long/valueOf 1 ) eliminates loop auto-boxing warning, in a way compatible with Clojure 1.2
312
- (loop [acc (Long/valueOf 1 ), n n]
311
+ ; (Long/valueOf (long 1) ) eliminates loop auto-boxing warning, in a way compatible with Clojure 1.2
312
+ (loop [acc (Long/valueOf ( long 1 ) ), n n]
313
313
(if (zero? n) acc (recur (mult acc n) (dec n)))))
314
314
315
315
(defn- factorial-numbers
@@ -513,7 +513,7 @@ so that we can memoize over a series of calls."
513
513
(count-combinations-unmemoized items t)))
514
514
515
515
(defn- expt-int [base pow]
516
- (loop [n pow, y (Long/valueOf 1 ), z base]
516
+ (loop [n pow, y (Long/valueOf ( long 1 ) ), z base]
517
517
(let [t (even? n), n (quot n 2 )]
518
518
(cond
519
519
t (recur n y (mult z z))
@@ -609,15 +609,15 @@ represented by freqs"
609
609
610
610
(defn- permutation-index-distinct
611
611
[l]
612
- (loop [l l, index (Long/valueOf 0 ), n (dec (count l))]
612
+ (loop [l l, index (Long/valueOf ( long 0 ) ), n (dec (count l))]
613
613
(if (empty? l) index
614
614
(recur (rest l)
615
615
(+ index (* (factorial n) (list-index (sort l) (first l))))
616
616
(dec n)))))
617
617
618
618
(defn- permutation-index-duplicates
619
619
[l]
620
- (loop [l l, index (Long/valueOf 0 ), freqs (into (sorted-map ) (frequencies l))]
620
+ (loop [l l, index (Long/valueOf ( long 0 ) ), freqs (into (sorted-map ) (frequencies l))]
621
621
(if (empty? l) index
622
622
(recur (rest l)
623
623
(reduce + index
0 commit comments