From a1a053f23331af2a55bb36bc190991265b94f373 Mon Sep 17 00:00:00 2001
From: cmhu <2657262686@qq.com>
Date: Mon, 13 Jan 2025 17:30:46 +0800
Subject: [PATCH] 修正人骑车逻辑错误

---
 src/PicAnalysis.cpp                       |  2 +-
 src/ai_engine_module/HumanCarAnalysis.cpp | 37 +++++++++++++++++++++++++++++++------
 src/ai_engine_module/HumanCarAnalysis.h   | 30 ++++++++++++++++++++++++++++--
 src/village_inc.h                         |  4 ++--
 4 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/PicAnalysis.cpp b/src/PicAnalysis.cpp
index 52a3e81..d1fc2ba 100644
--- a/src/PicAnalysis.cpp
+++ b/src/PicAnalysis.cpp
@@ -330,7 +330,7 @@ vector<AnalysisResult> PicAnalysis::analysis_img(vector<sy_img> vec_img){
 
                 std::vector<HumanCarResult> vec_hcp_result = m_human_car_algorithm.detect(vec_motor_img);
                 if (vec_hcp_result.size() > 0 && road_info.vec_direct.size() > 0) {
-                    int head_or_tail = vec_hcp_result[11].type;
+                    int head_or_tail = vec_hcp_result[0].orient;
                     if (head_or_tail == 0 || head_or_tail == 1) {
                         result_info.reverse_driving = m_road_seg_algorithm.check_reverse_driving(road_info.vec_direct, vehicle_rect, src.width, src.height, head_or_tail);
                     }
diff --git a/src/ai_engine_module/HumanCarAnalysis.cpp b/src/ai_engine_module/HumanCarAnalysis.cpp
index dd6ef45..9125318 100644
--- a/src/ai_engine_module/HumanCarAnalysis.cpp
+++ b/src/ai_engine_module/HumanCarAnalysis.cpp
@@ -52,12 +52,37 @@ std::vector<HumanCarResult> HumanCarAnalysis::detect(vector<sy_img> vec_img){
         }
         
         for(int batchIdx = 0;batchIdx<batchsize;batchIdx++){ 
-            for (int i = 0; i < HCP_ATTRI_INDEX_SIZE; i++) {   
-                HumanCarResult one_result;
-                one_result.type = results[batchIdx].res_objs[i].res_index;
-                one_result.prob = results[batchIdx].res_objs[i].res_prob;
-                vec_result.push_back(one_result);
-            }
+            HumanCarResult one_result;
+            one_result.head = results[batchIdx].res_objs[0].res_index;                   
+            one_result.head_prob = results[batchIdx].res_objs[0].res_prob;
+            one_result.eye = results[batchIdx].res_objs[1].res_index;                    
+            one_result.eye_prob = results[batchIdx].res_objs[1].res_prob;
+            one_result.mouth = results[batchIdx].res_objs[2].res_index;                  
+            one_result.mouth_prob = results[batchIdx].res_objs[2].res_prob;
+            one_result.weibo = results[batchIdx].res_objs[3].res_index;                  
+            one_result.weibo_prob = results[batchIdx].res_objs[3].res_prob;
+            one_result.up_wear = results[batchIdx].res_objs[4].res_index;                
+            one_result.up_wear_prob = results[batchIdx].res_objs[4].res_prob;
+            one_result.up_color = results[batchIdx].res_objs[5].res_index;               
+            one_result.up_color_prob = results[batchIdx].res_objs[5].res_prob;
+            one_result.up_tex = results[batchIdx].res_objs[6].res_index;                 
+            one_result.up_tex_prob = results[batchIdx].res_objs[6].res_prob;
+            one_result.bag = results[batchIdx].res_objs[7].res_index;                    
+            one_result.bag_prob = results[batchIdx].res_objs[7].res_prob;
+            one_result.sex = results[batchIdx].res_objs[8].res_index;                    
+            one_result.sex_prob = results[batchIdx].res_objs[8].res_prob;
+            one_result.age = results[batchIdx].res_objs[9].res_index;                    
+            one_result.age_prob = results[batchIdx].res_objs[9].res_prob;
+            one_result.carColor = results[batchIdx].res_objs[10].res_index;               
+            one_result.carColor_prob = results[batchIdx].res_objs[10].res_prob;
+            one_result.orient = results[batchIdx].res_objs[11].res_index;                 
+            one_result.orient_prob = results[batchIdx].res_objs[11].res_prob;
+            one_result.dasan = results[batchIdx].res_objs[12].res_index;                  
+            one_result.dasan_prob = results[batchIdx].res_objs[12].res_prob;
+            one_result.take = results[batchIdx].res_objs[13].res_index;                   
+            one_result.take_prob = results[batchIdx].res_objs[13].res_prob;
+
+            vec_result.push_back(one_result);
         }
     } while (0);
 
diff --git a/src/ai_engine_module/HumanCarAnalysis.h b/src/ai_engine_module/HumanCarAnalysis.h
index 1f0e14f..3b57967 100644
--- a/src/ai_engine_module/HumanCarAnalysis.h
+++ b/src/ai_engine_module/HumanCarAnalysis.h
@@ -2,8 +2,34 @@
 #include "human_car_parsing.h"
 
 struct HumanCarResult {
-    int type;
-    float prob;
+    int head;                   // 0 – (长发) , 1 - (短发) , 2 - (光头) , 3 -( 帽子),  4- (头盔), 5– (其他)
+    float head_prob;
+    int eye;                    // 0 – (未戴眼镜) , 1 - (戴眼镜) 
+    float eye_prob;
+    int mouth;                  // 0 – (未戴口罩) , 1 - (戴口罩) 
+    float mouth_prob;
+    int weibo;                  // 0 – (未戴围巾) , 1 - (戴围巾)
+    float weibo_prob;
+    int up_wear;                // 0 – (T恤/背心) , 1 - (衬衫) , 2 - (毛衣) , 3 - (羽绒服) , 4 – (大衣/风衣) , 5 – (外套/夹克/西服) , 6 - (连衣裙) , 7 - (无上衣) , 8 – (其他) 
+    float up_wear_prob;
+    int up_color;               // 0 – (黑) , 1 - (白) , 2 - (红) , 3 - (黄) , 4 – (蓝) , 5 – (绿) , 6 – (灰) , 7 – (多色) , 8 – (其他) 
+    float up_color_prob;
+    int up_tex;                 // 0 – (纯色) , 1 - (碎花) , 2 - (条纹) , 3 - (格子) , 4 – (其他)
+    float up_tex_prob;
+    int bag;                    // 0 – (无包) , 1 - (背包) 
+    float bag_prob;
+    int sex;                    // 0 – (男) , 1 - (女) , 2 - (其他) 
+    float sex_prob;
+    int age;                    // 0 – (小孩) , 1 - (青年) , 2 - (中年) , 3 - (老年) , 4 – (其他) 
+    float age_prob;
+    int carColor;               // 0 – (黑) , 1 - (白) , 2 - (红) , 3 - (黄) , 4 – (蓝) , 5 – (绿) , 6 – (灰/银) , 7 – (多色) , 8 – (其他) 
+    float carColor_prob;
+    int orient;                 // 0 – (正面) , 1 - (背面) , 2 - (侧面)
+    float orient_prob;
+    int dasan;                  // 0 – (无) , 1 - (有) 
+    float dasan_prob;
+    int take;                   // 0 – (无) , 1 - (有)
+    float take_prob;
 };
 
 class HumanCarAnalysis
diff --git a/src/village_inc.h b/src/village_inc.h
index 985fe3a..4dcac5f 100644
--- a/src/village_inc.h
+++ b/src/village_inc.h
@@ -40,8 +40,8 @@ typedef struct VehicleInfo {
     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;
+    int truck_manned{0};
+    int motor_manned{0};
 
     int human_upper_color;
     int human_lower_color;
--
libgit2 0.21.4