bug fix

mikolalysenko · mikolalysenko · commit 87ea014c7f17 · 2013-05-15T12:37:54.000-05:00
diff --git a/convert.js b/convert.js
@@ -5,18 +5,18 @@ var numeric = require("numeric")
 var cwise = require("cwise")
 
 var do_convert = cwise({
-  args: ["array", "index", "scalar"],
-  body: function(out, idx, a) {
+  args: ["array", "scalar", "index"],
+  body: function(out, a, idx) {
     var v = a
     for(var i=0; i<idx.length-1; ++i) {
-      v = a[idx[i]]
+      v = v[idx[i]]
     }
     out = v[idx[idx.length-1]]
   }
 })
 
 module.exports = function convert(arr, dtype) {
-  if(dtype === undefined) {
+  if(!dtype) {
     dtype = "float64"
   }
   var shape = numeric.dim(arr)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ndarray-pack",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "Packs an array-of-arrays into a single ndarray",
   "main": "convert.js",
   "directories": {
diff --git a/test/test.js b/test/test.js
@@ -14,6 +14,12 @@ require("tap").test("ndarray-pack", function(t) {
       t.equals(y.get(i,j), x[i][j])
     }
   }
+  
+  var x = [[[1, 2]], [[3,4]], [[5,6]]]
+  var y = require("../convert.js")(x)
+  
+  t.equals(y.shape.join(","), "3,1,2")
+  t.equals(y.get(0, 0, 0), 1)
 
   t.end()
 })

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ndarray-pack",`
`3`		`- "version": "0.0.0",`
	`3`	`+ "version": "0.0.1",`
`4`	`4`	`"description": "Packs an array-of-arrays into a single ndarray",`
`5`	`5`	`"main": "convert.js",`
`6`	`6`	`"directories": {`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,12 @@ require("tap").test("ndarray-pack", function(t) {`
`14`	`14`	`t.equals(y.get(i,j), x[i][j])`
`15`	`15`	`}`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ var x = [[[1, 2]], [[3,4]], [[5,6]]]`
	`19`	`+ var y = require("../convert.js")(x)`
	`20`	`+`
	`21`	`+ t.equals(y.shape.join(","), "3,1,2")`
	`22`	`+ t.equals(y.get(0, 0, 0), 1)`
`17`	`23`
`18`	`24`	`t.end()`
`19`	`25`	`})`