NanjingForestryUniversity/supermachine-tobacco
3
0
Fork 0
mirror of https://github.com/NanjingForestryUniversity/supermachine-tobacco.git synced 2025-11-08 14:23:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

采了新数据

Browse Source
This commit is contained in:
FEIJINTI 2022-07-21 14:12:12 +08:00
parent 0f5c8dae17
commit be54646190
4 changed files with 225 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
01_dataset.ipynb
View File

File diff suppressed because one or more lines are too long

33
02_classification.ipynb
View File

@ -13,7 +13,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 6, "execution_count": 1,
"metadata": { "metadata": {
"pycharm": { "pycharm": {
"name": "#%%\n" "name": "#%%\n"
@ -94,7 +94,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 9, "execution_count": 2,
"metadata": { "metadata": {
"pycharm": { "pycharm": {
"name": "#%%\n" "name": "#%%\n"
@ -107,12 +107,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 10, "execution_count": 3,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [ "outputs": [
{ {
"name": "stdout", "name": "stdout",
@ -133,11 +128,29 @@
"source": [ "source": [
"# model.fit(x, world_boundary, threshold, negative_sample_size=negative_sample_num, train_size=0.7,\n", "# model.fit(x, world_boundary, threshold, negative_sample_size=negative_sample_num, train_size=0.7,\n",
"# is_save_dataset=True, model_selection='dt')\n", "# is_save_dataset=True, model_selection='dt')\n",
"data = scipy.io.loadmat('data/dataset/dataset_2022-07-19_17-06.mat')\n", "data = scipy.io.loadmat('data/dataset/dataset_2022-07-20_10-04.mat')\n",
"x, y = data['x'], data['y'].ravel()\n", "x, y = data['x'], data['y'].ravel()\n",
"model.fit(x, y=y, is_generate_negative=False, model_selection='dt')\n", "model.fit(x, y=y, is_generate_negative=False, model_selection='dt')\n",
"model.save()" "model.save()"
] ],
"metadata": {
"collapsed": false,
"pycharm": {
"name": "#%%\n"
}
}
},
{
"cell_type": "code",
"execution_count": null,
"outputs": [],
"source": [],
"metadata": {
"collapsed": false,
"pycharm": {
"name": "#%%\n"
}
}
} }
], ],
"metadata": { "metadata": {

84
03_data_update.ipynb
View File

File diff suppressed because one or more lines are too long

16
main_test.py
View File

@ -31,7 +31,7 @@ def virtual_main(detector: Detector, test_img=None, test_img_dir=None, test_mode
else: else:
raise TypeError("test img should be np.ndarray or str") raise TypeError("test img should be np.ndarray or str")
t1 = time.time() t1 = time.time()
# img = cv2.resize(img, (1024, 256)) img = cv2.resize(img, (1024, 256))
t2 = time.time() t2 = time.time()
result = 1 - detector.predict(img) result = 1 - detector.predict(img)
t3 = time.time() t3 = time.time()
@ -55,7 +55,13 @@ def virtual_main(detector: Detector, test_img=None, test_img_dir=None, test_mode
if __name__ == '__main__': if __name__ == '__main__':
detector = AnonymousColorDetector(file_path='dt_2022-07-19_17-07.model') detector = AnonymousColorDetector(file_path='dt_2022-07-20_14-40.model')
virtual_main(detector, test_img=r'data/dataset/img/yangeng.bmp', test_model=True) virtual_main(detector,
virtual_main(detector, test_img=r'data/dataset/img/yangeng.bmp', test_model=True) test_img=r'C:\Users\FEIJINTI\Desktop\720\binning1\tobacco\Image_2022_0720_1354_46_472-003051.bmp',
virtual_main(detector, test_img=r'data/dataset/img/yangeng.bmp', test_model=True) test_model=True)
virtual_main(detector,
test_img=r'C:\Users\FEIJINTI\Desktop\720\binning1\tobacco\Image_2022_0720_1354_46_472-003051.bmp',
test_model=True)
virtual_main(detector,
test_img=r'C:\Users\FEIJINTI\Desktop\720\binning1\tobacco\Image_2022_0720_1354_46_472-003051.bmp',
test_model=True)