From cdcd6c96d0f9dcd0cfa14efbd6002ceeb45de6bb Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 07 五月 2024 16:07:06 +0800
Subject: [PATCH] 打印比对结果
---
cache/shardmap/shardmap.go | 63 ++++++++-----------------------
1 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/cache/shardmap/shardmap.go b/cache/shardmap/shardmap.go
index e53aa38..daf5f85 100644
--- a/cache/shardmap/shardmap.go
+++ b/cache/shardmap/shardmap.go
@@ -4,6 +4,7 @@
import (
"basic.com/pubsub/protomsg.git"
+ "sdkCompare/db"
"sync"
//"encoding/json"
//"fmt"
@@ -28,7 +29,7 @@
var Count = make(chan int)
-type wfOp func(a []byte, b string) float32
+type wfOp func(a, b []float32) float32
/**
* @param uint8, shardCnt must be pow of two
@@ -89,7 +90,7 @@
value interface{}
}
-func (s *ShardMap) Walk(wf wfOp, sourceFea []byte, baseScore float32, isWebComp bool, target string) (targets []*protomsg.SdkCompareEach) {
+func (s *ShardMap) Walk(wf wfOp, sourceFea []float32, baseScore float32) (targets []*protomsg.SdkCompareEach) {
var wg sync.WaitGroup
var lock sync.Mutex
for _, si := range s.shards {
@@ -101,57 +102,25 @@
wg.Add(1)
- go func(st *shardItem, fw wfOp, sf []byte, baseSec float32, isWeb bool) {
+ go func(st *shardItem, fn wfOp, srcFeat []float32, baseSec float32) {
defer wg.Done()
for _, feature := range st.data {
- if eif, ok := feature.(*protomsg.Esinfo); ok {
- if !isWeb { //涓嶄細姣斿鎶撴媿搴�,鍙瘮瀵规湁鏁堢殑浜�
- if eif.Enable == 1 {
- score := float32(0)
- if target == "car" {
- if eif.CarNo != "" {
- score = strComp(sf, eif.CarNo)
- } else {
- continue
- }
- } else {
- score = fw(sf, eif.FaceFeature)
- }
- if score > 0 && score >= baseScore {
- lock.Lock()
- targets = append(targets, &protomsg.SdkCompareEach{
- Id: eif.Id,
- CompareScore: score,
- Tableid: eif.Tableid,
- })
- lock.Unlock()
- }
- }
- } else { //鏉ユ簮鏄痺eb锛屼細姣斿鎶撴媿搴擄紝涓嶇鏄惁鏈夋晥閮介渶瑕佹瘮瀵�
- score := float32(0)
- if target == "car" {
- if eif.CarNo != "" {
- score = strComp(sf, eif.CarNo)
- } else {
- continue
- }
- } else {
- score = fw(sf, eif.FaceFeature)
- }
- if score > 0 && score >= baseScore {
- lock.Lock()
- targets = append(targets, &protomsg.SdkCompareEach{
- Id: eif.Id,
- CompareScore: score,
- Tableid: eif.Tableid,
- })
- lock.Unlock()
- }
+ if item, ok := feature.(*db.FeatureCacheBase); ok {
+ score := float32(0)
+ score = fn(srcFeat, item.FaceFeature)
+ if score > 0 && score >= baseScore {
+ lock.Lock()
+ targets = append(targets, &protomsg.SdkCompareEach{
+ Id: item.Id,
+ CompareScore: score,
+ Tableid: item.TableId,
+ })
+ lock.Unlock()
}
}
}
- }(&tempsi, wf, sourceFea, baseScore, isWebComp)
+ }(&tempsi, wf, sourceFea, baseScore)
}
wg.Wait()
--
Gitblit v1.8.0