From 7118f75c841fe105202b5336d894bfc0ed0dd17f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 14:58:12 +0800
Subject: [PATCH] 车牌换车辆
---
go.sum | 4 ++
algorithm/middleware/readyData.go | 2
go.mod | 2
algorithm/car/plate.go | 74 +++++++++++++++---------------------
structure/rule.go | 4 +-
5 files changed, 39 insertions(+), 47 deletions(-)
diff --git a/algorithm/car/plate.go b/algorithm/car/plate.go
index a608232..c372085 100644
--- a/algorithm/car/plate.go
+++ b/algorithm/car/plate.go
@@ -47,48 +47,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 +112,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}
diff --git a/algorithm/middleware/readyData.go b/algorithm/middleware/readyData.go
index 339f9d8..d516a54 100644
--- a/algorithm/middleware/readyData.go
+++ b/algorithm/middleware/readyData.go
@@ -180,7 +180,7 @@
}
for _, info := range plateIDResult.Result {
logger.Info("鎺ユ敹杞︾墝鏁版嵁锛�",info)
- photoMap := structure.PhotoMap{Id: info.License,Score: float64(info.NConfidence),Rects: rectFormat(info.RcLocation), Type: "plate", Car:info}
+ photoMap := structure.PhotoMap{Id: info.License,Score: float64(info.FvdConf),Rects: rectFormat(info.RcCarLocation), Type: "plate", Car:info}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata, &arg)
diff --git a/go.mod b/go.mod
index 21da1ca..18d6ca3 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@
basic.com/dbapi.git v0.0.0-20191025084729-a04db890e7b5
basic.com/fileserver/WeedFSClient.git v0.0.0-20191105073656-98059e699477
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
- basic.com/pubsub/protomsg.git v0.0.0-20191115030536-80cf78e0ebea
+ basic.com/pubsub/protomsg.git v0.0.0-20191121033547-7af037c469a7
basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
basic.com/valib/logger.git v0.0.0-20190928113028-4907b08c4159
diff --git a/go.sum b/go.sum
index 134a0c6..f650a0c 100644
--- a/go.sum
+++ b/go.sum
@@ -16,6 +16,10 @@
basic.com/pubsub/protomsg.git v0.0.0-20191105082616-7a5fc5da9c09/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20191115030536-80cf78e0ebea h1:HARRdW2p9asDLBMmJWpt1ECv3GDGCJN5ELb/RhCXUqQ=
basic.com/pubsub/protomsg.git v0.0.0-20191115030536-80cf78e0ebea/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20191121023847-bd1d8f822f8f h1:XEoI9zjhmbdNToAYCBa5n7EjwUqpcdyIIm/XC9Iwsjs=
+basic.com/pubsub/protomsg.git v0.0.0-20191121023847-bd1d8f822f8f/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20191121033547-7af037c469a7 h1:JFN0eyyRZ2Ty/FMtoCGHDtEcJdQrIkpGfHcKk2N4IQs=
+basic.com/pubsub/protomsg.git v0.0.0-20191121033547-7af037c469a7/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00 h1:sK+Tx7rvM9J2WnNIwrzMDjZSylWiKNfQO0prUBfKsDk=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00/go.mod h1:8by33F9E1w17Pw/rDgJGJXAo122w0wDENG14hiMS+RE=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
diff --git a/structure/rule.go b/structure/rule.go
index f5f1dcc..8ddf5fe 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -14,7 +14,7 @@
AreaJson string // 鎵�灞炲尯鍩�
Type string // 璁拌浇鏁版嵁绫诲瀷
Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤鐩爣鏁版嵁鐨勬椂鍊欑敤鐨勫埌
- Car *protomsg.PlateID // 杞﹁締鍙傛暟
+ Car *protomsg.PlateIDVehicle // 杞﹁締鍙傛暟
Feature []byte
ThftRes protomsg.ThftResult
Liker []*BaseInfo
@@ -49,7 +49,7 @@
Type string // 璁拌浇鏁版嵁绫诲瀷
ThftRes protomsg.ThftResult
Feature []byte
- Car *protomsg.PlateID
+ Car *protomsg.PlateIDVehicle
}
// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
--
Gitblit v1.8.0