learning_model 1.0.24 → 1.0.26

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

@@ -5,21 +5,24 @@ declare class LearningImage implements LearningInterface {
     epochs: number;
     batchSize: number;
     learningRate: number;
+    validateRate: number;
     labels: string[];
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
     readonly MOBILE_NET_INPUT_HEIGHT = 224;
     readonly MOBILE_NET_INPUT_CHANNEL = 3;
     readonly IMAGE_NORMALIZATION_FACTOR = 255;
-    constructor({ epochs, batchSize, limitSize, learningRate, }?: {
+    constructor({ epochs, batchSize, limitSize, learningRate, validateRate, }?: {
         modelURL?: string;
         epochs?: number;
         batchSize?: number;
         limitSize?: number;
         learningRate?: number;
+        validateRate?: number;
     });
     onProgress: (progress: number) => void;
     onLoss: (loss: number) => void;
@@ -29,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

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const tf = __importStar(require("@tensorflow/tfjs"));
 class LearningImage {
-    constructor({ epochs = 10, batchSize = 16, limitSize = 2, learningRate = 0.001, } = {}) {
+    constructor({ epochs = 10, batchSize = 16, limitSize = 2, learningRate = 0.001, validateRate = 0.2, } = {}) {
         this.trainImages = [];
         this.MOBILE_NET_INPUT_WIDTH = 224;
         this.MOBILE_NET_INPUT_HEIGHT = 224;
@@ -49,9 +49,11 @@ class LearningImage {
         this.epochs = epochs;
         this.batchSize = batchSize;
         this.learningRate = learningRate;
+        this.validateRate = validateRate;
         this.labels = [];
         this.isRunning = false;
         this.isReady = false;
+        this.isTrainedDone = false;
         this.limitSize = 2;
     }
     // 학습 데이타 등록 
@@ -82,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;
@@ -120,6 +124,7 @@ class LearningImage {
                 const history = yield this.model.fit(inputData, targetData, {
                     epochs: this.epochs,
                     batchSize: this.batchSize,
+                    validationSplit: this.validateRate,
                     callbacks: customCallback
                 });
                 console.log('Model training completed', history);
@@ -166,7 +171,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

@@ -5,10 +5,12 @@ declare class LearningMobilenetImage implements LearningInterface {
     epochs: number;
     batchSize: number;
     learningRate: number;
+    validateRate: number;
     labels: string[];
     modelURL: string;
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
@@ -16,12 +18,13 @@ declare class LearningMobilenetImage implements LearningInterface {
     readonly MOBILE_NET_INPUT_CHANNEL = 3;
     readonly IMAGE_NORMALIZATION_FACTOR = 255;
     constructor({ modelURL, // 디폴트 mobilenet 이미지 
-    epochs, batchSize, limitSize, learningRate, }?: {
+    epochs, batchSize, limitSize, learningRate, validateRate, }?: {
         modelURL?: string;
         epochs?: number;
         batchSize?: number;
         limitSize?: number;
         learningRate?: number;
+        validateRate?: number;
     });
     onProgress: (progress: number) => void;
     onLoss: (loss: number) => void;
@@ -31,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

@@ -41,7 +41,7 @@ const tf = __importStar(require("@tensorflow/tfjs"));
 const util_1 = require("./util");
 class LearningMobilenetImage {
     constructor({ modelURL = 'https://storage.googleapis.com/tfjs-models/tfjs/mobilenet_v1_0.25_224/model.json', // 디폴트 mobilenet 이미지 
-    epochs = 10, batchSize = 16, limitSize = 2, learningRate = 0.001, } = {}) {
+    epochs = 10, batchSize = 16, limitSize = 2, learningRate = 0.001, validateRate = 0.2, } = {}) {
         this.trainImages = [];
         this.MOBILE_NET_INPUT_WIDTH = 224;
         this.MOBILE_NET_INPUT_HEIGHT = 224;
@@ -57,10 +57,12 @@ class LearningMobilenetImage {
         this.epochs = epochs;
         this.batchSize = batchSize;
         this.learningRate = learningRate;
+        this.validateRate = validateRate;
         this.labels = [];
         this.modelURL = modelURL;
         this.isRunning = false;
         this.isReady = false;
+        this.isTrainedDone = false;
         this.limitSize = limitSize;
     }
     // 학습 데이타 등록 
@@ -91,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;
@@ -127,6 +131,7 @@ class LearningMobilenetImage {
                 const history = yield this.model.fit(inputData, targetData, {
                     epochs: this.epochs,
                     batchSize: this.batchSize,
+                    validationSplit: this.validateRate,
                     callbacks: customCallback
                 });
                 console.log('Model training completed', history);
@@ -173,7 +178,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

@@ -5,21 +5,24 @@ declare class LearningImage implements LearningInterface {
     epochs: number;
     batchSize: number;
     learningRate: number;
+    validateRate: number;
     labels: string[];
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
     readonly MOBILE_NET_INPUT_HEIGHT = 224;
     readonly MOBILE_NET_INPUT_CHANNEL = 3;
     readonly IMAGE_NORMALIZATION_FACTOR = 255;
-    constructor({ epochs, batchSize, limitSize, learningRate, }?: {
+    constructor({ epochs, batchSize, limitSize, learningRate, validateRate, }?: {
         modelURL?: string;
         epochs?: number;
         batchSize?: number;
         limitSize?: number;
         learningRate?: number;
+        validateRate?: number;
     });
     onProgress: (progress: number) => void;
     onLoss: (loss: number) => void;
@@ -29,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

@@ -5,10 +5,12 @@ declare class LearningMobilenetImage implements LearningInterface {
     epochs: number;
     batchSize: number;
     learningRate: number;
+    validateRate: number;
     labels: string[];
     modelURL: string;
     isRunning: boolean;
     isReady: boolean;
+    isTrainedDone: boolean;
     limitSize: number;
     trainImages: tf.Tensor3D[];
     readonly MOBILE_NET_INPUT_WIDTH = 224;
@@ -16,12 +18,13 @@ declare class LearningMobilenetImage implements LearningInterface {
     readonly MOBILE_NET_INPUT_CHANNEL = 3;
     readonly IMAGE_NORMALIZATION_FACTOR = 255;
     constructor({ modelURL, // 디폴트 mobilenet 이미지 
-    epochs, batchSize, limitSize, learningRate, }?: {
+    epochs, batchSize, limitSize, learningRate, validateRate, }?: {
         modelURL?: string;
         epochs?: number;
         batchSize?: number;
         limitSize?: number;
         learningRate?: number;
+        validateRate?: number;
     });
     onProgress: (progress: number) => void;
     onLoss: (loss: number) => void;
@@ -31,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

@@ -6,9 +6,11 @@ class LearningImage implements LearningInterface {
   epochs: number;
   batchSize: number;
   learningRate: number;
+  validateRate: number;
   labels: string[];
   isRunning: boolean;
   isReady: boolean;
+  isTrainedDone: boolean;
   limitSize: number;
   trainImages: tf.Tensor3D[] = [];
   
@@ -22,14 +24,17 @@ class LearningImage implements LearningInterface {
     batchSize = 16,
     limitSize = 2,
     learningRate = 0.001,
-  }: { modelURL?: string, epochs?: number, batchSize?: number, limitSize?: number, learningRate?: number} = {}) {
+    validateRate = 0.2,
+  }: { modelURL?: string, epochs?: number, batchSize?: number, limitSize?: number, learningRate?: number, validateRate?: number} = {}) {
     this.model = null;
     this.epochs = epochs;
     this.batchSize = batchSize;
     this.learningRate = learningRate;
+    this.validateRate = validateRate;
     this.labels = [];
     this.isRunning = false;
     this.isReady = false;
+    this.isTrainedDone = false;
     this.limitSize = 2;
   }
 
@@ -69,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;
@@ -108,6 +115,7 @@ class LearningImage implements LearningInterface {
       const history = await this.model.fit(inputData, targetData, {
         epochs: this.epochs,
         batchSize: this.batchSize,
+        validationSplit: this.validateRate, // 검증 데이터의 비율 설정
         callbacks: customCallback
       });
       console.log('Model training completed', history);
@@ -151,8 +159,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

@@ -13,10 +13,12 @@ class LearningMobilenetImage implements LearningInterface {
   epochs: number;
   batchSize: number;
   learningRate: number;
+  validateRate: number;
   labels: string[];
   modelURL: string;
   isRunning: boolean;
   isReady: boolean;
+  isTrainedDone: boolean;
   limitSize: number;
   trainImages: tf.Tensor3D[] = [];
   
@@ -31,15 +33,18 @@ class LearningMobilenetImage implements LearningInterface {
     batchSize = 16,
     limitSize = 2,
     learningRate = 0.001,
-  }: { modelURL?: string, epochs?: number, batchSize?: number, limitSize?: number, learningRate?: number} = {}) {
+    validateRate = 0.2,
+  }: { modelURL?: string, epochs?: number, batchSize?: number, limitSize?: number, learningRate?: number, validateRate?: number} = {}) {
     this.model = null;
     this.epochs = epochs;
     this.batchSize = batchSize;
     this.learningRate = learningRate;
+    this.validateRate = validateRate;
     this.labels = [];
     this.modelURL = modelURL;
     this.isRunning = false;
     this.isReady = false;
+    this.isTrainedDone = false;
     this.limitSize = limitSize;
   }
 
@@ -81,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;
@@ -118,6 +125,7 @@ class LearningMobilenetImage implements LearningInterface {
       const history = await this.model.fit(inputData, targetData, {
         epochs: this.epochs,
         batchSize: this.batchSize,
+        validationSplit: this.validateRate, // 검증 데이터의 비율 설정
         callbacks: customCallback
       });
       console.log('Model training completed', history);
@@ -158,14 +166,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.24",
+  "version": "1.0.26",
   "description": "learning model develop",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",