Merge pull request #1 from plotly/inline-cwise-functions

Inline function constructors of zero-crossings module

Author: archmoj

.gitignore

@@ -12,5 +12,6 @@ logs
 results
 
 npm-debug.log
+package-lock.json
 node_modules/*
 *.DS_Store

lib/generate-module.js

@@ -1,50 +1,61 @@
-module.exports = require('cwise-compiler')({
-    args: ['array', {
-        offset: [1],
-        array: 0
-    }, 'scalar', 'scalar', 'index'],
-    pre: {
-        "body": "{}",
-        "args": [],
-        "thisVars": [],
-        "localVars": []
-    },
-    post: {
-        "body": "{}",
-        "args": [],
-        "thisVars": [],
-        "localVars": []
-    },
-    body: {
-        "body": "{\n        var _inline_1_da = _inline_1_arg0_ - _inline_1_arg3_\n        var _inline_1_db = _inline_1_arg1_ - _inline_1_arg3_\n        if((_inline_1_da >= 0) !== (_inline_1_db >= 0)) {\n          _inline_1_arg2_.push(_inline_1_arg4_[0] + 0.5 + 0.5 * (_inline_1_da + _inline_1_db) / (_inline_1_da - _inline_1_db))\n        }\n      }",
-        "args": [{
-            "name": "_inline_1_arg0_",
-            "lvalue": false,
-            "rvalue": true,
-            "count": 1
-        }, {
-            "name": "_inline_1_arg1_",
-            "lvalue": false,
-            "rvalue": true,
-            "count": 1
-        }, {
-            "name": "_inline_1_arg2_",
-            "lvalue": false,
-            "rvalue": true,
-            "count": 1
-        }, {
-            "name": "_inline_1_arg3_",
-            "lvalue": false,
-            "rvalue": true,
-            "count": 2
-        }, {
-            "name": "_inline_1_arg4_",
-            "lvalue": false,
-            "rvalue": true,
-            "count": 1
-        }],
-        "thisVars": [],
-        "localVars": ["_inline_1_da", "_inline_1_db"]
-    },
+"use strict"
+
+function CWiseOp() {
+  return function(SS, a0, t0, p0, Y0, Y1) {
+    var s0 = SS[0],
+      t0p0 = t0[0],
+      index = [0],
+      q0 = t0p0
+    p0 |= 0
+    var i0 = 0,
+      d0s0 = t0p0
+    for (i0 = 0; i0 < s0; ++i0) {
+      {
+        var da = a0[p0] - Y1
+        var db = a0[p0 + q0] - Y1
+        if (da >= 0 !== db >= 0) {
+          Y0.push(index[0] + 0.5 + (0.5 * (da + db)) / (da - db))
+        }
+      }
+      p0 += d0s0
+      ++index[0]
+    }
+  }
+}
+
+//Generates a cwise operator
+function generateCWiseOp() {
+  return CWiseOp()
+}
+
+var compile = generateCWiseOp
+
+function thunk(compile) {
+  var CACHED = {}
+  return function zeroCrossings_cwise_thunk(array0, scalar2, scalar3) {
+    var t0 = array0.dtype,
+      r0 = array0.order,
+      type = [t0, r0.join()].join(),
+      proc = CACHED[type]
+
+    if (!proc) {
+      CACHED[type] = proc = compile([t0, r0])
+    }
+
+    return proc(array0.shape.slice(0), array0.data, array0.stride, array0.offset | 0, scalar2, scalar3)
+  }
+}
+
+function createThunk(proc) {
+  return thunk(compile.bind(undefined, proc))
+}
+
+function compileCwise(user_args) {
+  return createThunk({
+    funcName: user_args.funcName
+  })
+}
+
+module.exports = compileCwise({
     funcName: 'zeroCrossings'
 })

lib/zc-core.js

@@ -6,18 +6,13 @@
   "directories": {
     "test": "test"
   },
-  "dependencies": {
-    "cwise-compiler": "^1.0.0"
-  },
+  "dependencies": {},
   "devDependencies": {
-    "cwise-parser": "^0.0.1",
     "ndarray": "^1.0.11",
-    "tape": "^2.12.3",
-    "js-beautify": "^1.4.2"
+    "tape": "^2.12.3"
   },
   "scripts": {
-    "test": "tape test/*.js",
-    "build": "node lib/generate-module.js > lib/zc-core.js"
+    "test": "tape test/*.js"
   },
   "repository": {
     "type": "git",