From d153925e7bb12b25925c714770ca5ddace38ad3e Mon Sep 17 00:00:00 2001 From: lidapeng Date: Fri, 7 Feb 2020 19:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0LVQ=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=92=8CK=E5=9D=87=E5=80=BC=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=8F=82=E6=95=B0=E7=9A=84=E6=B3=A8=E5=85=A5=E5=92=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/wlld/imageRecognition/TempleConfig.java | 5 +++-- .../java/org/wlld/imageRecognition/border/KClustering.java | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/wlld/imageRecognition/TempleConfig.java b/src/main/java/org/wlld/imageRecognition/TempleConfig.java index 31cbb5e..a7e85e7 100644 --- a/src/main/java/org/wlld/imageRecognition/TempleConfig.java +++ b/src/main/java/org/wlld/imageRecognition/TempleConfig.java @@ -355,12 +355,14 @@ public class TempleConfig { List> lists = kBorder.getLists(); Map boxListMap = kBorder.getPositionMap(); if (lists != null && boxListMap != null && lists.size() > 0 && boxListMap.size() > 0) { - Matrix[] matrices = kClustering.getMatrices(); + kClustering.setReady(true); + Matrix[] matrices = new Matrix[lists.size()]; Map boxMap = kClustering.getPositionMap(); for (int i = 0; i < lists.size(); i++) { Matrix matrix = listToRowVector(lists.get(i)); matrices[i] = matrix; } + kClustering.setMatrices(matrices); kClustering.setLength(kBorder.getLength()); kClustering.setSpeciesQuantity(kBorder.getSpeciesQuantity()); for (Map.Entry boxEntry : boxListMap.entrySet()) { @@ -370,7 +372,6 @@ public class TempleConfig { box.setMatrixPosition(listToRowVector(boxList.getPositionList())); boxMap.put(boxEntry.getKey(), box); } - kClustering.setReady(true); } } diff --git a/src/main/java/org/wlld/imageRecognition/border/KClustering.java b/src/main/java/org/wlld/imageRecognition/border/KClustering.java index 9edc9f3..789f92a 100644 --- a/src/main/java/org/wlld/imageRecognition/border/KClustering.java +++ b/src/main/java/org/wlld/imageRecognition/border/KClustering.java @@ -32,10 +32,6 @@ public class KClustering { this.matrices = matrices; } - public void setPositionMap(Map positionMap) { - this.positionMap = positionMap; - } - public void setReady(boolean ready) { isReady = ready; }