From 99a771da9055f9bca629d64bed694ea66c0f21ed Mon Sep 17 00:00:00 2001 From: xinyang Date: Sat, 4 May 2019 11:34:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0CNN=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E5=9B=BE=E5=83=8F=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searching_state/searching_state.cpp | 2 +- armor/src/show_images/show_images.cpp | 31 +- tools/TrainCNN/forward.py | 2 +- tools/para/conv1_b | 12 +- tools/para/conv1_w | 900 +- tools/para/conv2_b | 20 +- tools/para/conv2_w | 1080 +- tools/para/fc1_b | 32 +- tools/para/fc1_w | 22398 ++++++++-------- tools/para/fc2_b | 13 +- tools/para/fc2_w | 178 +- 11 files changed, 12335 insertions(+), 12333 deletions(-) diff --git a/armor/src/armor_finder/state_machine/searching_state/searching_state.cpp b/armor/src/armor_finder/state_machine/searching_state/searching_state.cpp index 2f16b25..2d017bf 100644 --- a/armor/src/armor_finder/state_machine/searching_state/searching_state.cpp +++ b/armor/src/armor_finder/state_machine/searching_state/searching_state.cpp @@ -154,7 +154,7 @@ bool judge_light_color(std::vector &light, std::vector &co bool ArmorFinder::stateSearchingTarget(cv::Mat &src) { cv::Mat split, src_bin; LightBlobs light_blobs, light_blobs_, light_blobs_real; - std::vector armor_boxes, boxes_number[9]; + std::vector armor_boxes, boxes_number[10]; armor_box = cv::Rect2d(0,0,0,0); cv::cvtColor(src, src_gray, CV_BGR2GRAY); diff --git a/armor/src/show_images/show_images.cpp b/armor/src/show_images/show_images.cpp index 265f76b..d5dd299 100644 --- a/armor/src/show_images/show_images.cpp +++ b/armor/src/show_images/show_images.cpp @@ -27,29 +27,14 @@ void showArmorBoxClass(std::string window_names, const cv::Mat &src, vector