learning_model 1.0.29 → 1.0.31

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 import LearningImage from './learning/image';
 import LearningMobilenetImage from './learning/mobilenet_image';
-export { LearningImage, LearningMobilenetImage };
+import LearningMobilenet from './learning/mobilenet';
+export { LearningImage, LearningMobilenetImage, LearningMobilenet };

package/dist/index.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LearningMobilenetImage = exports.LearningImage = void 0;
+exports.LearningMobilenet = exports.LearningMobilenetImage = exports.LearningImage = void 0;
 const image_1 = __importDefault(require("./learning/image"));
 exports.LearningImage = image_1.default;
 const mobilenet_image_1 = __importDefault(require("./learning/mobilenet_image"));
 exports.LearningMobilenetImage = mobilenet_image_1.default;
+const mobilenet_1 = __importDefault(require("./learning/mobilenet"));
+exports.LearningMobilenet = mobilenet_1.default;

package/dist/learning/mobilenet.js

@@ -38,7 +38,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const tf = __importStar(require("@tensorflow/tfjs"));
-const util_1 = require("./util");
 class LearningMobilenet {
     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, validateRate = 0.2, } = {}) {
@@ -67,13 +66,11 @@ class LearningMobilenet {
         this.limitSize = limitSize;
         this.mobilenetModule = null;
         this.imageTensors = [];
-        this.init();
     }
     // 학습 데이타 등록 
     addData(label, data) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const tensor = (0, util_1.ImageToTensor)(data);
                 const imgTensor = tf.tidy(() => {
                     if (this.mobilenetModule !== null) {
                         console.log('predict before', data);
@@ -108,9 +105,13 @@ class LearningMobilenet {
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            const model = yield this.loadModel();
-            // const load_model = await tf.loadLayersModel(this.modelURL);
-            this.mobilenetModule = model;
+            try {
+                this.mobilenetModule = yield this.loadModel();
+            }
+            catch (error) {
+                console.log('init Error', error);
+                throw error;
+            }
         });
     }
     // 모델 학습 처리

package/dist/lib/index.d.ts

@@ -1,3 +1,4 @@
 import LearningImage from './learning/image';
 import LearningMobilenetImage from './learning/mobilenet_image';
-export { LearningImage, LearningMobilenetImage };
+import LearningMobilenet from './learning/mobilenet';
+export { LearningImage, LearningMobilenetImage, LearningMobilenet };

package/lib/index.ts

@@ -1,4 +1,5 @@
 import LearningImage from './learning/image';
 import LearningMobilenetImage from './learning/mobilenet_image';    
+import LearningMobilenet from './learning/mobilenet';    
 
-export { LearningImage, LearningMobilenetImage };
+export { LearningImage, LearningMobilenetImage, LearningMobilenet };

package/lib/learning/mobilenet.ts

@@ -50,7 +50,6 @@ class LearningMobilenet implements LearningInterface {
     this.limitSize = limitSize;
     this.mobilenetModule = null;
     this.imageTensors = [];
-    this.init();
   }
 
   // 진행 상태를 나타내는 이벤트를 정의합니다.
@@ -69,10 +68,6 @@ class LearningMobilenet implements LearningInterface {
   // 학습 데이타 등록 
   public async addData(label: string, data: any): Promise<void> {
     try {
-      
-     
-      const tensor = ImageToTensor(data)
-
       const imgTensor = tf.tidy(() => {
         if (this.mobilenetModule !== null) {
           console.log('predict before', data);
@@ -105,10 +100,13 @@ class LearningMobilenet implements LearningInterface {
     }
   }
 
-  async init() {
-    const model = await this.loadModel();
-    // const load_model = await tf.loadLayersModel(this.modelURL);
-    this.mobilenetModule = model;
+  public async init() {
+    try {
+      this.mobilenetModule = await this.loadModel();
+    } catch(error) {
+      console.log('init Error', error);
+      throw error;
+    } 
   } 
 
   // 모델 학습 처리

package/package.json

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