From 3c775accff7fec667af86aa321d66822cfa9775a Mon Sep 17 00:00:00 2001
From: lihongtao <lihongtao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 29 六月 2017 11:55:16 +0800
Subject: [PATCH] improved search function;
---
FaceServer/STFaceCache.cpp | 20 +++++++++++++-------
FaceServer/make.sh | 2 +-
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/FaceServer/STFaceCache.cpp b/FaceServer/STFaceCache.cpp
index e82a988..9ed8e7b 100644
--- a/FaceServer/STFaceCache.cpp
+++ b/FaceServer/STFaceCache.cpp
@@ -347,7 +347,7 @@
stface_ctx_map_t& dbContext(*(stface_ctx_map_t*)_dbContext);
STFaceCacheContext& cacheContext(*(STFaceCacheContext*)_cacheContext);
- /*
+
for(stface_ctx_map_t::iterator iterCtx = dbContext.begin(); iterCtx != dbContext.end(); ++iterCtx)
{
STFaceDBContext& ctx(iterCtx->second);
@@ -372,10 +372,12 @@
for(top_idx_score_vect_t::iterator it = result.begin(); it != result.end(); ++it)
{
- if(topResult.empty())
- topResult.push_back(FDP_FaceDetectResult(ctx.dbid, it->idx, it->score * 1000));
-
int16_t new_confidence = it->score * 1000;
+
+ if(topResult.empty())
+ topResult.push_back(FDP_FaceDetectResult(ctx.dbid, it->idx, new_confidence));
+
+
else if(new_confidence > topResult.rbegin()->confidence)
{
while(topResult.size() > 4)
@@ -383,16 +385,20 @@
for(fdr_vec_t::reverse_iterator rtTR = topResult.rbegin() + 1; rtTR != topResult.rend(); ++rtTR)
{
if(new_confidence < rtTR->confidence)
- topResult.insert(rtTR, FDP_FaceDetectResult(ctx.dbid, it->idx, new_confidence));
- }
+ {
+ fdr_vec_t::iterator itTR(rtTR.base());
+ topResult.insert(itTR, FDP_FaceDetectResult(ctx.dbid, it->idx, new_confidence));
+ }
+ }
}
}
//LOGP(INFO, "stface_search_db return dbid=%d, idx=%d, score=%f", img.db_id, result[0].idx, result[0].score);
}
- */
+ /*
topResult.push_back(FDP_FaceDetectResult(1, 2, 3));
topResult.push_back(FDP_FaceDetectResult(-1, 2, 4));
topResult.push_back(FDP_FaceDetectResult(1, 6, 5));
+ */
}
\ No newline at end of file
diff --git a/FaceServer/make.sh b/FaceServer/make.sh
index 6fa9386..c0f28cd 100644
--- a/FaceServer/make.sh
+++ b/FaceServer/make.sh
@@ -24,7 +24,7 @@
LDFLAGS+="-pthread -levent $PROTOBUF_LIB $STFACESDK_LIB $OPENCV_LIB $LIBYUV_LIB "
rm *.o
-rm face_server test_client_detect test_client_add
+rm face_server test_client_detect test_client_add test_client_search
g++ $PIPELINE_BASE/Logger/src/logger.cc $CFLAGS $CPPFLAGS
g++ ev_server.cpp -DUSER_DEFINE_EVCLIENT_PROC $CFLAGS $CPPFLAGS
--
Gitblit v1.8.0