fixes #110, makes data formatter a set of singletons and don't overwrite input, but rather use rawInput

Also unit test.
Bump version number.

Author: robertleeplummerjr

package.json

@@ -1,7 +1,7 @@
 {
   "name": "brain.js",
   "description": "Neural network library",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.7",
   "author": "Heather Arthur <[email protected]>",
   "repository": {
     "type": "git",

src/neural-network-gpu.js

@@ -290,7 +290,7 @@ export default class NeuralNetworkGPU extends NeuralNetwork {
     }
     // turn sparse hash input into arrays with 0s as filler
     let datum = data[0].input;
-    if (!Array.isArray(datum) && !(datum instanceof Float64Array)) {
+    if (!Array.isArray(datum) && !(datum instanceof Float32Array)) {
       if (!this.inputLookup) {
         this.inputLookup = lookup.buildLookup(data.map(value => value['input']));
       }

src/neural-network.js

@@ -441,7 +441,7 @@ export default class NeuralNetwork {
     }
     // turn sparse hash input into arrays with 0s as filler
     let datum = data[0].input;
-    if (!Array.isArray(datum) && !(datum instanceof Float64Array)) {
+    if (!Array.isArray(datum) && !(datum instanceof Float32Array)) {
       if (!this.inputLookup) {
         this.inputLookup = lookup.buildLookup(data.map(value => value['input']));
       }

src/recurrent/matrix/index.js

@@ -21,7 +21,7 @@ export default class Matrix {
    *
    * @param {Number} row
    * @param {Number} col
-   * @returns {Float64Array|Array}
+   * @returns {Float32Array|Array}
    */
   getWeights(row, col) {
     // slow but careful accessor function

src/recurrent/rnn.js

@@ -615,11 +615,12 @@ export default class RNN {
       }
     }
 
-    return new Function('input', 'maxPredictionLength', 'isSampleI', 'temperature', `
+    const src = `
   if (typeof input === 'undefined') input = [];
   if (typeof maxPredictionLength === 'undefined') maxPredictionLength = 100;
   if (typeof isSampleI === 'undefined') isSampleI = false;
   if (typeof temperature === 'undefined') temperature = 1;
+  ${ (this.dataFormatter !== null) ? this.dataFormatter.toFunctionString() : '' }
   
   ${
       (this.dataFormatter !== null && typeof this.formatDataIn === 'function')
@@ -677,24 +678,31 @@ ${ innerFunctionsSwitch.join('\n') }
   ${ (this.dataFormatter !== null && typeof this.formatDataOut === 'function') 
       ? 'return formatDataOut(output.slice(input.length).map(function(value) { return value - 1; }))'
       : 'return output.slice(input.length).map(function(value) { return value - 1; })' };
-  
   function Matrix(rows, columns) {
     this.rows = rows;
     this.columns = columns;
     this.weights = zeros(rows * columns);
   }
   ${ this.dataFormatter !== null && typeof this.formatDataIn === 'function'
-      ? `function formatDataIn(input, output) { ${ toInner(this.formatDataIn.toString()).replace('this.dataFormatter', 'json.options.dataFormatter') } }`
+      ? `function formatDataIn(input, output) { ${
+          toInner(this.formatDataIn.toString())
+            .replace(/this[.]dataFormatter[.]/g, '')
+            .replace(/this[.]dataFormatter/g, 'true')
+        } }`
       : '' }
   ${ this.dataFormatter !== null && typeof this.formatDataOut === 'function'
-        ? `function formatDataOut(output) { ${ toInner(this.formatDataIn.toString()).replace('this.dataFormatter', 'json.options.dataFormatter') } }` 
+        ? `function formatDataOut(output) { ${
+            toInner(this.formatDataIn.toString())
+              .replace(/this[.]dataFormatter[.]/g, '')
+              .replace(/this[.]dataFormatter/g, 'true')
+          } }` 
         : '' }
-  ${ (this.dataFormatter !== null) ? this.dataFormatter.toFunctionString('json.options.dataFormatter') : '' }
   ${ zeros.toString() }
   ${ softmax.toString().replace('_2.default', 'Matrix') }
   ${ randomF.toString() }
   ${ sampleI.toString() }
-  ${ maxI.toString() }`)
+  ${ maxI.toString() }`;
+    return new Function('rawInput', 'maxPredictionLength', 'isSampleI', 'temperature', src);
   }
 }
 

src/utilities/data-formatter.js

@@ -161,11 +161,16 @@ export default class DataFormatter {
     }
   }
 
-  toFunctionString(dataFormatterVariableName) {
+  toFunctionString() {
     return `
-${ this.toIndexes.toString().replace('this', dataFormatterVariableName) }
-${ this.toIndexesInputOutput.toString().replace('this', dataFormatterVariableName) }
-${ this.toCharacters.toString().replace('this', dataFormatterVariableName) }
+var characterTable = ${ JSON.stringify(this.characterTable) };
+var indexTable = ${ JSON.stringify(this.indexTable) };
+var characters = ${ JSON.stringify(this.characters) };
+${ this.toIndexes.toString()
+      .replace(/(let|var) indexTable = this[.]indexTable;\n/, '')
+      .replace(/this[.]/g, '') }
+${ this.toIndexesInputOutput.toString().replace(/this[.]/g, '') }
+${ this.toCharacters.toString().replace(/this[.]/, '') }
 `;
   }
 }

src/utilities/ones.js

@@ -1,5 +1,5 @@
 export default function ones(size) {
-  // if (typeof Float64Array !== 'undefined') return new Float64Array(size).fill(1);
+  if (typeof Float32Array !== 'undefined') return new Float32Array(size).fill(1);
   let array = new Array(size);
   for (let i = 0; i < size; i++) {
     array[i] = 1;

src/utilities/zeros.js

@@ -1,5 +1,5 @@
 export default function zeros(size) {
-  // if (typeof Float64Array !== 'undefined') return new Float64Array(size);
+  if (typeof Float32Array !== 'undefined') return new Float32Array(size);
   let array = new Array(size);
   for (let i = 0; i < size; i++) {
     array[i] = 0;

test/recurrent/gru.js

@@ -159,5 +159,12 @@ describe('gru', () => {
       var lastOutput = dataFormatter.toCharacters(net.run()).join('');
       assert.equal(dataFormatter.toCharacters(net.toFunction()()).join(''), lastOutput);
     });
+
+    it('can include the DataFormatter', () => {
+      const net = new GRU();
+      net.train(['hi mom!'], { iterations: 1 });
+      const newNet = net.toFunction();
+      newNet('hi mom!');
+    });
   });
 });

test/recurrent/lstm.js

@@ -109,6 +109,12 @@ describe('lstm', () => {
       var lastOutput = dataFormatter.toCharacters(net.run()).join('');
       assert.equal(dataFormatter.toCharacters(net.toFunction()()).join(''), lastOutput);
     });
+    it('can include the DataFormatter', () => {
+      const net = new LSTM();
+      net.train(['hi mom!'], { iterations: 1 });
+      const newNet = net.toFunction();
+      newNet('hi mom!');
+    });
   });
 
   describe('.run', () => {