merge

imgcook · Jan 29, 2022 · a10dccc · a10dccc
2 parents 897d961 + 2929263
commit a10dccc
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 23 deletions.
diff --git a/src/metrics/classifier.ts b/src/metrics/classifier.ts
@@ -8,7 +8,7 @@ export type ClassificationReport = {
   recalls: Tensor;
   f1s: Tensor;
   confusionMatrix: Tensor;
-  classes: Tensor;
+  categories: Tensor;
   accuracy: number;
   averagePrecision: number;
   averageRecall: number;
@@ -249,7 +249,7 @@ export const getClassificationReport = async (yTrue: Tensor | string[] | number[
     recalls: recalls,
     f1s: f1s,
     confusionMatrix: confusionMatrix,
-    classes: categories,
+    categories,
     accuracy,
     averageF1,
     averagePrecision,

diff --git a/test/node/preprocess/encoder.ts b/test/node/preprocess/encoder.ts
@@ -1,30 +1,30 @@
-import { eigenSolve } from '../../../src/linalg/eigen';
 import '@tensorflow/tfjs-backend-cpu';
 import * as tf from '@tensorflow/tfjs-core';
-import { tensorEqual } from '../../../src/linalg/utils';
 import { assert } from 'chai';
 import 'mocha';
-import { OneHotEncoder } from '../../../src/preprocess';
+import { OneHotEncoder, LabelEncoder } from '../../../src/preprocess';
 
-const x = ['tree', 'apple', 'banana', 'tree', 'apple', 'banana'];
+
+const x = [ 'tree', 'apple', 'banana', 'tree', 'apple', 'banana' ];
 const xEncode = tf.tensor([
-  [1, 0, 0],
-  [0, 1, 0],
-  [0, 0, 1],
-  [1, 0, 0],
-  [0, 1, 0],
-  [0, 0, 1],
+  [ 1, 0, 0 ],
+  [ 0, 1, 0 ],
+  [ 0, 0, 1 ],
+  [ 1, 0, 0 ],
+  [ 0, 1, 0 ],
+  [ 0, 0, 1 ]
 ]);
+const xLabelEncode = tf.tensor([ 0, 1, 2, 0, 1, 2 ]);
 const xEncodeDrop = tf.tensor([
-  [0, 0],
-  [1, 0],
-  [0, 1],
-  [0, 0],
-  [1, 0],
-  [0, 1],
+  [ 0, 0 ],
+  [ 1, 0 ],
+  [ 0, 1 ],
+  [ 0, 0 ],
+  [ 1, 0 ],
+  [ 0, 1 ]
 ]);
-const bx = ['tree', 'apple', 'tree', 'apple'];
-const bxEncodeDrop = tf.tensor([0, 1, 0, 1]);
+const bx = [ 'tree', 'apple', 'tree', 'apple' ];
+const bxEncodeDrop = tf.tensor([ 0, 1, 0, 1 ]);
 
 describe('OneHot Encoder', () => {
   it('encode', async () => {
@@ -40,21 +40,36 @@ describe('OneHot Encoder', () => {
     assert.deepEqual(xCate.dataSync() as any, x);
   });
   it('encode drop first', async () => {
-    const encoder = new OneHotEncoder({drop: 'first'});
+    const encoder = new OneHotEncoder({ drop: 'first' });
     await encoder.init(x);
     const xOneHot = await encoder.encode(x);
     assert.deepEqual(xOneHot.dataSync(), xEncodeDrop.dataSync());
   });
   it('encode binary only', async () => {
-    const encoder = new OneHotEncoder({drop: 'binary-only'});
+    const encoder = new OneHotEncoder({ drop: 'binary-only' });
     await encoder.init(bx);
     const bxOneHot = await encoder.encode(bx);
     assert.deepEqual(bxOneHot.dataSync(), bxEncodeDrop.dataSync());
   });
   it('decode binary only', async () => {
-    const encoder = new OneHotEncoder({drop: 'binary-only'});
+    const encoder = new OneHotEncoder({ drop: 'binary-only' });
     await encoder.init(bx);
     const bxCate = await encoder.decode(bxEncodeDrop);
     assert.deepEqual(bxCate.dataSync() as any, bx);
   });
 });
+
+describe('Label Encoder', () => {
+  it('encode', async () => {
+    const encoder = new LabelEncoder();
+    await encoder.init(x);
+    const xEncode = await encoder.encode(x);
+    assert.deepEqual(xEncode.dataSync(), xLabelEncode.dataSync());
+  });
+  it('decode', async () => {
+    const encoder = new LabelEncoder();
+    await encoder.init(x);
+    const xDecode = await encoder.decode(xLabelEncode);
+    assert.deepEqual(x, xDecode.dataSync() as any);
+  });
+});