learning_model 1.0.35 → 1.0.37

package/dist/learning/base.d.ts

@@ -16,6 +16,10 @@ interface LearningInterface {
     saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void>;
     running(): boolean;
     ready(): boolean;
-    load(url: string, labels: string[]): Promise<void>;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
 }
 export default LearningInterface;

package/dist/learning/mobilenet.d.ts

@@ -34,7 +34,11 @@ declare class LearningMobilenet implements LearningInterface {
     onTrainBegin: (log: any) => void;
     onTrainEnd: (log: any) => void;
     onEpochEnd: (epoch: number, logs: any) => void;
-    load(url: string, labels: string[]): Promise<void>;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
     addData(label: string, data: any): Promise<void>;
     init(): Promise<void>;
     train(): Promise<tf.History>;

package/dist/learning/mobilenet.js

@@ -69,13 +69,13 @@ class LearningMobilenet {
     }
     //
     // 기존의 모델 로드
-    load(url, labels) {
+    load({ jsonURL, binFile, labels }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (labels.length <= 0) {
                 return Promise.reject(new Error('Labels length is 0'));
             }
             try {
-                this.model = yield tf.loadLayersModel(url);
+                this.model = yield tf.loadLayersModel(jsonURL);
                 this.labels = labels;
                 this.isReady = true;
                 this.model.summary();
@@ -182,6 +182,7 @@ class LearningMobilenet {
                 const inputData = this._preprocessedInputData(this.model);
                 console.log('this.imageTensors', this.imageTensors, inputData);
                 const targetData = this._preprocessedTargetData();
+                console.log('targetData', targetData);
                 const history = yield this.model.fit(inputData, targetData, {
                     epochs: this.epochs,
                     batchSize: this.batchSize,

package/dist/lib/learning/base.d.ts

@@ -16,6 +16,10 @@ interface LearningInterface {
     saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void>;
     running(): boolean;
     ready(): boolean;
-    load(url: string, labels: string[]): Promise<void>;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
 }
 export default LearningInterface;

package/dist/lib/learning/mobilenet.d.ts

@@ -34,7 +34,11 @@ declare class LearningMobilenet implements LearningInterface {
     onTrainBegin: (log: any) => void;
     onTrainEnd: (log: any) => void;
     onEpochEnd: (epoch: number, logs: any) => void;
-    load(url: string, labels: string[]): Promise<void>;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
     addData(label: string, data: any): Promise<void>;
     init(): Promise<void>;
     train(): Promise<tf.History>;

package/lib/learning/base.ts

@@ -45,7 +45,7 @@ interface LearningInterface {
     ready(): boolean;
 
     // 모델 로드
-    load(url: string, labels: string[]): Promise<void>;
+    load({jsonURL, binFile, labels}: {jsonURL :string, binFile: io.LoadOptions | undefined, labels : Array<string>}): Promise<void>;
 }  
 
 export default LearningInterface;

package/lib/learning/mobilenet.ts

@@ -7,7 +7,6 @@
 import * as tf from '@tensorflow/tfjs';
 import { io } from '@tensorflow/tfjs-core';
 import LearningInterface from './base';
-import { ImageToTensor } from './util';
 
 class LearningMobilenet implements LearningInterface {
   model: tf.LayersModel | null;
@@ -67,13 +66,13 @@ class LearningMobilenet implements LearningInterface {
   
   //
   // 기존의 모델 로드
-  public async load(url: string, labels: string[]): Promise<void> {
+  public async load({jsonURL, binFile, labels}: {jsonURL :string, binFile: io.LoadOptions | undefined, labels : Array<string>}): Promise<void> {
     if (labels.length <= 0) {
       return Promise.reject(new Error('Labels length is 0'));
     }
 
     try {
-      this.model = await tf.loadLayersModel(url);
+      this.model = await tf.loadLayersModel(jsonURL);
       this.labels = labels;
       this.isReady = true;
       this.model.summary();
@@ -84,6 +83,7 @@ class LearningMobilenet implements LearningInterface {
     
   }
 
+
   // 학습 데이타 등록 
   public async addData(label: string, data: any): Promise<void> {
     try {
@@ -179,6 +179,7 @@ class LearningMobilenet implements LearningInterface {
 
       console.log('this.imageTensors', this.imageTensors, inputData);
       const targetData = this._preprocessedTargetData();
+      console.log('targetData', targetData);
       const history = await this.model.fit(inputData, targetData, {
         epochs: this.epochs,
         batchSize: this.batchSize,
@@ -282,6 +283,7 @@ class LearningMobilenet implements LearningInterface {
     console.log('oneHotEncode', oneHotEncode);
     return oneHotEncode
   }
+  
 
   // 입력 이미지 데이타 
   private _preprocessedInputData(model: tf.LayersModel): tf.Tensor<tf.Rank> {

package/package.json

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