From f8aa9316d6bf32392883081c3d08196f6ca344c9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 11:11:10 +0800
Subject: [PATCH] compare 改为isHave
---
algorithm/car/plate.go | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/algorithm/car/plate.go b/algorithm/car/plate.go
index 595dd1f..d2b5f9b 100644
--- a/algorithm/car/plate.go
+++ b/algorithm/car/plate.go
@@ -1,11 +1,10 @@
package main
import (
-"basic.com/pubsub/protomsg.git"
-logger "github.com/jeanphorn/log4go"
-"github.com/knetic/govaluate"
-"ruleprocess/structure"
-"strconv"
+ "basic.com/pubsub/protomsg.git"
+ "github.com/knetic/govaluate"
+ "ruleprocess/structure"
+ "strconv"
)
// 杞︾墝绠楁硶
@@ -13,10 +12,10 @@
func Entrance(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias != "nCarCount" {
- logger.Info("杩囨护杞︾墝淇℃伅")
+ //logger.Info("杩囨护杞︾墝淇℃伅")
return filterRule(rule, am)
} else {
- logger.Info("璁＄畻杞︾墝杞﹁締鏁伴噺") // 鐩墠鍙兘妫�娴嬪嚭杞︾墝鏁伴噺
+ //logger.Info("璁＄畻杞︾墝杞﹁締鏁伴噺") // 鐩墠鍙兘妫�娴嬪嚭杞︾墝鏁伴噺
return transferParameters(rule, am)
}
} else {
@@ -34,7 +33,7 @@
rule.SdkArgAlias == "fVDConf" || rule.SdkArgAlias == "nVehicleColor2" || rule.SdkArgAlias == "nColor" || rule.SdkArgAlias == "nPlateFlag"
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" || carFlag{ // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- logger.Debug("---------璧颁簡杞︾墝璇嗗埆杩囨护绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+ //logger.Debug("---------璧颁簡杞︾墝璇嗗埆杩囨护绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
var args []*structure.Arg
if rule.RuleWithPre == "&&" {
args = am.FilterData
@@ -49,34 +48,34 @@
switch rule.SdkArgAlias {
case "fVDConf":
formula = strconv.FormatFloat(arg.Score, 'f', -1, 32) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締缃俊搴﹀皬鍏紡锛�", formula)
+ //logger.Info("杞﹁締缃俊搴﹀皬鍏紡锛�", formula)
case "nVehicleColor1":
formula = strconv.Itoa(int(arg.Car.NVehicleColor1)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁韩涓婚鑹插皬鍏紡锛�", formula)
+ //logger.Info("杞﹁韩涓婚鑹插皬鍏紡锛�", formula)
case "nVehicleColor2":
formula = strconv.Itoa(int(arg.Car.NVehicleColor2)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁韩杈呴鑹插皬鍏紡锛�", formula)
+ //logger.Info("杞﹁韩杈呴鑹插皬鍏紡锛�", formula)
case "fConfidence":
formula = arg.Car.VehicleType1 + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締绫诲瀷灏忓叕寮忥細", formula)
+ //logger.Info("杞﹁締绫诲瀷灏忓叕寮忥細", formula)
case "nVehicleBright":
formula = strconv.Itoa(int(arg.Car.NVehicleBright)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締浜害灏忓叕寮忥細", formula)
+ //logger.Info("杞﹁締浜害灏忓叕寮忥細", formula)
case "nPlateFlag":
formula = strconv.Itoa(int(arg.Car.NPlateFlag)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("璇嗗埆鍒拌溅鐗屽皬鍏紡锛�", formula)
+ //logger.Info("璇嗗埆鍒拌溅鐗屽皬鍏紡锛�", formula)
case "license":
formula = arg.Car.License + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝鍙风爜灏忓叕寮忥細", formula)
+ //logger.Info("杞︾墝鍙风爜灏忓叕寮忥細", formula)
case "nConfidence":
formula = strconv.Itoa(int(arg.Car.NConfidence)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝鍙俊搴﹀皬鍏紡锛�", formula)
+ //logger.Info("杞︾墝鍙俊搴﹀皬鍏紡锛�", formula)
case "nColor":
formula = strconv.Itoa(int(arg.Car.NColor)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝棰滆壊灏忓叕寮忥細", formula)
+ //logger.Info("杞︾墝棰滆壊灏忓叕寮忥細", formula)
case "nType":
formula = strconv.Itoa(int(arg.Car.NType)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝绫诲瀷灏忓叕寮忥細", formula)
+ //logger.Info("杞︾墝绫诲瀷灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -86,16 +85,16 @@
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
} else if rule.SdkArgAlias == "" {
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
}
return structure.LittleRuleResult{}
@@ -107,14 +106,14 @@
//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
//logger.Info("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
if rule.Operator == "" {
- return structure.LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
+ return structure.LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort,am.FilterData} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
}
//args := am.targetNum targetNum 宸叉垚鎵�鏈夌洰鏍囩殑鎬绘暟閲忥紝杩欓噷鍙畻yolo鐨�
var num int = len(am.FilterData)
formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締鏁伴噺鍏紡",formula)
+ //logger.Info("杞﹁締鏁伴噺鍏紡",formula)
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort,am.FilterData}
// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
}
\ No newline at end of file
--
Gitblit v1.8.0