diff --git a/src/main/java/org/wlld/imageRecognition/TempleConfig.java b/src/main/java/org/wlld/imageRecognition/TempleConfig.java index 6f340de..916a639 100644 --- a/src/main/java/org/wlld/imageRecognition/TempleConfig.java +++ b/src/main/java/org/wlld/imageRecognition/TempleConfig.java @@ -5,7 +5,6 @@ import org.wlld.MatrixTools.MatrixOperation; import org.wlld.config.StudyPattern; import org.wlld.function.ReLu; import org.wlld.function.Sigmod; -import org.wlld.i.OutBack; import org.wlld.imageRecognition.border.BorderBody; import org.wlld.imageRecognition.border.Frame; import org.wlld.nerveCenter.NerveManager; @@ -188,6 +187,10 @@ public class TempleConfig { modelParameter.setDymNerveStudies(modelParameter1.getDymNerveStudies()); modelParameter.setDymOutNerveStudy(modelParameter1.getDymOutNerveStudy()); } + if (isHavePosition) {//存在边框学习模型参数 + modelParameter.setBorderBodyMap(borderBodyMap); + modelParameter.setFrame(frame); + } return modelParameter; } @@ -227,6 +230,13 @@ public class TempleConfig { if (studyPattern == StudyPattern.Accuracy_Pattern) { convolutionNerveManager.insertModelParameter(modelParameter); } + Frame frame = modelParameter.getFrame(); + Map borderBodyMap = modelParameter.getBorderBodyMap(); + if (frame != null && borderBodyMap != null && borderBodyMap.size() > 0) { + isHavePosition = true; + this.frame = frame; + this.borderBodyMap = borderBodyMap; + } } public void setCutThreshold(double cutThreshold) { diff --git a/src/main/java/org/wlld/nerveEntity/ModelParameter.java b/src/main/java/org/wlld/nerveEntity/ModelParameter.java index daf82d4..29a3017 100644 --- a/src/main/java/org/wlld/nerveEntity/ModelParameter.java +++ b/src/main/java/org/wlld/nerveEntity/ModelParameter.java @@ -1,9 +1,13 @@ package org.wlld.nerveEntity; import org.wlld.MatrixTools.Matrix; +import org.wlld.imageRecognition.border.BorderBody; +import org.wlld.imageRecognition.border.Frame; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author lidapeng @@ -16,6 +20,24 @@ public class ModelParameter { private List outNevers = new ArrayList<>();//输出神经元 private List dymNerveStudies = new ArrayList<>();//动态神经元隐层 private DymNerveStudy dymOutNerveStudy = new DymNerveStudy();//动态神经元输出层 + private Map borderBodyMap = new HashMap<>();//border特征集合 + private Frame frame;//先验边框 + + public Map getBorderBodyMap() { + return borderBodyMap; + } + + public void setBorderBodyMap(Map borderBodyMap) { + this.borderBodyMap = borderBodyMap; + } + + public Frame getFrame() { + return frame; + } + + public void setFrame(Frame frame) { + this.frame = frame; + } public List getDymNerveStudies() { return dymNerveStudies; diff --git a/src/test/java/org/wlld/HelloWorld.java b/src/test/java/org/wlld/HelloWorld.java index c7940bb..397a075 100644 --- a/src/test/java/org/wlld/HelloWorld.java +++ b/src/test/java/org/wlld/HelloWorld.java @@ -8,7 +8,6 @@ import org.wlld.imageRecognition.Operation; import org.wlld.imageRecognition.Picture; import org.wlld.imageRecognition.TempleConfig; import org.wlld.nerveEntity.ModelParameter; -import org.wlld.test.Ma; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/wlld/test/Ma.java b/src/test/java/org/wlld/Ma.java similarity index 95% rename from src/main/java/org/wlld/test/Ma.java rename to src/test/java/org/wlld/Ma.java index b29cfaf..d690519 100644 --- a/src/main/java/org/wlld/test/Ma.java +++ b/src/test/java/org/wlld/Ma.java @@ -1,4 +1,4 @@ -package org.wlld.test; +package org.wlld; import org.wlld.MatrixTools.Matrix; import org.wlld.i.OutBack;