From cdcd6c96d0f9dcd0cfa14efbd6002ceeb45de6bb Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 07 五月 2024 16:07:06 +0800
Subject: [PATCH] 打印比对结果
---
compare/compare.go | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/compare/compare.go b/compare/compare.go
index 5b86ce6..8121d58 100644
--- a/compare/compare.go
+++ b/compare/compare.go
@@ -1,8 +1,8 @@
package compare
import (
- "encoding/base64"
"fmt"
+ "sdkCompare/util"
"strconv"
"sdkCompare/cache"
@@ -18,6 +18,8 @@
if args.FaceFeature == nil {
return nil
}
+
+ floatFeat := util.ByteSlice2float32Slice(args.FaceFeature)
//鎸囧畾鏈�浣庡垎
baseScore := thresholdLimit
@@ -36,7 +38,7 @@
if args.TreeNodes != nil && len(args.TreeNodes) > 0 {
for _, id := range args.TreeNodes {
if _, ok := cache.CacheMap.Area[id]; ok {
- targets := cache.CacheMap.Area[id].Walk(DoSdkCompare, args.FaceFeature, baseScore)
+ targets := cache.CacheMap.Area[id].Walk(DoSdkCompare, floatFeat, baseScore)
if len(targets) > 0 {
scResult.CompareResult = append(scResult.CompareResult, targets...)
}
@@ -60,7 +62,7 @@
continue
}
- targets := val.Walk(DoSdkCompare, args.FaceFeature, baseScore)
+ targets := val.Walk(DoSdkCompare, floatFeat, baseScore)
if len(targets) > 0 {
scResult.CompareResult = append(scResult.CompareResult, targets...)
// todo 娣诲姞灏忓尯澶栫殑鍏宠仈鍏崇郴, 涓嬫浼樺厛姣斿
@@ -68,7 +70,11 @@
}
done:
- logger.Debugf("姣斿缁撴灉 %d鏉�", len(scResult.CompareResult))
+ logger.Debugf("姣斿缁撴灉 %d鏉�, %+v", len(scResult.CompareResult), scResult.CompareResult)
+ if len(scResult.CompareResult) > 0 {
+ logger.Debugf("姣斿缁撴灉%+v", scResult.CompareResult)
+ }
+
buf, err := proto.Marshal(&scResult)
if err != nil {
logger.Error("scResult Marshal error!", err)
@@ -78,13 +84,8 @@
return buf
}
-func DoSdkCompare(ci []byte, co string) float32 {
- co_d, err := base64.StdEncoding.DecodeString(co)
- if err != nil {
- logger.Error("DoSdkCompare err:", err)
- return -1
- }
- sec := DecCompare(ci, co_d)
+func DoSdkCompare(ci, co []float32) float32 {
+ sec := DirectCompare(ci, co)
//logger.Debug("姣斿寰楀垎涓猴細", sec)
sec = ParseScore(sec)
--
Gitblit v1.8.0