From ef4b6b109f40130c9ab90986518e0d30226a7bc7 Mon Sep 17 00:00:00 2001
From: duanmu <774052669@qq.com>
Date: Sun, 28 May 2023 11:11:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=8E=B0=E5=9C=BA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BA=AE=E5=BA=A6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=92=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=80=89=E5=8F=96?=
 =?UTF-8?q?=E4=BA=AE=E5=BA=A6=E5=A4=A7=E4=BA=8E40=E7=9A=84=E5=83=8F?=
 =?UTF-8?q?=E7=B4=A0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classifer.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/classifer.py b/classifer.py
index f30192c..a7e5e7a 100644
--- a/classifer.py
+++ b/classifer.py
@@ -301,7 +301,7 @@ class WoodClass(object):
         x = cv2.cvtColor(x, cv2.COLOR_BGR2LAB)
         x = np.concatenate((x, x_hsv), axis=2)
         x = np.reshape(x, (x.shape[0] * x.shape[1], x.shape[2]))
-        x = x[x[:, 0] > 30]
+        x = x[x[:, 0] > 40]
         # x = x[np.argsort(x[:, 0])]
         # x = x[-self.k:, :]
 
@@ -474,12 +474,13 @@ class WoodClass(object):
         middle_num = len(x_data[y_data == 1])
         light_num = len(x_data[y_data == 2])
         # 将数据按照亮度进行排序
-        x_data = x_data[np.argsort(x_data[:, 0])]
-        # 按照x的顺序，将y和names也进行排序
-        y_data = y_data[np.argsort(x_data[:, 0])]
-        # 按照x的顺序，将img_names也进行排序，但是这里需要注意，img_names是一个list，所以需要先转换成np.array
-        img_names = [img_names[i] for i in np.argsort(x_data[:, 0])]
-
+        # x_data_sort = x_data[np.argsort(x_data[:, 0])]
+        # # 按照x的顺序，将y和names也进行排序
+        # y_data = y_data[np.argsort(x_data[:, 0])]
+        # # 按照x的顺序，将img_names也进行排序，但是这里需要注意，img_names是一个list，所以需要先转换成np.array
+        # img_names = [img_names[i] for i in np.argsort(x_data[:, 0])]
+        tmp = np.arange(0, 90)
+        tmp = tmp[np.argsort(x_data[:, 0])]
         # 创建一个labels，用于存储每个像素点的标签
         labels = np.zeros_like(x_data[:, 0])
         # 将亮度最低的dark_num个像素点标记为0
@@ -488,6 +489,7 @@ class WoodClass(object):
         labels[-light_num:] = 2
         # 将中间的middle_num个像素点标记为1
         labels[dark_num:-light_num] = 1
+        labels = labels[np.argsort(tmp)]
         if plot_2d:
             plt.figure()
             plt.scatter(x_data[:, 0], x_data[:, 1], c=labels)