Version 3.0.0 - Updates to Clojure 1.6 and lint fixes

Author: ashenfad

.gitignore

@@ -5,3 +5,4 @@ pom.xml
 /target/
 .lein-deps-sum
 .lein-failures
+.nrepl*

README.md

@@ -9,7 +9,7 @@
 For [Leiningen](https://github.com/technomancy/leiningen):
 
 ```clojure
-[bigml/sampling "2.1.1"]
+[bigml/sampling "3.0.0"]
 ```
 
 ## Overview
@@ -76,16 +76,16 @@ Setting the `:seed` parameter allows the sample order to be recreated.
 
 ```clojure
 test> (simple/sample (range 5) :seed 7)
-(1 3 2 0 4)
+(2 1 3 4 0)
 test> (simple/sample (range 5) :seed 7)
-(1 3 2 0 4)
+(2 1 3 4 0)
 ```
 
 Any value that's hashable is valid as a seed:
 
 ```clojure
 test> (simple/sample (range 5) :seed :foo)
-(2 1 3 0 4)
+(1 0 3 2 4)
 ```
 
 The underlying random number generator may also be selected with the
@@ -99,9 +99,9 @@ The default is `:lcg`.
 
 ```clojure
 test> (simple/sample (range 5) :seed 7 :generator :lcg)
-(1 3 2 0 4)
+(2 1 3 4 0)
 test> (simple/sample (range 5) :seed 7 :generator :twister)
-(1 2 0 3 4)
+(4 3 0 1 2)
 ```
 
 ### Weighted Simple Sampling
@@ -175,7 +175,7 @@ Both `reservoir/sample` and `reservoir/create` support the `:replace`,
 
 ```clojure
 test> (reservoir/sample (range 10) 5 :replace true :seed 1 :weigh identity)
-(9 7 5 5 8)
+(7 2 4 5 1)
 ```
 
 One caveat is that samples for reservoirs using `:weigh` won't be in a
@@ -255,7 +255,7 @@ As elsewhere, `stream/sample` supports `:replace`, `:seed`, and
 
 ```clojure
 test> (stream/sample (range) 5 10 :replace true :seed 2)
-(2 3 6 7 7)
+(0 0 4 6 7)
 ```
 
 ### Out-of-bag Items
@@ -428,7 +428,7 @@ An example:
 ```clojure
 test> (stream/multi-reduce (range) [+ 0 20 30 :seed 3]
                                    [+ 0 20 30 :seed 4])
-(269 291)
+(273 330)
 ```
 
 ## License

project.clj

@@ -1,9 +1,12 @@
-(defproject bigml/sampling "2.1.1"
+(defproject bigml/sampling "3.0.0"
   :description "Random Sampling in Clojure"
   :url "https://github.com/bigmlcom/sampling"
   :license {:name "Apache License, Version 2.0"
             :url "http://www.apache.org/licenses/LICENSE-2.0"}
-  :dependencies [[org.clojure/clojure "1.4.0"]
-                 [incanter/parallelcolt "0.9.4"]
-                 [org.clojure/data.finger-tree "0.0.1"]]
+  :aliases {"lint" ["do" "check," "eastwood"]
+            "distcheck" ["do" "clean," "lint," "test"]}
+  :profiles {:dev {:plugins [[jonase/eastwood "0.1.4"]]}}
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [org.clojure/data.finger-tree "0.0.2"]
+                 [incanter/parallelcolt "0.9.4"]]
   :aot [bigml.sampling.reservoir.mergeable])

src/bigml/sampling/random.clj

@@ -1,4 +1,4 @@
-;; Copyright 2013 BigML
+;; Copyright 2013, 2014 BigML
 ;; Licensed under the Apache License, Version 2.0
 ;; http://www.apache.org/licenses/LICENSE-2.0
 
@@ -7,7 +7,7 @@
   (:import (cern.jet.random.tdouble.engine MersenneTwister64)
            (java.util Random)))
 
