提交bug修改

BaseTracker/BaseTrack.cpp

@@ -103,7 +103,7 @@ bool BaseTrack::IsValid()
 {
     return m_update_count >= m_updateValidCount;
 }
-int BaseTrack::GetIouData(std::vector<float>& data, int obj_type)
+int BaseTrack::GetIouData(std::vector<float>& data, int& obj_type)
 {
     if (kf_ == nullptr || m_num_obs > m_num_states)
         return -1;

BaseTracker/BaseTrack.h

@@ -30,7 +30,7 @@ public:
     virtual bool IsLost();//数据是否丢失，如果不更新就会丢失
     virtual bool IsValid();//数据是否有效
 
-    virtual int GetIouData(std::vector<float>& data,int obj_type);
+    virtual int GetIouData(std::vector<float>& data,int& obj_type);
     
     virtual int GetIouDataOrder(std::vector<int>& order) = 0;
     virtual int GetKFDataOrder(std::vector<int>& order) = 0;

BaseTracker/BaseTracker.h

@@ -285,7 +285,7 @@ void BaseTracker<T>::AssociateDetectionsToTrackers(const std::vector<std::vector
             for (int j = 0; j < tracker_states.size(); j++)
             {
                 float* i_ptr = iou_ptr.get();
-                if (1)//det_type[i] == tracker_type[j])
+                if (det_type[i] == tracker_type[j])
                 {
                     iou_matrix[i][j] = i_ptr[i * tracker_states.size() + j];
                 }

BaseTracker/Track3D.cpp

@@ -363,7 +363,7 @@ void Track3D::SetValues(std::vector<float>& data)
         0, 0, 0, 0, 0, 0, 1;
     
 }
-int Track3D::GetIouData(std::vector<float>& data, int obj_type)
+int Track3D::GetIouData(std::vector<float>& data, int& obj_type)
 {
     if (m_obj == nullptr || kf_ == nullptr)
     {

BaseTracker/Track3D.h

@@ -45,7 +45,7 @@ public:
 
     virtual void SetValues(std::vector<float>& data);
 
-    virtual int GetIouData(std::vector<float>& data, int obj_type);
+    virtual int GetIouData(std::vector<float>& data, int& obj_type);
     static void MeasureIouData(const std::vector<float>& input, std::vector<float>& out, int& obj_type);
 
     trackOjbPtr m_obj = nullptr;