learning_model 1.0.28 → 1.0.30

package/lib/learning/mobilenet_image.ts

@@ -5,6 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 import * as tf from '@tensorflow/tfjs';
+import { io } from '@tensorflow/tfjs-core';
 import LearningInterface from './base';
 import { ImageToTensor } from './util';
 
@@ -59,6 +60,8 @@ class LearningMobilenetImage implements LearningInterface {
 
   public onTrainEnd: (log: any) => void = () => {};
 
+  public onEpochEnd: (epoch: number, logs: any) => void = () => {};
+
   
   // 학습 데이타 등록 
   public async addData(label: string, data: any): Promise<void> {
@@ -139,7 +142,6 @@ 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'));
     }
@@ -154,12 +156,11 @@ 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 + result);
+          classProbabilities.set(className, existingProbability + probability);
         } else {
-          classProbabilities.set(className, result);
+          classProbabilities.set(className, probability);
         }
       }
       console.log('Class Probabilities:', classProbabilities);
@@ -171,12 +172,12 @@ class LearningMobilenetImage implements LearningInterface {
 
   
   // 모델 저장
-  public async saveModel(): Promise<void> {
+  public async saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): 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');
+    await this.model?.save(handlerOrURL, config);
   }
 
 

package/lib/learning/util.ts

@@ -7,6 +7,7 @@ export function ImageToTensor(data: any): tf.Tensor3D {
     if (data instanceof tf.Tensor) {
         tensor = data;
     } else {
+       // MobileNet 모델 로드
         tensor = tf.browser.fromPixels(data);
     }
 

package/package.json

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

package/yarn-error.log

@@ -1,33 +1,33 @@
 Arguments: 
-  /Users/jeongseong-gyun/.nvm/versions/node/v16.11.1/bin/node /usr/local/bin/yarn start
+  /Users/user/.nvm/versions/node/v14.17.3/bin/node /usr/local/Cellar/yarn/1.22.10/libexec/bin/yarn.js start
 
 PATH: 
-  /Users/jeongseong-gyun/.nvm/versions/node/v16.11.1/bin:/Users/jeongseong-gyun/local/bin:/usr/local/Cellar/pyenv-virtualenv/1.1.5/shims:/Users/jeongseong-gyun/.pyenv/shims:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/Library/Apple/usr/bin:/usr/local/go/bin:/Users/jeongseong-gyun/go/bin:/Users/jeongseong-gyun/Documents/flutter/bin:/Users/jeongseong-gyun/Documents/Work/sonar-scanner-4.6.0.2311-macosx/bin
+  /Users/user/.local/bin:/usr/local/Cellar/pyenv-virtualenv/1.2.1/shims:/Users/user/.pyenv/shims:/Users/user/.pyenv/bin:/usr/local/opt/openssl@1.1/bin:/Users/user/.nvm/versions/node/v14.17.3/bin:/Users/user/go/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/go/bin:/Applications/Visual Studio Code.app/Contents/Resources/app/bin/
 
 Yarn version: 
   1.22.10
 
 Node version: 
-  16.11.1
+  14.17.3
 
 Platform: 
   darwin x64
 
 Trace: 
   Error: Failed to replace env in config: ${NODE_AUTH_TOKEN}
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:98430:13
+      at /usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:98870:13
       at String.replace (<anonymous>)
-      at envReplace (/usr/local/lib/node_modules/yarn/lib/cli.js:98425:16)
-      at Function.normalizeConfig (/usr/local/lib/node_modules/yarn/lib/cli.js:31887:69)
-      at NpmRegistry.<anonymous> (/usr/local/lib/node_modules/yarn/lib/cli.js:31917:34)
+      at envReplace (/usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:98865:16)
+      at Function.normalizeConfig (/usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:31887:69)
+      at NpmRegistry.<anonymous> (/usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:31917:34)
       at Generator.next (<anonymous>)
-      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+      at step (/usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:310:30)
+      at /usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:321:13
 
 npm manifest: 
   {
     "name": "learning_model",
-    "version": "1.0.26",
+    "version": "1.0.28",
     "description": "learning model develop",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",