From a7817b91bc678223fe4224bbba813b1097715748 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期一, 02 十二月 2019 16:19:21 +0800 Subject: [PATCH] update --- gohumantrack/sdk/cpp_include/sy_human_tracker.h | 49 +++++++++---------------------------------------- 1 files changed, 9 insertions(+), 40 deletions(-) diff --git a/gohumantrack/sdk/include/sy_human_tracker.h b/gohumantrack/sdk/cpp_include/sy_human_tracker.h similarity index 72% rename from gohumantrack/sdk/include/sy_human_tracker.h rename to gohumantrack/sdk/cpp_include/sy_human_tracker.h index 7a0ecd0..00ef0c3 100755 --- a/gohumantrack/sdk/include/sy_human_tracker.h +++ b/gohumantrack/sdk/cpp_include/sy_human_tracker.h @@ -1,10 +1,7 @@ #ifndef SY_HUMAN_TRACKER #define SY_HUMAN_TRACKER - -#include <math.h> - +#include<vector> #define MAX_BG_NUM 2000 -#define FEATURESIZE 128 //ImgData #ifndef __SY_IMG__ #define __SY_IMG__ @@ -14,13 +11,13 @@ int w_;//鍥惧儚瀹藉害 int h_;//鍥惧儚楂樺害 int c_;//鍥惧儚閫氶亾鏁帮紝鐩墠浠呮敮鎸�3閫氶亾 - // void set_data(int m_w, int m_h, int m_c, unsigned char * m_data) - // { - // w_ = m_w; - // h_ = m_h; - // c_ = m_c; - // data_ = m_data; //Shallow copy - // } + void set_data(int m_w, int m_h, int m_c, unsigned char * m_data) + { + w_ = m_w; + h_ = m_h; + c_ = m_c; + data_ = m_data; //Shallow copy + } } sy_img; #endif @@ -33,7 +30,7 @@ int center_x;//琛屼汉鍖呭洿妗嗕腑蹇冪偣x int center_y;//琛屼汉鍖呭洿妗嗕腑蹇冪偣y int ID;//琛屼汉璺熻釜ID - float feature[FEATURESIZE];//琛屼汉涓撳睘鐗瑰緛锛屽彲鐢ㄦ潵鍋歊eID + float feature[128];//琛屼汉涓撳睘鐗瑰緛锛屽彲鐢ㄦ潵鍋歊eID }fgInfo; typedef struct fgRet { @@ -75,33 +72,5 @@ 杩斿洖鍊�:鐗堟湰淇℃伅char* */ const char* getVersion(); - - -/* -鍔熻兘:鐗瑰緛鍊兼瘮瀵� -鍙傛暟:鐗瑰緛鍊�1鍜岀壒寰佸��2 -杩斿洖鍊�:寰楀垎 -*/ -double FF_Similarity(float * feaA, float * feaB) -{ - double norm1 = 0, norm2 = 0; - int i = 0; - double score = 0; - for (i = 0; i < FEATURESIZE; i++) - { - norm1 += feaA[i] * feaA[i]; - norm2 += feaB[i] * feaB[i]; - score += feaA[i] * feaB[i]; - } - - norm1 = sqrt(norm1); - norm2 = sqrt(norm2); - - score = score / (norm1 * norm2); - - if (score < 0) // 鍒跺幓闄ゅ皬鏁伴儴鍒� - score = 0; - return score; -} #endif -- Gitblit v1.8.0