learning_model 1.0.39 → 1.0.40

package/dist/learning/mobilenet.js

@@ -138,7 +138,8 @@ class LearningMobilenet {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.mobilenetModule !== null) {
-                    const cap = (0, tf_1.isTensor)(data) ? data : (0, tf_1.capture)(data, false);
+                    const croppedImage = (0, canvas_1.cropTo)(data, 224, false);
+                    const cap = (0, tf_1.isTensor)(data) ? data : (0, tf_1.capture)(croppedImage, false);
                     const predict = this.mobilenetModule.predict(cap);
                     const activation = predict.dataSync();
                     const classIndex = this.registerClassNumber(label);
@@ -190,13 +191,13 @@ class LearningMobilenet {
                     this.isRunning = false;
                 },
                 onBatchBegin: (batch, logs) => {
-                    console.log(`Batch ${batch} is starting.`);
+                    //console.log(`Batch ${batch} is starting.`);
                 },
                 onBatchEnd: (batch, logs) => {
-                    console.log(`Batch ${batch} has ended.`);
+                    //console.log(`Batch ${batch} has ended.`);
                 },
                 onEpochBegin: (epoch, logs) => {
-                    console.log(`Epoch ${epoch + 1} is starting.`, logs);
+                    //console.log(`Epoch ${epoch+1} is starting.`, logs);
                 },
                 onEpochEnd: (epoch, logs) => {
                     this.onEpochEnd(epoch, logs);
@@ -264,6 +265,7 @@ class LearningMobilenet {
                         classProbabilities.set(className, probability);
                     }
                 }
+                console.log('classProbabilities', classProbabilities);
                 (0, tfjs_1.dispose)(logits);
                 return classProbabilities;
             }
@@ -300,7 +302,7 @@ class LearningMobilenet {
                     layers: [
                         tf.layers.dense({
                             inputShape: this.mobilenetModule.outputs[0].shape.slice(1),
-                            units: 64,
+                            units: 128,
                             activation: 'relu',
                             kernelInitializer: varianceScaling,
                             useBias: true

package/lib/learning/mobilenet.ts

@@ -150,7 +150,8 @@ class LearningMobilenet implements LearningInterface {
   public async addData(label: string, data: any): Promise<void> {
     try {
       if (this.mobilenetModule !== null) {
-        const cap = isTensor(data) ? data : capture(data, false);
+        const croppedImage = cropTo(data, 224, false);
+        const cap = isTensor(data) ? data : capture(croppedImage, false);
         const predict = this.mobilenetModule.predict(cap) as tf.Tensor;
         const activation = predict.dataSync() as Float32Array;
         const classIndex = this.registerClassNumber(label);
@@ -199,13 +200,13 @@ class LearningMobilenet implements LearningInterface {
         this.isRunning = false;
       },
       onBatchBegin: (batch: any, logs: any) => {
-        console.log(`Batch ${batch} is starting.`);
+        //console.log(`Batch ${batch} is starting.`);
       },
       onBatchEnd: (batch: any, logs: any) => {
-        console.log(`Batch ${batch} has ended.`);
+        //console.log(`Batch ${batch} has ended.`);
       },
       onEpochBegin: (epoch: number, logs: any) => {
-        console.log(`Epoch ${epoch+1} is starting.`, logs);
+        //console.log(`Epoch ${epoch+1} is starting.`, logs);
       },
       onEpochEnd: (epoch: number, logs: any) => {
         this.onEpochEnd(epoch, logs);
@@ -273,6 +274,7 @@ class LearningMobilenet implements LearningInterface {
           classProbabilities.set(className, probability);
         }
       }
+      console.log('classProbabilities', classProbabilities);
       dispose(logits);
       return classProbabilities;
     } catch (error) {
@@ -310,7 +312,7 @@ class LearningMobilenet implements LearningInterface {
         layers: [
           tf.layers.dense({
             inputShape: this.mobilenetModule!.outputs[0].shape.slice(1),
-            units: 64,
+            units: 128,
             activation: 'relu',
             kernelInitializer: varianceScaling, // 'varianceScaling'
             useBias: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "learning_model",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "learning model develop",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",