README.md

@@ -1,3 +1,2 @@
 # Train_Identify
 
-支持单摄像头识别，支持集装箱号识别

config/matrix.yaml

@@ -32,11 +32,21 @@ connects:
   MoveEngine_0_1: "SaveMoveInfoEngine_0_0 1024"
   SaveMoveImageEngine_0_0: "TrainStep1DataReadEngine_0_0 1024"
   TrainStep1DataReadEngine_0_0: "TrainStep1InferenceEngine_0_0 1024"
+#  TrainStep1DataReadEngine_0_1: "ContainerStep1InferenceEngine_0_0 1024"
+#  TrainStep1InferenceEngine_0_0: "Step1MergeEngine_0_0 1024"
+#  ContainerStep1InferenceEngine_0_0: "Step1MergeEngine_0_1 1024"
+#  Step1MergeEngine_0_0: "TrainStep1FilterEngine_0_0 1024"
   TrainStep1InferenceEngine_0_0: "TrainStep1FilterEngine_0_0 1024"
   TrainStep1FilterEngine_0_0: "TrainDivideEngine_0_0 1024"
   TrainDivideEngine_0_0: "TrainStep2DataReadEngine_0_0 1024"
   TrainStep2DataReadEngine_0_0: "TrainStep2InferenceEngine_0_0 1024"
+#  TrainStep2DataReadEngine_0_1: "ContainerStep2InferenceEngine_0_0 1024"
   TrainStep2InferenceEngine_0_0: "TrainCharacterConversionEngine_0_0 1024"
+#  ContainerStep2InferenceEngine_0_0: "ContainerCharacterConversionEngine_0_0 1024"
+#  TrainCharacterConversionEngine_0_0: "Step2MergeEngine_0_0 1024"
+#  ContainerCharacterConversionEngine_0_0: "Step2MergeEngine_0_1 1024"
+#  Step2MergeEngine_0_0: "SelectBestEngine_0_0 1024"
+#  Step2MergeEngine_0_1: "SaveDebugImageEngine_0_0 1024"
   TrainCharacterConversionEngine_0_0: "SelectBestEngine_0_0 1024"
   TrainCharacterConversionEngine_0_1: "SaveDebugImageEngine_0_0 1024"
   SelectBestEngine_0_0: "SaveResultCSVEngine_0_0 1024"

engine/DeleteExpiredFolderEngine/DeleteExpiredFolderEngine.h

@@ -30,9 +30,6 @@ public:
     APP_ERROR Process() override;
 
 private:
-    ai_matrix::BaseConfig baseConfig_;
-    ai_matrix::IdentifyConfig identifyConfig_;
-
     // 获取某月有多少天
     int DaysInMonth(int year, int month);
     // 解析字符串为日期结构体

engine/Step2DataReadEngine/TrainStep2DataReadEngine.cpp

@@ -165,7 +165,7 @@ APP_ERROR TrainStep2DataReadEngine::Process()
             pVStep2InputData->vecSingleData = vecSingleData;
             pVStep2InputData->iFrameId = iFrameId;
             pVStep2InputData->cvImage = cv::imread(strImagePath);
-            pVStep2InputData->bIsEnd = !jvFrameInfo.isMember("isEnd") || jvFrameInfo["isEnd"].asBool();
+            pVStep2InputData->bIsEnd = jvFrameInfo.isMember("isEnd") ? jvFrameInfo["isEnd"].asBool() : true;
 
             outputQueMap_[strPort0_]->push(std::static_pointer_cast<void>(pVStep2InputData), true);
             // outputQueMap_[strPort1_]->push(std::static_pointer_cast<void>(pVStep2InputData), true);