返回prob

Hu Chunming
1 parent cee436d5
Showing 6 changed files with 45 additions and 19 deletions
src/PicAnalysis.cpp
src/ai_engine_module/MotorPhoneAnalysis.cpp
src/ai_engine_module/MotorPhoneAnalysis.h
src/ai_engine_module/MotorRainshedAnalysis.cpp
src/ai_engine_module/MotorRainshedAnalysis.h
src/village_inc.h
@@ -316,16 +316,16 @@ vector&lt;AnalysisResult&gt; PicAnalysis::analysis_img(vector&lt;sy_img&gt; vec_img){
                 vector<sy_img> vec_motor_img;
                 vec_motor_img.push_back(img);
-                vector<int> vec_rainshed_result = m_motor_rainshed_algorithm.detect(vec_motor_img);
-                if (vec_rainshed_result.size() > 0)
-                {
-                    result_info.rainshed = vec_rainshed_result[0];
+                vector<MotorRainshedResult> vec_rainshed_result = m_motor_rainshed_algorithm.detect(vec_motor_img);
+                if (vec_rainshed_result.size() > 0) {
+                    result_info.rainshed = vec_rainshed_result[0].rainshed;
+                    result_info.rainshed_prob = vec_rainshed_result[0].prob;
                 }
-                vector<int> vec_phone_result = m_motor_phone_algorithm.detect(vec_motor_img);
-                if (vec_phone_result.size() > 0)
-                {
-                    result_info.phoning = vec_phone_result[0];
+                vector<MotorPhoneResult> vec_phone_result = m_motor_phone_algorithm.detect(vec_motor_img);
+                if (vec_phone_result.size() > 0) {
+                    result_info.phoning = vec_phone_result[0].phoning;
+                    result_info.phoning_prob = vec_phone_result[0].prob;
                 }
                 std::vector<HumanCarResult> vec_hcp_result = m_human_car_algorithm.detect(vec_motor_img);
@@ -29,9 +29,9 @@ int MotorPhoneAnalysis::init(int devId){
     return SY_SUCCESS;
 }
-vector<int> MotorPhoneAnalysis::detect(vector<sy_img> vec_img){
+vector<MotorPhoneResult> MotorPhoneAnalysis::detect(vector<sy_img> vec_img){
-    vector<int> vec_result;
+    vector<MotorPhoneResult> vec_result;
     const int batchsize = vec_img.size();
@@ -55,10 +55,20 @@ vector&lt;int&gt; MotorPhoneAnalysis::detect(vector&lt;sy_img&gt; vec_img){
         }
         for(int batchIdx = 0; batchIdx < batchsize; batchIdx ++){
-            printf("debug det num:%d\n",results[batchIdx].objcount);
+            MotorPhoneResult one_result;
+            one_result.phoning = -1;
+            one_result.prob = 0;
             for (int i = 0; i < results[batchIdx].objcount; i++) {
                 printf("  %d:%.2f \n", results[batchIdx].objinfo[i].index,results[batchIdx].objinfo[i].confidence);
+                if (results[batchIdx].objinfo[i].index == 1) {
+                    // 骑车打电话
+                    one_result.phoning = results[batchIdx].objinfo[i].index;
+                    one_result.prob = results[batchIdx].objinfo[i].confidence;
+                    break;
+                }
             }
+
+            vec_result.push_back(one_result);
         }
     } while (0);
 #include "include.h"
+struct MotorPhoneResult {
+    int phoning;
+    float prob;
+};
+
 class MotorPhoneAnalysis
 {
 public:
@@ -8,7 +13,7 @@ public:
     int init(int devId);
-    vector<int> detect(vector<sy_img> vec_img);
+    vector<MotorPhoneResult> detect(vector<sy_img> vec_img);
 private:
     int release();
@@ -29,9 +29,9 @@ int MotorRainshedAnalysis::init(int devId){
     return SY_SUCCESS;
 }
-vector<int> MotorRainshedAnalysis::detect(vector<sy_img> vec_img){
+vector<MotorRainshedResult> MotorRainshedAnalysis::detect(vector<sy_img> vec_img){
-    vector<int> vec_result;
+    vector<MotorRainshedResult> vec_result;
     const int batchsize = vec_img.size();
@@ -55,8 +55,12 @@ vector&lt;int&gt; MotorRainshedAnalysis::detect(vector&lt;sy_img&gt; vec_img){
         }
         for(int batchIdx = 0;batchIdx<batchsize;batchIdx++){
-            printf("index:%d,confidence:%f\n",results[batchIdx].index,results[batchIdx].score);
-            vec_result.push_back(results[batchIdx].index);
+            // printf("index:%d,confidence:%f\n",results[batchIdx].index,results[batchIdx].score);
+            
+            MotorRainshedResult one_result;
+            one_result.rainshed = results[batchIdx].index;
+            one_result.prob = results[batchIdx].score;
+            vec_result.push_back(one_result);
         }
     } while (0);
 #include "include.h"
+struct MotorRainshedResult {
+    int rainshed;
+    float prob;
+};
+
 class MotorRainshedAnalysis
 {
 public:
@@ -8,7 +13,7 @@ public:
     int init(int devId);
-    vector<int> detect(vector<sy_img> vec_img);
+    vector<MotorRainshedResult> detect(vector<sy_img> vec_img);
 private:
     int release();
@@ -37,8 +37,9 @@ typedef struct VehicleInfo {
     int type;
-    int vpt_type;
+    int vpt_type;       // person 人;bike 自行车 ; motor 摩托车;tricycle 三轮车;car 汽车; bigbus  大巴;lorry 货车;tractor 拖拉机;midibus  面包/中巴
     int rainshed;		//是否安装雨棚， 0 有雨棚   1 无雨棚
+    float rainshed_prob;
     int truck_manned;
     int motor_manned;
@@ -46,7 +47,8 @@ typedef struct VehicleInfo {
     int human_lower_color;
     int reverse_driving;    // 0 正常行驶   1 逆行   -1 未知
-    int phoning;        // 骑车打电话
+    int phoning;        // 骑车打电话 1 为是，其他为否
+    float phoning_prob;
     int cross_line;         // 压实线， 1 黄实线 2 白实线  -1 其他
     int cross_diversion_line;   // 压导流线   1 压了  -1 未压