upgrade to ndarray 1.0

mikolalysenko · mikolalysenko · commit 0ebe557d9e59 · 2013-06-26T11:06:07.000-05:00
diff --git a/README.md b/README.md
@@ -19,11 +19,10 @@ Install
 
     npm install pack
 
-### `require("ndarray-pack")(nested_array[, dtype])`
+### `require("ndarray-pack")(nested_array)`
 Converts the nested array into a packed ndarray.
 
 * `nested_array` is an array-of-arrays (ie a numeric.js array)
-* `dtype` is the data type of the packed ndarray.  (Either, "uint8", "uint16", "uint32", "int8", "int16", "int32", "float" or "double")
 
 **Returns** A packed ndarray representation of the nested arrays.
 
diff --git a/convert.js b/convert.js
@@ -1,7 +1,6 @@
 "use strict"
 
 var ndarray = require("ndarray")
-var numeric = require("numeric")
 var cwise = require("cwise")
 
 var do_convert = cwise({
@@ -15,12 +14,17 @@ var do_convert = cwise({
   }
 })
 
-module.exports = function convert(arr, dtype) {
-  if(!dtype) {
-    dtype = "float64"
+module.exports = function convert(arr) {
+  var shape = [], c = arr, sz = 1
+  while(c instanceof Array) {
+    shape.push(c.length)
+    sz *= c.length
+    c = c[0]
   }
-  var shape = numeric.dim(arr)
-  var result = ndarray.zeros(shape, dtype)
+  if(shape.length === 0) {
+    return ndarray([])
+  }
+  var result = ndarray(new Float64Array(sz), shape)
   do_convert(result, arr)
   return result
-}
+}
diff --git a/package.json b/package.json
@@ -1,15 +1,14 @@
 {
   "name": "ndarray-pack",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "description": "Packs an array-of-arrays into a single ndarray",
   "main": "convert.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "cwise": "~0.1.2",
-    "ndarray": "~0.2.1",
-    "numeric": "~1.2.6"
+    "cwise": "~0.3.2",
+    "ndarray": "~1.0.0"
   },
   "devDependencies": {
     "tap": "~0.4.2"
