From 34eb10fac7b0cc8ff4f081e9bf1ac8a3124fe0c5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 13 十二月 2019 16:47:54 +0800
Subject: [PATCH] 去掉置信度阀门
---
labelFilter/req.go | 2
algorithm/middleware/middleware.go | 62 ++++++++++++++++--------------
ruleserver/server.go | 2 +
algorithm/middleware/readyData.go | 2
ruleserver/readyDataForRule.go | 4 +-
5 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 4a879ef..1c0ce31 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -18,6 +18,38 @@
resultSplice := []*structure.LittleRuleResult{}
sdkNames := ""
polygonId := ""
+ // 杩欐杩囩殑鏄椂闂存瑙勫垯锛堟椂闂存绛夛級
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
+ if err != nil {
+ logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
+ }
+ ipcId := sdk.IpcId
+ sdkName := sdk.SdkName
+ if ipcId == sdkData.IpcId {
+ for _, areaMap := range sdkData.AreaMapList {
+ ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
+ if ruleResult.Result != "" {
+ if strings.Contains(ruleResult.Result, "false") {
+ return false,"","" // 涓嶇鍚堟椂闂磋鍒欑殑璇濈洿鎺ヨ繑鍥烇紝涓嶅啀娴垂绋嬪簭鎵ц
+ }
+ if strings.Contains(ruleResult.Result, "true") {
+ areaMap.IsEffective = true
+ }
+ logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
+ if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
+ sdkNames = sdkName + " "
+ }
+ if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
+ polygonId += groupRule.Rules[j].PolygonId + ","
+ }
+ resultSplice = append(resultSplice, &ruleResult)
+ }
+ }
+ }
+ }
+ }
// 鍏堣繃瀹屾潯浠惰鍒�
for j := 0; j < len(groupRule.Rules); j++ {
@@ -200,35 +232,7 @@
}
}
}
- // 杩欐杩囩殑鏄椂闂存瑙勫垯锛堟椂闂存绛夛級
- for j := 0; j < len(groupRule.Rules); j++ {
- for _, sdkData := range args.Sdkdata {
- sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
- if err != nil {
- logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
- }
- ipcId := sdk.IpcId
- sdkName := sdk.SdkName
- if ipcId == sdkData.IpcId {
- for _, areaMap := range sdkData.AreaMapList {
- ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
- if ruleResult.Result != "" {
- if strings.Contains(ruleResult.Result, "true") {
- areaMap.IsEffective = true
- }
- logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
- if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- sdkNames = sdkName + " "
- }
- if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
- polygonId += groupRule.Rules[j].PolygonId + ","
- }
- resultSplice = append(resultSplice, &ruleResult)
- }
- }
- }
- }
- }
+
// 灏嗘暟缁勬寜sort鎺掑簭
sort.Sort(ruleserver.ResultList(resultSplice))
// 鎺掑簭鍚庡彇鍚勮嚜鐨勭粨鏋滃拰杩炴帴绗︽嫾鍑鸿鍒欒〃杈惧紡寰楀嚭缁撴灉
diff --git a/algorithm/middleware/readyData.go b/algorithm/middleware/readyData.go
index 7eb4265..784569f 100644
--- a/algorithm/middleware/readyData.go
+++ b/algorithm/middleware/readyData.go
@@ -21,7 +21,7 @@
func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
a.TargetNum = 0
- threshold := 70.0 // 鐩镐技搴�
+ threshold := 0.0 // 鐩镐技搴�
intersectionper := 20.0 // 鍗犳瘮
size := 0.0 // 灏哄
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 2e6b994..3e327f8 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -156,7 +156,7 @@
}
}(data)
default:
-
+ time.Sleep(time.Millisecond * 10)
}
}
sock.Close()
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 033a2b3..1ade35c 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -280,7 +280,7 @@
//if sock, err = req.NewSocket(); err != nil {
// logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
//}
- errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
+ errSize := sock.SetOption(mangos.OptionMaxRecvSize,10*1024*1024)
if errSize != nil {
logger.Error("Failed set MaxRecvSize: %v", err)
return nil
@@ -356,7 +356,7 @@
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
receiver <- msg
default:
-
+ time.Sleep(10 * time.Millisecond)
}
}
}
diff --git a/ruleserver/server.go b/ruleserver/server.go
index 2ba38db..ab54f90 100644
--- a/ruleserver/server.go
+++ b/ruleserver/server.go
@@ -43,6 +43,8 @@
select {
case dbMsg := <-videotapChan:
publishMessage(dbMsg)
+ default:
+ time.Sleep(time.Millisecond * 10)
}
}
}
--
Gitblit v1.8.0