Fixed errors in test/

include/easypr.h

@@ -1,12 +1,14 @@
 #ifndef EASYPR_EASYPR_H
 #define EASYPR_EASYPR_H
 
-#include "easypr/plate_recognize.h"
-#include "easypr/svm_train.h"
+#include "easypr/core/plate_recognize.h"
+#include "easypr/train/svm_train.h"
+#include "easypr/train/ann_train.h"
 #include "easypr/preprocess/mc_data.h"
 #include "easypr/preprocess/gdts.h"
 #include "easypr/preprocess/deface.h"
-#include "easypr/util.h"
+#include "easypr/util/util.h"
+#include "easypr/util/program_options.h"
 #include "easypr/api.hpp"
 
 #endif //EASYPR_EASYPR_H

include/easypr/api.hpp

@@ -17,11 +17,8 @@ static bool plate_judge(const char* image,const char *model) {
 
   assert(!src.empty());
 
-  CPlateJudge judger;
-  judger.LoadModel(model);
-
   int result;
-  judger.plateJudge(src, result);
+  PlateJudge::instance()->plateJudge(src, result);
 
   return result == 1;
 }
@@ -49,8 +46,6 @@ static std::vector<std::string> plate_recognize(const char* image,
   assert(!img.empty());
 
   CPlateRecognize pr;
-  pr.LoadSVM(model_svm);
-  pr.LoadANN(model_ann);
   pr.setLifemode(life_mode);
   pr.setDebug(false);
 

test/accuracy.hpp

@@ -4,6 +4,7 @@
 #include <easypr.h>
 #include <ctime>
 #include <fstream>
+#include <list>
 
 namespace easypr {
 
@@ -14,9 +15,6 @@ int accuracyTest(const char* test_path) {
 
   CPlateRecognize pr;
 
-  pr.LoadANN("resources/model/ann.xml");
-  pr.LoadSVM("resources/model/svm.xml");
-
   // ÉèÖÃDebugģʽ
   pr.setDebug(false);
 

test/chars.hpp

@@ -34,7 +34,6 @@ int test_chars_identify() {
 
   std::vector<cv::Mat> resultVec;
   CCharsSegment cs;
-  CCharsIdentify ci;
 
   std::string plateIdentify = "";
 
@@ -53,7 +52,7 @@ int test_chars_identify() {
       if (j == 1)
         isSpec = true;
 
-      std::string charcater = ci.charsIdentify(resultMat, isChinses, isSpec);
+      std::string charcater = CharsIdentify::instance()->identify(resultMat, isChinses, isSpec);
       plateIdentify = plateIdentify + charcater;
     }
   }

test/plate.hpp

@@ -65,9 +65,7 @@ int test_plate_judge() {
   }
   destroyWindow("plate_judge");
 
-  CPlateJudge ju;
-  ju.LoadModel("resources/model/svm.xml");
-  int resultJu = ju.plateJudge(matVec, resultVec);
+  int resultJu = PlateJudge::instance()->plateJudge(matVec, resultVec);
 
   if (0 != resultJu)
     return -1;
@@ -114,9 +112,6 @@ int test_plate_recognize() {
   Mat src = imread("resources/image/test.jpg");
 
   CPlateRecognize pr;
-  pr.LoadANN("resources/model/ann.xml");
-  pr.LoadSVM("resources/model/svm.xml");
-
   pr.setLifemode(true);
   pr.setDebug(true);