From 22dbd3480549d7fb09fea3c151a80ffca2202a4b Mon Sep 17 00:00:00 2001
From: lidapeng <ldp@weds.com.cn>
Date: Sat, 8 Feb 2020 10:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=82=E6=95=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=92=8C=E6=B3=A8=E5=85=A5BUG=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  2 +-
 .../wlld/imageRecognition/TempleConfig.java   |  5 ++-
 src/test/java/org/wlld/HelloWorld.java        | 44 +++++++++----------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6aa88ff..d280c68 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,8 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="myBrain" />
         <module name="ImageMarket" />
+        <module name="myBrain" />
       </profile>
     </annotationProcessing>
   </component>
diff --git a/src/main/java/org/wlld/imageRecognition/TempleConfig.java b/src/main/java/org/wlld/imageRecognition/TempleConfig.java
index a7e85e7..f7ebae4 100644
--- a/src/main/java/org/wlld/imageRecognition/TempleConfig.java
+++ b/src/main/java/org/wlld/imageRecognition/TempleConfig.java
@@ -344,10 +344,13 @@ public class TempleConfig {
             nerveManager.insertModelParameter(modelParameter);
         }
         if (isHavePosition) {
-            frame = modelParameter.getFrame();
+            if (modelParameter.getFrame() != null) {
+                frame = modelParameter.getFrame();
+            }
             //边框K均值模型注入
             Map<Integer, KBorder> borderMap = modelParameter.getBorderMap();
             if (borderMap != null && borderMap.size() > 0) {
+                boxReady = true;
                 for (Map.Entry<Integer, KBorder> entry : borderMap.entrySet()) {
                     int key = entry.getKey();
                     KClustering kClustering = kClusteringMap.get(key);
diff --git a/src/test/java/org/wlld/HelloWorld.java b/src/test/java/org/wlld/HelloWorld.java
index cfed9d3..80c748b 100644
--- a/src/test/java/org/wlld/HelloWorld.java
+++ b/src/test/java/org/wlld/HelloWorld.java
@@ -31,34 +31,32 @@ public class HelloWorld {
         Picture picture = new Picture();
         TempleConfig templeConfig = new TempleConfig();
         templeConfig.setHavePosition(true);
-        Frame frame = new Frame();
-        frame.setWidth(3024);
-        frame.setHeight(4032);
-        frame.setLengthHeight(100);
-        frame.setLengthWidth(100);
-        templeConfig.setFrame(frame);
-        ModelParameter modelParameter = JSONObject.parseObject(ModelData.DATA, ModelParameter.class);
+//        Frame frame = new Frame();
+//        frame.setWidth(3024);
+//        frame.setHeight(4032);
+//        frame.setLengthHeight(100);
+//        frame.setLengthWidth(100);
+//        templeConfig.setFrame(frame);
+        ModelParameter modelParameter = JSONObject.parseObject(ModelData.DATA2, ModelParameter.class);
+        //ModelParameter modelParameter1 = JSONObject.parseObject(ModelData.DATA, ModelParameter.class);
         templeConfig.init(StudyPattern.Accuracy_Pattern, true, 3204, 4032, 1);
         templeConfig.insertModel(modelParameter);
         Operation operation = new Operation(templeConfig);
-        for (int i = 1; i < 100; i++) {//faster rcnn神经网络学习
-            System.out.println("study==" + i);
-            //读取本地URL地址图片,并转化成矩阵
-            Matrix right = picture.getImageMatrixByLocal("/Users/lidapeng/Desktop/myDocment/c/c" + i + ".png");
-            Matrix wrong = picture.getImageMatrixByLocal("/Users/lidapeng/Desktop/myDocment/b/b" + i + ".png");
-            //将图像矩阵和标注加入进行学习，Accuracy_Pattern 模式 进行第二次学习
-            //第二次学习的时候，第三个参数必须是 true
-            operation.learning(right, 1, true);
-            operation.learning(wrong, 0, true);
-        }
-        templeConfig.boxStudy();//边框聚类
-        //精准模式在全部学习结束的时候一定要使用此方法，速度模式不要调用此方法
-        templeConfig.startLvq();//原型向量量化
+//        for (int i = 1; i < 120; i++) {//faster rcnn神经网络学习
+//            System.out.println("study==" + i);
+//            //读取本地URL地址图片,并转化成矩阵
+//            Matrix right = picture.getImageMatrixByLocal("/Users/lidapeng/Desktop/myDocment/c/c" + i + ".png");
+//            Matrix wrong = picture.getImageMatrixByLocal("/Users/lidapeng/Desktop/myDocment/b/b" + i + ".png");
+//            //将图像矩阵和标注加入进行学习，Accuracy_Pattern 模式 进行第二次学习
+//            //第二次学习的时候，第三个参数必须是 true
+//            operation.learning(right, 1, true);
+//            operation.learning(wrong, 0, true);
+//        }
+//        templeConfig.boxStudy();//边框聚类
+//        //精准模式在全部学习结束的时候一定要使用此方法，速度模式不要调用此方法
+//        templeConfig.startLvq();//原型向量量化
         //templeConfig.boxStudy();//边框回归
         //templeConfig.clustering();//进行聚类
-//        ModelParameter modelParameter1 = templeConfig.getModel();
-//        String a = JSON.toJSONString(modelParameter1);
-//        System.out.println(a);
         for (int j = 1; j < 2; j++) {
             Matrix right = picture.getImageMatrixByLocal("/Users/lidapeng/Desktop/myDocment/c/c" + j + ".png");
             Map<Integer, List<FrameBody>> map = operation.lookWithPosition(right, j);