diff --git a/bin/demo_darwin_amd64 b/bin/demo_darwin_amd64 deleted file mode 100755 index 733c288..0000000 Binary files a/bin/demo_darwin_amd64 and /dev/null differ diff --git a/bin/demo_linux_amd64 b/bin/demo_linux_amd64 deleted file mode 100755 index 7da2298..0000000 Binary files a/bin/demo_linux_amd64 and /dev/null differ diff --git a/build.sh b/build.sh index 509a0a6..83a2e83 100755 --- a/build.sh +++ b/build.sh @@ -32,3 +32,5 @@ fi if [ -f ${BUILD_BINARY_FULL_PATH} ];then cp ${BUILD_BINARY_FULL_PATH} ${BINARY_DIR} fi + +cp ${BUILD_BINARY_FULL_PATH} demo diff --git a/include/easypr/core/plate_locate.h b/include/easypr/core/plate_locate.h index 89cb571..4eb89ca 100644 --- a/include/easypr/core/plate_locate.h +++ b/include/easypr/core/plate_locate.h @@ -63,6 +63,7 @@ class CPlateLocate { int img_index = 0, bool showDebug = false); int plateLocate(Mat, std::vector&, int = 0); + int plateLocate(Mat, std::vector&, int = 0); bool verifySizes(RotatedRect mr); diff --git a/result/accuracy.txt b/result/accuracy.txt index dc835a6..31d1723 100644 --- a/result/accuracy.txt +++ b/result/accuracy.txt @@ -2133,3 +2133,8 @@ Recall:84.2263%, Precise:70.6573%, Fscore:76.8474%. Recall:84.2263%, Precise:70.6573%, Fscore:76.8474%. 0-error:60.4%, 1-error:71.6%, Chinese-precise:73.2% 总时间:165秒, 平均执行时间:0.644531秒 +2016-08-02 20:33:58 +总图片数:256, Plates count:297, 未定位车牌:29, 定位率:90.2357% +Recall:84.2263%, Precise:70.6573%, Fscore:76.8474%. +0-error:60.4%, 1-error:71.6%, Chinese-precise:73.2% +总时间:171秒, 平均执行时间:0.667969秒 diff --git a/src/core/plate_locate.cpp b/src/core/plate_locate.cpp index 8a4a444..750d8da 100644 --- a/src/core/plate_locate.cpp +++ b/src/core/plate_locate.cpp @@ -1048,4 +1048,18 @@ int CPlateLocate::plateLocate(Mat src, vector &resultVec, int index) { return 0; } -} \ No newline at end of file +int CPlateLocate::plateLocate(Mat src, vector &resultVec, int index) { + vector all_result_Plates; + + plateColorLocate(src, all_result_Plates, index); + plateSobelLocate(src, all_result_Plates, index); + plateMserLocate(src, all_result_Plates, index); + + for (size_t i = 0; i < all_result_Plates.size(); i++) { + resultVec.push_back(all_result_Plates[i]); + } + + return 0; +} + +}