Rename the contrib.accumulators namespace to cascalog.math.accumulators

cascalog-math/src/clojure/contrib/accumulators.clj → cascalog-math/src/cascalog/math/contrib/accumulators.clj

@@ -22,10 +22,10 @@
   ^{:author "Konrad Hinsen"
      :doc "A generic accumulator interface and implementations of various
            accumulators."}
-  clojure.contrib.accumulators
+  cascalog.math.contrib.accumulators
   (:refer-clojure :exclude (deftype))
-  (:use [clojure.contrib.types :only (deftype)])
-  (:use [clojure.contrib.def :only (defvar)]))
+  (:use [cascalog.math.contrib.types :only (deftype)])
+  (:use [cascalog.math.contrib.def :only (defvar)]))
 
 (defmulti add
   "Add item to the accumulator acc. The exact meaning of adding an

cascalog-math/src/clojure/contrib/def.clj → cascalog-math/src/cascalog/math/contrib/def.clj

@@ -18,7 +18,7 @@
   #^{:author "Stephen C. Gilardi",
     :doc "def.clj provides variants of def that make including doc strings and
 making private definitions more succinct."} 
-  clojure.contrib.def)
+  cascalog.math.contrib.def)
 
 (defmacro defvar
   "Defines a var with an optional intializer and doc string"

cascalog-math/src/clojure/contrib/types.clj → cascalog-math/src/cascalog/math/contrib/types.clj

@@ -14,9 +14,9 @@
 (ns
   ^{:author "Konrad Hinsen"
      :doc "General and algebraic data types"}
-  clojure.contrib.types
+  cascalog.math.contrib.types
   (:refer-clojure :exclude (deftype))
-  (:use [clojure.contrib.def :only (name-with-attributes)]))
+  (:use [cascalog.math.contrib.def :only (name-with-attributes)]))
 
 ;
 ; Utility functions

cascalog-math/src/cascalog/math/stats.clj

@@ -2,7 +2,7 @@
   (:use cascalog.api)
   (:require [cascalog.logic.ops :as c]
             [cascalog.logic.def :as d]
-            [clojure.contrib [accumulators :as acc]]))
+            [cascalog.math.contrib [accumulators :as acc]]))
 
 (defn initialize-mean-variance-parallel [& X]
   (map (fn [x] (acc/mean-variance {:mean x :variance 0 :n 1})) X))