Smaller fixes to use correct protocols.

Author: cnuernber

src/tech/v3/dataset/dynamic_int_list.clj

@@ -2,6 +2,7 @@
   "An int-list implementation that resizes its backing store as it is required to hold
   wider data."
   (:require [tech.v3.datatype.protocols :as dtype-proto]
+            [tech.v3.datatype.hamf-proto :as dtype-hamf-proto]
             [tech.v3.datatype :as dtype]
             [tech.v3.datatype.base :as dtype-base]
             [tech.v3.datatype.errors :as errors]
@@ -44,7 +45,7 @@
   (->native-buffer [_item]
     (dtype-proto/->native-buffer backing-store))
   LongBuffer
-  (elemwiseDatatype [_this] (dtype-proto/elemwise-datatype backing-store))
+  (elemwiseDatatype [_this] (dtype/elemwise-datatype backing-store))
   (clear [this]
     (set! backing-store (abuf/as-growable-list (dtype/make-list :int8 1500) 0))
     (set! int-width 8))

src/tech/v3/dataset/impl/column.clj

@@ -421,7 +421,7 @@
   (invoke [this idx def-val] (.invoke (cached-buffer!) idx def-val))
   (meta [this] (assoc metadata
                       :datatype (dtype-hamf-proto/elemwise-datatype this)
-                      :n-elems (dtype-proto/ecount this)))
+                      :n-elems (.size this)))
   (withMeta [_this new-meta] (Column. missing
                                      data
                                      new-meta

src/tech/v3/dataset/protocols.clj

@@ -1,6 +1,7 @@
 (ns tech.v3.dataset.protocols
   (:require [tech.v3.datatype.protocols :as dtype-proto]
-            [ham-fisted.protocols :as hamf-proto])
+            [ham-fisted.protocols :as hamf-proto]
+            [tech.v3.datatype :as dtype])
   (:import [org.roaringbitmap RoaringBitmap]
            [tech.v3.datatype Buffer]
            [clojure.lang IDeref])
@@ -74,7 +75,7 @@
   PColumn
   (is-column? [item] false)
   PRowCount
-  (row-count [this] (dtype-proto/ecount this))
+  (row-count [this] (dtype/ecount this))
   PColumnCount
   (column-count [this] 0)
   PMissing

src/tech/v3/libs/fastexcel.clj

@@ -20,6 +20,7 @@
 ```"
   (:require [tech.v3.io :as io]
             [tech.v3.datatype.protocols :as dtype-proto]
+            [tech.v3.datatype.hamf-proto :as dtype-hamf-proto]
             [tech.v3.datatype :as dtype]
             [tech.v3.datatype.errors :as errors]
             [tech.v3.dataset.io.spreadsheet :as parse-spreadsheet]
@@ -59,7 +60,7 @@
 (defn- wrap-cell
   [^Cell cell]
   (reify
-    dtype-proto/PElemwiseDatatype
+    dtype-hamf-proto/PElemwiseDatatype
     (elemwise-datatype [this]
       (let [cell-type (.getType cell)]
         (if (formula-type? cell-type)
@@ -73,7 +74,7 @@
     (value [this]
       (if (formula-type? (.getType cell))
         (try-parse-double cell)
-        (case (dtype-proto/elemwise-datatype this)
+        (case (dtype/elemwise-datatype this)
           :none nil
           :string (.getRawValue cell)
           :boolean (.asBoolean cell)

src/tech/v3/libs/poi.clj

@@ -18,6 +18,7 @@
   (:require [tech.v3.io :as io]
             [tech.v3.datatype :as dtype]
             [tech.v3.datatype.protocols :as dtype-proto]
+            [tech.v3.datatype.hamf-proto :as dtype-hamf-proto]
             [tech.v3.datatype.errors :as errors]
             [tech.v3.datatype.datetime :as dtype-dt]
             [tech.v3.dataset.io.spreadsheet :as parse-spreadsheet]
@@ -47,7 +48,7 @@
 (defn- wrap-cell
   [^Cell cell]
   (reify
-    dtype-proto/PElemwiseDatatype
+    dtype-hamf-proto/PElemwiseDatatype
     (elemwise-datatype [this]
       (let [cell-type (.getCellType cell)]
         (if (or (= cell-type CellType/FORMULA)
@@ -62,7 +63,7 @@
     (getColumnNum [this] (.. cell getAddress getColumn))
     (missing [this] (identical? :none (dtype/get-datatype this)))
     (value [this]
-      (case (dtype-proto/elemwise-datatype this)
+      (case (dtype/elemwise-datatype this)
         :none nil
         :string (.getStringCellValue cell)
         :boolean (.getBooleanCellValue cell)