From d5ae54ceb9770963fbe88aa0170c08d0ae648b05 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 16:21:56 +0800
Subject: [PATCH] 删除一些不必要的代码，添加一些注释
---
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
index 1c7ca29..3281d1c 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
@@ -62,6 +62,7 @@
DBG("m_dbRWLocks ok");
m_dbRWLocks_Lock.unlock();
// ClockTimer clockTimer("compare ");
+ //淇濇姢 t_compareResults
RWLock t_rwLock;
m_rwLock.rdlock();
@@ -80,12 +81,15 @@
FaceResult tface{0, data.uuid, alarmData->tableName, sc, data.faceUrl, data.idcard, ""};
t_rwLock.wrlock();
//#todo
+ // 瀵规瘮缁撴灉淇濆瓨
if (sc < t_compareResults.end()->second.confidence) {
t_rwLock.unlock();
return;
}
+ // 淇濆瓨瀵规瘮缁撴灉
t_compareResults.insert(make_pair(tface.confidence, tface));
//#todo 10
+ // 鍙繚鐣欐渶楂樼殑n涓姣旂粨鏋�
if (t_compareResults.size() > topN) {
t_compareResults.erase((--t_compareResults.end()), t_compareResults.end());
}
@@ -123,6 +127,7 @@
auto &t_topResult = topResult[key];
DBG("topResult[key] ok");
t_topResult.clear();
+ // 瀵规瘮缁撴灉杞崲
for (auto &item : t_compareResults) {
auto &it = item.second;
//#todo
@@ -203,16 +208,8 @@
m_tableName = str_tab.substr(1, str_tab.length() - 2);//.append("_fea");
DBG("m_tableName is " << m_tableName);
-// string tet = "./syncDBClient ";
-// string str_json = writer.write(t_json);
-// tet.append("\"" + str_json.substr(0, str_json.length() - 1) + "\" ");
-// INFO(tet);
-// system(tet.c_str());
dataMap.clear();
try {
- // init
-// BISTL::BiMapFeaData biMapFeaData(m_tableName);
-// auto mymap = biMapFeaData.getMap();
auto mymap = m_erlangDbTool->loadFaceFeaData(m_tableName);
DBG(m_tableName << " db size is " << mymap.size());
@@ -231,29 +228,10 @@
test.enabled = it.enable;
test.monLevel = it.monLevel;
}
-// //#todo
-// for (auto it = mymap->begin(); it != mymap->end(); it++) {
-// string str_uuid(it->second.m_id.data());
-// string ft(it->second.m_feature.data());
-// string imgUrl(it->second.m_imgUrl.data());
-// string strIdCard(it->second.m_idcard.data());
-// string str2;
-// str2 = base64.Decode(ft.data(), ft.length());
-// std::vector<unsigned char> t_fea;
-// t_fea.resize(str2.size());
-// memcpy(t_fea.data(), str2.data(), str2.size());
-// auto &test = dataMap[str_uuid];
-// test.uuid = str_uuid;
-// test.features.push_back(t_fea);
-// test.faceUrl = imgUrl;
-// test.idcard = strIdCard;
-// }
} catch (const std::exception &e) {
printf("Exception:%s\n", e.what());
-// BISTL::shared_memory_object::remove(m_tableName.c_str());
}
appPref.setIntData(m_tableName, 1);
-// BISTL::shared_memory_object::remove(m_tableName.c_str());
} else {
//#todo get sqlite3 data
m_tableName = t_json["tableName"].asCString();
--
Gitblit v1.8.0