From e56e3215bfee2d144520e399cc1b381868384600 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 14 十二月 2019 17:44:55 +0800
Subject: [PATCH] dev改为pro
---
algorithm/car/plate.go | 97 +++++++++++++++++++++---------------------------
1 files changed, 42 insertions(+), 55 deletions(-)
diff --git a/algorithm/car/plate.go b/algorithm/car/plate.go
index a608232..dff8c3a 100644
--- a/algorithm/car/plate.go
+++ b/algorithm/car/plate.go
@@ -1,22 +1,21 @@
package main
import (
-"basic.com/pubsub/protomsg.git"
-"basic.com/valib/logger.git"
-"github.com/knetic/govaluate"
-"ruleprocess/structure"
-"strconv"
+ "basic.com/pubsub/protomsg.git"
+ "github.com/knetic/govaluate"
+ "ruleprocess/structure"
+ "strconv"
)
// 杞︾墝绠楁硶
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" && rule.SdkArgAlias != "nCarLogoCount" {
- logger.Info("杩囨护杞︾墝淇℃伅")
+ if rule.SdkArgAlias != "nCarCount" {
+ //logger.Info("杩囨护杞︾墝淇℃伅")
return filterRule(rule, am)
} else {
- logger.Info("璁＄畻杞︾墝杞﹁締鏁伴噺") // 鐩墠鍙兘妫�娴嬪嚭杞︾墝鏁伴噺
+ //logger.Info("璁＄畻杞︾墝杞﹁締鏁伴噺") // 鐩墠鍙兘妫�娴嬪嚭杞︾墝鏁伴噺
return transferParameters(rule, am)
}
} else {
@@ -29,12 +28,12 @@
// 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
func filterRule(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
- carFlag := rule.SdkArgAlias == "license" || rule.SdkArgAlias == "nColor" || rule.SdkArgAlias == "nConfidence" ||
- rule.SdkArgAlias == "nBright" || rule.SdkArgAlias == "nTime" || rule.SdkArgAlias == "nCarBright" || rule.SdkArgAlias == "nCarColor" ||
- rule.SdkArgAlias == "nCarLogo" || rule.SdkArgAlias == "nCarType" || rule.SdkArgAlias == "nCarModel" || rule.SdkArgAlias == "nCarModelConfidence"
+ carFlag := rule.SdkArgAlias == "license" || rule.SdkArgAlias == "nConfidence" || rule.SdkArgAlias == "fConfidence" ||
+ rule.SdkArgAlias == "nType" || rule.SdkArgAlias == "nVehicleColor1" || rule.SdkArgAlias == "nVehicleBright" || rule.SdkArgAlias == "nCarColor" ||
+ 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
@@ -47,48 +46,36 @@
for _, arg := range args {
var formula string
switch rule.SdkArgAlias {
- case "score":
- formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
- case "proportion":
- formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鍗犳瘮鍏紡锛�", formula)
- case "size":
- formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("灏哄灏忓叕寮忥細", formula)
- case "license":
- formula = arg.Car.License + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("褰撳墠杞︾墝鍙风爜灏忓叕寮忥細", formula)
- case "nColor":
- formula = strconv.Itoa(int(arg.Car.NColor)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝棰滆壊灏忓叕寮忥細", formula)
- case "nConfidence":
- formula = strconv.Itoa(int(arg.Car.NConfidence)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("鏁寸墝鍙俊搴﹀皬鍏紡锛�", formula)
- case "nBright":
- formula = strconv.Itoa(int(arg.Car.NBright)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝浜害璇勪环灏忓叕寮忥細", formula)
- case "nDirection":
- formula = strconv.Itoa(int(arg.Car.NDirection)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾墝杩愬姩鏂瑰悜灏忓叕寮忥細", formula)
- case "nCarBright":
- formula = strconv.Itoa(int(arg.Car.NCarBright)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾殑浜害灏忓叕寮忥細", formula)
- case "nCarColor":
- formula = strconv.Itoa(int(arg.Car.NCarColor)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︾殑棰滆壊灏忓叕寮忥細", formula)
- case "nCarLogo":
- formula = strconv.Itoa(int(arg.Car.NCarLogo)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞︽爣绫诲瀷灏忓叕寮忥細", formula)
- case "nCarType":
- formula = strconv.Itoa(int(arg.Car.NCarType)) + " " + rule.Operator + " " + rule.SdkArgValue
- logger.Info("杞﹁締绫诲瀷灏忓叕寮忥細", formula)
- //case "nCarModel":
- // formula = strconv.Itoa(int(arg.Car.ncm)) + " " + rule.Operator + " " + rule.SdkArgValue
- // logger.Info("璇嗗埆鎴愬姛涓庡惁灏忓叕寮忥細", formula)
- //case "nCarModelConfidence":
- // formula = strconv.Itoa(int(arg.Car.NCarModelConfidence)) + " " + rule.Operator + " " + rule.SdkArgValue
- // logger.Info("杞﹀瀷鍙俊搴﹀皬鍏紡锛�", formula)
+ case "fVDConf":
+ formula = strconv.FormatFloat(arg.Score, 'f', -1, 32) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞﹁締缃俊搴﹀皬鍏紡锛�", formula)
+ case "nVehicleColor1":
+ formula = strconv.Itoa(int(arg.Car.NVehicleColor1)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞﹁韩涓婚鑹插皬鍏紡锛�", formula)
+ case "nVehicleColor2":
+ formula = strconv.Itoa(int(arg.Car.NVehicleColor2)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞﹁韩杈呴鑹插皬鍏紡锛�", formula)
+ case "fConfidence":
+ formula = arg.Car.VehicleType1 + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞﹁締绫诲瀷灏忓叕寮忥細", formula)
+ case "nVehicleBright":
+ formula = strconv.Itoa(int(arg.Car.NVehicleBright)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞﹁締浜害灏忓叕寮忥細", formula)
+ case "nPlateFlag":
+ formula = strconv.Itoa(int(arg.Car.NPlateFlag)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("璇嗗埆鍒拌溅鐗屽皬鍏紡锛�", formula)
+ case "license":
+ formula = arg.Car.License + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞︾墝鍙风爜灏忓叕寮忥細", formula)
+ case "nConfidence":
+ formula = strconv.Itoa(int(arg.Car.NConfidence)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞︾墝鍙俊搴﹀皬鍏紡锛�", formula)
+ case "nColor":
+ formula = strconv.Itoa(int(arg.Car.NColor)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞︾墝棰滆壊灏忓叕寮忥細", formula)
+ case "nType":
+ formula = strconv.Itoa(int(arg.Car.NType)) + " " + rule.Operator + " " + rule.SdkArgValue
+ //logger.Info("杞︾墝绫诲瀷灏忓叕寮忥細", formula)
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -124,7 +111,7 @@
//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}
--
Gitblit v1.8.0