-(defn- make-mersenne-rng [seed]
+(defn- make-mersenne-rng [^long seed]
   (let [m (MersenneTwister64. seed)]
     (proxy [java.util.Random] []
       (nextInt

src/bigml/sampling/reservoir/efraimidis.clj

@@ -79,23 +79,24 @@
     [_ i]
     (and (instance? Reservoir i)
          (= (into [] reservoir)
-            (into [] (.reservoir i)))
-         (= res-size (.res-size i))
-         (= seed (.seed i))
-         (= gen (.gen i))
-         (= weigh (.weigh i))))
+            (into [] (.reservoir ^Reservoir i)))
+         (= res-size (.res-size ^Reservoir i))
+         (= seed (.seed ^Reservoir i))
+         (= gen (.gen ^Reservoir i))
+         (= weigh (.weigh ^Reservoir i))))
   clojure.lang.ISeq
   (first [_] (:item (first reservoir)))
   (more [_] (Reservoir. (rest reservoir) res-size seed gen weigh nil 0 0 mdata))
   (next [_] (if-let [r (next reservoir)]
               (Reservoir. r res-size seed gen weigh nil 0 0 mdata)))
   MergeableReservoir
   (mergeReservoir [_ i]
-    (let [reservoir (into reservoir (.reservoir i))]
-      (Reservoir. (nthnext reservoir (max (- (count reservoir) res-size) 0))
+    (let [reservoir (into reservoir (.reservoir ^Reservoir i))]
+      (Reservoir. (->> (nthnext reservoir (max (- (count reservoir) res-size) 0))
+                       (into (empty reservoir)))
                   res-size seed gen weigh r
-                  (+ wt (.wt i))
-                  (+ jmp (.jmp i))
+                  (+ wt (.wt ^Reservoir i))
+                  (+ jmp (.jmp ^Reservoir i))
                   mdata)))
   CountedSetReservoir
   (getCountedSet [_] reservoir)
@@ -129,25 +130,25 @@
   (empty [_]
     (ReplacementReservoir. (init-replacement-reservoir res-size seed gen weigh)
                            res-size seed gen weigh mdata))
-  (equiv
-    [_ i]
+  (equiv [_ i]
     (and (instance? ReplacementReservoir i)
-         (= reservoir (.reservoir i))
-         (= res-size (.res-size i))
-         (= seed (.seed i))
-         (= gen (.gen i))
-         (= weigh (.weigh i))))
+         (= reservoir (.reservoir ^ReplacementReservoir i))
+         (= res-size (.res-size ^ReplacementReservoir i))
+         (= seed (.seed ^ReplacementReservoir i))
+         (= gen (.gen ^ReplacementReservoir i))
+         (= weigh (.weigh ^ReplacementReservoir i))))
   clojure.lang.ISeq
   (first [_] (ffirst reservoir))
   (more [_] (ReplacementReservoir. (rest reservoir) res-size seed gen weigh mdata))
   (next [_] (when-let [r (next reservoir)]
               (ReplacementReservoir. r res-size seed gen weigh mdata)))
   MergeableReservoir
   (mergeReservoir [_ i]
-    (ReplacementReservoir.
-     (vec (take res-size (sort-by #(:k (first (.getCountedSet %))) >
-                                  (concat reservoir (.reservoir i)))))
-     res-size seed gen weigh mdata))
+    (let [r (->> (concat reservoir (.reservoir ^ReplacementReservoir i))
+                 (sort-by #(:k (first (.getCountedSet ^Reservoir %))) >)
+                 (take res-size)
+                 (vec))]
+      (ReplacementReservoir. r res-size seed gen weigh mdata)))
   java.util.List
   (iterator [_]
     (let [r (atom reservoir)]

src/bigml/sampling/reservoir/insertion.clj

@@ -1,4 +1,4 @@
-;; Copyright 2013 BigML
+;; Copyright 2013, 2014 BigML
 ;; Licensed under the Apache License, Version 2.0
 ;; http://www.apache.org/licenses/LICENSE-2.0
 
@@ -42,7 +42,6 @@
        :generator generator})))
 
 (defmethod insert ::without-replacement [reservoir val]
-  [reservoir val]
   (let [{:keys [size insert-count seed generator indices]}
         (meta reservoir)
         insert-count (inc insert-count)
@@ -71,10 +70,13 @@
   (empty [_] (Reservoir. (with-meta [] (assoc (meta reservoir)
                                          :insert-count 0))
                            mdata))
-  (equiv [_ i] (and (instance? Reservoir i) (= reservoir (.reservoir i))))
+  (equiv [_ i]
+    (and (instance? Reservoir i)
+         (= reservoir (.reservoir ^Reservoir i))))
   MergeableReservoir
   (mergeReservoir [_ i]
-    (let [{:keys [insert-count size seed] :as rmeta} (meta reservoir)
+    (let [^Reservoir i i
+          {:keys [insert-count size seed] :as rmeta} (meta reservoir)
           weight-items (fn [r]
                          (let [ic (:insert-count (meta r))]
                            (map #(list % ic) r)))

test/bigml/sampling/test/occurrence.clj

@@ -1,17 +1,17 @@
-;; Copyright 2013 BigML
+;; Copyright 2013, 2014 BigML
 ;; Licensed under the Apache License, Version 2.0
 ;; http://www.apache.org/licenses/LICENSE-2.0
 
 (ns bigml.sampling.test.occurrence
-  (:use clojure.test)
-  (:require (bigml.sampling [occurrence :as occurrence])))
+  (:require [clojure.test :refer :all]
+            (bigml.sampling [occurrence :as occurrence])))
 
 (def big-result
   1498231660179642550080525374062985229379154060073454416056804436265250417504978421344703666672011193783194306251922106632531575096104465752579970958417306283423558722428981480592122380206679550814874547016793880384420005011964284022150602938812288536154567998961655336231440060094535026560416077739589623596000N)
 
 (deftest roll
-  (= 4 (occurrence/roll 50 10 :seed 12345))
-  (= 1 (occurrence/roll 50 10 :seed 654321)))
+  (is (= 7 (occurrence/roll 50 10 :seed 12345)))
+  (is (= 5 (occurrence/roll 50 10 :seed 654321))))
 
 (deftest cumulative-prob
   (is (= (occurrence/cumulative-probabilities 4 2)

test/bigml/sampling/test/reservoir.clj

@@ -1,11 +1,11 @@
-;; Copyright 2013 BigML
+;; Copyright 2013, 2014 BigML
 ;; Licensed under the Apache License, Version 2.0
 ;; http://www.apache.org/licenses/LICENSE-2.0
 
 (ns bigml.sampling.test.reservoir
-  (:use clojure.test
-        bigml.sampling.test.util)
-  (:require (bigml.sampling [reservoir :as reservoir])))
+  (:require [clojure.test :refer :all]
+            [bigml.sampling.test.util :refer :all]
+            (bigml.sampling [reservoir :as reservoir])))
 
 (deftest sample
   (is (about-eq (reduce + (reservoir/sample (range 1000) 500))
@@ -21,15 +21,15 @@
 
 (deftest regression
   (is (= (vec (reservoir/sample (range 20) 10 :seed 7))
-         [8 0 14 16 13 3 4 18 6 5]))
+         [18 14 3 7 12 10 1 2 17 6]))
   (is (= (vec (reservoir/sample (range 20) 10 :seed 7 :replace true))
-         [19 8 11 5 1 10 15 1 0 15]))
+         [3 17 2 14 12 3 3 8 3 14]))
   (is (= (vec (reservoir/sample (range 20) 10 :seed 7
                                 :implementation :insertion))
-         [9 16 11 2 8 19 17 6 15 10]))
+         [11 13 16 10 9 19 17 7 6 14]))
   (is (= (vec (reservoir/sample (range 20) 10 :seed 7 :replace true
                                 :implementation :insertion))
-         [13 10 9 16 7 2 15 17 4 14])))
+         [3 12 17 4 12 11 17 5 5 15])))
 
 (deftest weighting
   (let [result (reservoir/sample [:heads :tails] 4000

test/bigml/sampling/test/simple.clj

@@ -3,9 +3,9 @@
 ;; http://www.apache.org/licenses/LICENSE-2.0
 
 (ns bigml.sampling.test.simple
-  (:use clojure.test
-        bigml.sampling.test.util)
-  (:require (bigml.sampling [simple :as simple]
+  (:require [clojure.test :refer :all]
+            [bigml.sampling.test.util :refer :all]
+            (bigml.sampling [simple :as simple]
                             [random :as random])))
 
 (deftest sample
@@ -18,11 +18,11 @@
 
 (deftest regression
   (is (= (take 10 (simple/sample (range 20) :seed :foo))
-         '(7 3 9 6 10 4 2 8 5 13)))
+         '(11 3 15 17 7 8 10 6 18 14)))
   (is (= (take 10 (simple/sample (range 20) :seed 7))
-         '(16 13 17 12 9 4 18 7 14 19)))
+         '(12 1 9 13 18 15 7 0 17 2)))
   (is (= (take 10 (simple/sample (range 20) :seed 7 :replace true))
-         '(16 4 5 4 0 14 8 9 10 14))))
+         '(12 10 13 7 19 15 13 17 1 8))))
 
 (defn- make-weighted-data [& {:keys [seed]}]
   (let [rnd (random/create :seed seed)]
@@ -31,22 +31,22 @@
 (deftest weighted-regression
   (let [data (take 10 (make-weighted-data :seed :foo))]
     (is (= (map first (simple/sample data :seed :bar :weigh second))
-           '(9 0 8 3 1 4 7 6 5 2)))
+           '(2 9 1 4 8 5 7 6 3 0)))
     (is (= (take 10 (map first (simple/sample data
                                             :seed :bar
                                             :weigh second
                                             :replace true)))
-           '(9 6 9 4 0 8 4 1 3 0)))))
+           '(2 1 1 4 8 4 8 1 9 4)))))
 
 (deftest twister-regression
   (is (= (take 10 (simple/sample (range 20)
                                :seed 7
                                :generator :twister))
-         '(5 9 6 3 10 17 12 18 8 2)))
+         '(16 10 15 5 7 18 17 3 8 2)))
   (is (= (take 10 (simple/sample (range 20) :seed 7
                                :generator :twister
                                :replace true))
-         '(5 8 4 0 7 17 9 17 0 6))))
+         '(16 10 14 3 4 18 15 17 1 12))))
 
 (deftest zero-weight
   (is (= {:heads 100}

test/bigml/sampling/test/stream.clj

@@ -1,11 +1,11 @@
-;; Copyright 2013 BigML
+;; Copyright 2013, 2014 BigML
 ;; Licensed under the Apache License, Version 2.0
 ;; http://www.apache.org/licenses/LICENSE-2.0
 
 (ns bigml.sampling.test.stream
-  (:use clojure.test
-        bigml.sampling.test.util)
-  (:require (bigml.sampling [stream :as stream])))
+  (:require [clojure.test :refer :all]
+            [bigml.sampling.test.util :refer :all]
+            (bigml.sampling [stream :as stream])))
 
 (deftest sample
   (is (about-eq (reduce + (stream/sample (range 1000) 500 1000))
@@ -19,19 +19,19 @@
 
 (deftest regression
   (is (= (stream/sample (range) 10 20 :seed 7)
-         '(3 4 5 7 10 12 14 15 16 17)))
+         '(1 2 6 7 9 10 12 13 15 19)))
   (is (= (stream/sample (range) 10 20 :seed 7 :out-of-bag true)
-         '(0 1 2 6 8 9 11 13 18 19)))
+         '(0 3 4 5 8 11 14 16 17 18)))
   (is (= (stream/sample (range) 10 20 :seed 7 :replace true)
-         '(0 1 3 4 7 9 11 16 18 19)))
+         '(2 2 8 8 9 11 13 13 15 17)))
   (is (= (stream/sample (range) 10 20 :seed 7 :replace true :out-of-bag true)
-         '(2 5 6 8 10 12 13 14 15 17)))
+         '(0 1 3 4 5 6 7 10 12 14 16 18 19)))
   (is (= (stream/sample (range 20) 10 20 :seed 7 :replace true :rate true)
-         '(0 1 3 4 7 9 9 10 11 16 19)))
+         '(2 2 8 8 9 11 13 13 15 17 18 19 19)))
   (is (= (stream/sample (range 20) 10 20
                         :seed 7 :replace true
                         :rate true :out-of-bag true)
-         '(2 5 6 8 12 13 14 15 17 18)))
+         '(0 1 3 4 5 6 7 10 12 14 16)))
   (let [sum1 (atom 0)
         sum2 (atom 0)]
     (stream/multi-sample (range)