diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index a4f6466..39d471a --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ data5 __pycache__ *.pyc test.py -*.log \ No newline at end of file +*.log +.models \ No newline at end of file diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/classifer.py b/classifer.py old mode 100755 new mode 100644 index 16b4691..e9311e1 --- a/classifer.py +++ b/classifer.py @@ -21,7 +21,7 @@ sys.path.append(os.getcwd()) from root_dir import ROOT_DIR import utils -FEATURE_INDEX = [1, 2] +FEATURE_INDEX = [0, 1, 2, 6, 7] class WoodClass(object): @@ -141,7 +141,7 @@ class WoodClass(object): cv2.imwrite(str(self.image_num) + ".bmp", img) self.image_num += 1 feature = self.extract_feature(img, remove_background=False, debug_mode=False) - feature = feature.reshape(1, -1)[:, [1, 2]] + feature = feature.reshape(1, -1)[:, FEATURE_INDEX] if self.isCorrect: feature = feature / (self.correct_color+1e-4) pred_color = self.model.predict(feature) @@ -345,15 +345,15 @@ class WoodClass(object): if __name__ == '__main__': # 初始化wood - wood = WoodClass(w=2048, h=12450, n=5000, debug_mode=False) + wood = WoodClass(w=4096, h=1200, n=3000, debug_mode=False) print("色彩纯度控制量{}/{}".format(wood.k, wood.n)) wood.correct() # wood.load() # fit 相应的文件夹 - wood.fit_pictures(data_path=r"C:\Users\Administrator.DESKTOP-K75IPPC\Desktop\data1108") + wood.fit_pictures(data_path=r"C:\Users\FEIJINTI\PycharmProjects\wood_color") # 测试单张图片的预测,predict_mode=True表示导入本地的model, False为现场训练的 - pic = cv2.imread(r"./data/dark/15.bmp") + pic = cv2.imread(r"./data/dark/rgb60.png") start_time = time.time() for i in range(100): wood_color = wood.predict(pic) diff --git a/pics/TODO.png b/pics/TODO.png old mode 100755 new mode 100644 diff --git a/pics/result.png b/pics/result.png old mode 100755 new mode 100644 diff --git a/pics/从木板中提取色彩.png b/pics/从木板中提取色彩.png old mode 100755 new mode 100644 diff --git a/pics/色彩分类.png b/pics/色彩分类.png old mode 100755 new mode 100644 diff --git a/root_dir.py b/root_dir.py old mode 100755 new mode 100644 index 3c59a52..3a7d5d8 --- a/root_dir.py +++ b/root_dir.py @@ -7,4 +7,4 @@ Created on Nov 3 21:18:26 2020 """ import os -ROOT_DIR = r"C:\Users\Administrator.DESKTOP-K75IPPC\Desktop\wood-color" +ROOT_DIR = r"C:\Users\FEIJINTI\PycharmProjects\wood_color" \ No newline at end of file diff --git a/utils.py b/utils.py old mode 100755 new mode 100644