learning_model 1.0.25 → 1.0.28

package/dist/learning/base.d.ts

@@ -12,7 +12,7 @@ interface LearningInterface {
     addData(label: string, data: any): Promise<void>;
     train(): Promise<tf.History>;
     infer(data: any): Promise<any>;
-    saveModel(): void;
+    saveModel(): Promise<void>;
     running(): boolean;
     ready(): boolean;
 }

package/dist/learning/image.d.ts

@@ -9,6 +9,7 @@ declare class LearningImage implements LearningInterface {
     labels: string[];
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
@@ -31,7 +32,7 @@ declare class LearningImage implements LearningInterface {
     addData(label: string, data: any): Promise<void>;
     train(): Promise<tf.History>;
     infer(data: any): Promise<Map<string, number>>;
-    saveModel(): void;
+    saveModel(): Promise<void>;
     running(): boolean;
     ready(): boolean;
     private _preprocessedTargetData;

package/dist/learning/image.js

@@ -53,6 +53,7 @@ class LearningImage {
         this.labels = [];
         this.isRunning = false;
         this.isReady = false;
+        this.isTrainedDone = false;
         this.limitSize = 2;
     }
     // 학습 데이타 등록 
@@ -83,10 +84,12 @@ class LearningImage {
             // 콜백 정의
             const customCallback = {
                 onTrainBegin: (log) => {
+                    this.isTrainedDone = false;
                     this.onTrainBegin(log);
                     console.log('Training has started.');
                 },
                 onTrainEnd: (log) => {
+                    this.isTrainedDone = true;
                     this.onTrainEnd(log);
                     console.log('Training has ended.');
                     this.isRunning = false;
@@ -137,6 +140,7 @@ class LearningImage {
     // 추론하기
     infer(data) {
         return __awaiter(this, void 0, void 0, function* () {
+            const threshold = 1e-20; // 임계값 설정
             if (this.model === null) {
                 throw new Error('Model is null');
             }
@@ -147,15 +151,17 @@ class LearningImage {
                 const predictions = this.model.predict(reshapedTensor);
                 const predictionsData = yield predictions.data(); // 예측 텐서의 데이터를 비동기로 가져옴
                 const classProbabilities = new Map(); // 클래스별 확률 누적값을 저장할 맵
+                console.log('predictionsData', predictionsData);
                 for (let i = 0; i < predictionsData.length; i++) {
                     const className = this.labels[i]; // 클래스 이름
                     const probability = predictionsData[i];
+                    const result = Math.abs(probability) < threshold ? 0 : probability;
                     const existingProbability = classProbabilities.get(className);
                     if (existingProbability !== undefined) {
-                        classProbabilities.set(className, existingProbability + probability);
+                        classProbabilities.set(className, existingProbability + result);
                     }
                     else {
-                        classProbabilities.set(className, probability);
+                        classProbabilities.set(className, result);
                     }
                 }
                 console.log('Class Probabilities:', classProbabilities);
@@ -168,7 +174,14 @@ class LearningImage {
     }
     // 모델 저장
     saveModel() {
-        console.log('saved model');
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('saved model');
+            if (!this.isTrainedDone) {
+                return Promise.reject(new Error('Train is not done status'));
+            }
+            yield ((_a = this.model) === null || _a === void 0 ? void 0 : _a.save('localstorage://my-model'));
+        });
     }
     // 진행중 여부
     running() {

package/dist/learning/mobilenet_image.d.ts

@@ -10,6 +10,7 @@ declare class LearningMobilenetImage implements LearningInterface {
     modelURL: string;
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
@@ -33,7 +34,7 @@ declare class LearningMobilenetImage implements LearningInterface {
     addData(label: string, data: any): Promise<void>;
     train(): Promise<tf.History>;
     infer(data: any): Promise<Map<string, number>>;
-    saveModel(): void;
+    saveModel(): Promise<void>;
     running(): boolean;
     ready(): boolean;
     private _preprocessedTargetData;

package/dist/learning/mobilenet_image.js

@@ -62,6 +62,7 @@ class LearningMobilenetImage {
         this.modelURL = modelURL;
         this.isRunning = false;
         this.isReady = false;
+        this.isTrainedDone = false;
         this.limitSize = limitSize;
     }
     // 학습 데이타 등록 
@@ -92,10 +93,12 @@ class LearningMobilenetImage {
             // 콜백 정의
             const customCallback = {
                 onTrainBegin: (log) => {
+                    this.isTrainedDone = false;
                     this.onTrainBegin(log);
                     console.log('Training has started.');
                 },
                 onTrainEnd: (log) => {
+                    this.isTrainedDone = true;
                     this.onTrainEnd(log);
                     console.log('Training has ended.');
                     this.isRunning = false;
@@ -144,6 +147,7 @@ class LearningMobilenetImage {
     // 추론하기
     infer(data) {
         return __awaiter(this, void 0, void 0, function* () {
+            const threshold = 1e-20; // 임계값 설정
             if (this.model === null) {
                 return Promise.reject(new Error('Model is Null'));
             }
@@ -157,12 +161,13 @@ class LearningMobilenetImage {
                 for (let i = 0; i < predictionsData.length; i++) {
                     const className = this.labels[i]; // 클래스 이름
                     const probability = predictionsData[i];
+                    const result = Math.abs(probability) < threshold ? 0 : probability;
                     const existingProbability = classProbabilities.get(className);
                     if (existingProbability !== undefined) {
-                        classProbabilities.set(className, existingProbability + probability);
+                        classProbabilities.set(className, existingProbability + result);
                     }
                     else {
-                        classProbabilities.set(className, probability);
+                        classProbabilities.set(className, result);
                     }
                 }
                 console.log('Class Probabilities:', classProbabilities);
@@ -175,7 +180,14 @@ class LearningMobilenetImage {
     }
     // 모델 저장
     saveModel() {
-        console.log('saved model');
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('saved model');
+            if (!this.isTrainedDone) {
+                return Promise.reject(new Error('Train is not done status'));
+            }
+            yield ((_a = this.model) === null || _a === void 0 ? void 0 : _a.save('localstorage://my-model'));
+        });
     }
     // 진행중 여부
     running() {

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

@@ -12,7 +12,7 @@ interface LearningInterface {
     addData(label: string, data: any): Promise<void>;
     train(): Promise<tf.History>;
     infer(data: any): Promise<any>;
-    saveModel(): void;
+    saveModel(): Promise<void>;
     running(): boolean;
     ready(): boolean;
 }

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

@@ -9,6 +9,7 @@ declare class LearningImage implements LearningInterface {
     labels: string[];
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
@@ -31,7 +32,7 @@ declare class LearningImage implements LearningInterface {
     addData(label: string, data: any): Promise<void>;
     train(): Promise<tf.History>;
     infer(data: any): Promise<Map<string, number>>;
-    saveModel(): void;
+    saveModel(): Promise<void>;
     running(): boolean;
     ready(): boolean;
     private _preprocessedTargetData;

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

@@ -10,6 +10,7 @@ declare class LearningMobilenetImage implements LearningInterface {
     modelURL: string;
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
@@ -33,7 +34,7 @@ declare class LearningMobilenetImage implements LearningInterface {
     addData(label: string, data: any): Promise<void>;
     train(): Promise<tf.History>;
     infer(data: any): Promise<Map<string, number>>;
-    saveModel(): void;
+    saveModel(): Promise<void>;
     running(): boolean;
     ready(): boolean;
     private _preprocessedTargetData;

package/lib/learning/base.ts

@@ -36,7 +36,7 @@ interface LearningInterface {
     infer(data: any): Promise<any>;
 
     // 모델 저장
-    saveModel(): void;
+    saveModel(): Promise<void>;
 
     // 학습 진행 여부
     running(): boolean;

package/lib/learning/image.ts

@@ -10,6 +10,7 @@ class LearningImage implements LearningInterface {
   labels: string[];
   isRunning: boolean;
   isReady: boolean;
+  isTrainedDone: boolean;
   limitSize: number;
   trainImages: tf.Tensor3D[] = [];
   
@@ -33,6 +34,7 @@ class LearningImage implements LearningInterface {
     this.labels = [];
     this.isRunning = false;
     this.isReady = false;
+    this.isTrainedDone = false;
     this.limitSize = 2;
   }
 
@@ -72,10 +74,12 @@ class LearningImage implements LearningInterface {
     // 콜백 정의
     const customCallback = {
       onTrainBegin: (log: any) => {
+        this.isTrainedDone = false;
         this.onTrainBegin(log);
         console.log('Training has started.');
       },
       onTrainEnd: (log: any) => {
+        this.isTrainedDone = true;
         this.onTrainEnd(log);
         console.log('Training has ended.');
         this.isRunning = false;
@@ -125,6 +129,7 @@ class LearningImage implements LearningInterface {
   
   // 추론하기
   public async infer(data: any): Promise<Map<string, number>> {
+    const threshold = 1e-20; // 임계값 설정
     if (this.model === null) {
       throw new Error('Model is null');
     }
@@ -136,14 +141,16 @@ class LearningImage implements LearningInterface {
       const predictions = this.model.predict(reshapedTensor) as tf.Tensor;
       const predictionsData = await predictions.data(); // 예측 텐서의 데이터를 비동기로 가져옴
       const classProbabilities = new Map<string, number>(); // 클래스별 확률 누적값을 저장할 맵
+      console.log('predictionsData', predictionsData);
       for (let i = 0; i < predictionsData.length; i++) {
         const className = this.labels[i]; // 클래스 이름
         const probability = predictionsData[i];
+        const result = Math.abs(probability) < threshold ? 0 : probability;
         const existingProbability = classProbabilities.get(className);
         if (existingProbability !== undefined) {
-          classProbabilities.set(className, existingProbability + probability);
+          classProbabilities.set(className, existingProbability + result);
         } else {
-          classProbabilities.set(className, probability);
+          classProbabilities.set(className, result);
         }
       }
       console.log('Class Probabilities:', classProbabilities);
@@ -155,8 +162,12 @@ class LearningImage implements LearningInterface {
   
 
   // 모델 저장
-  public saveModel(): void {
+  public async saveModel(): Promise<void> {
     console.log('saved model');
+    if (!this.isTrainedDone) {
+      return Promise.reject(new Error('Train is not done status'));
+    }
+    await this.model?.save('localstorage://my-model');
   }
 
 

package/lib/learning/mobilenet_image.ts

@@ -18,6 +18,7 @@ class LearningMobilenetImage implements LearningInterface {
   modelURL: string;
   isRunning: boolean;
   isReady: boolean;
+  isTrainedDone: boolean;
   limitSize: number;
   trainImages: tf.Tensor3D[] = [];
   
@@ -43,6 +44,7 @@ class LearningMobilenetImage implements LearningInterface {
     this.modelURL = modelURL;
     this.isRunning = false;
     this.isReady = false;
+    this.isTrainedDone = false;
     this.limitSize = limitSize;
   }
 
@@ -84,10 +86,12 @@ class LearningMobilenetImage implements LearningInterface {
     // 콜백 정의
     const customCallback = {
       onTrainBegin: (log: any) => {
+        this.isTrainedDone = false;
         this.onTrainBegin(log);
         console.log('Training has started.');
       },
       onTrainEnd: (log: any) => {
+        this.isTrainedDone = true;
         this.onTrainEnd(log);
         console.log('Training has ended.');
         this.isRunning = false;
@@ -135,6 +139,7 @@ class LearningMobilenetImage implements LearningInterface {
   
   // 추론하기
   public async infer(data: any): Promise<Map<string, number>> {
+    const threshold = 1e-20; // 임계값 설정
     if (this.model === null) {
       return Promise.reject(new Error('Model is Null'));
     }
@@ -149,11 +154,12 @@ class LearningMobilenetImage implements LearningInterface {
       for (let i = 0; i < predictionsData.length; i++) {
         const className = this.labels[i]; // 클래스 이름
         const probability = predictionsData[i];
+        const result = Math.abs(probability) < threshold ? 0 : probability;
         const existingProbability = classProbabilities.get(className);
         if (existingProbability !== undefined) {
-          classProbabilities.set(className, existingProbability + probability);
+          classProbabilities.set(className, existingProbability + result);
         } else {
-          classProbabilities.set(className, probability);
+          classProbabilities.set(className, result);
         }
       }
       console.log('Class Probabilities:', classProbabilities);
@@ -162,14 +168,19 @@ class LearningMobilenetImage implements LearningInterface {
       throw error;
     }
   }
-  
 
+  
   // 모델 저장
-  public saveModel(): void {
+  public async saveModel(): Promise<void> {
     console.log('saved model');
+    if (!this.isTrainedDone) {
+      return Promise.reject(new Error('Train is not done status'));
+    }
+    await this.model?.save('localstorage://my-model');
   }
 
 
+
   // 진행중 여부
   public running(): boolean {
     return this.isRunning;

package/package.json

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