LingxinMeng há 10 meses atrás
pai
commit
19e80c13f7

+ 1 - 2
trigger/pjisuv/cicv_location/Brake/main/Brake.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"cicv-data-closedloop/pjisuv_msgs"
-	"cicv-data-closedloop/pjisuv_param"
 )
 
 func Topic() string {
@@ -14,7 +13,7 @@ func Label() string {
 	return "brake"
 }
 
-func Rule(data *pjisuv_msgs.PerceptionLocalization, param pjisuv_param.PjisuvParam) string {
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
 	if data.AccelX*9.8 < -4.0 {
 		return "brake"
 	} else {

+ 1 - 2
trigger/pjisuv/cicv_location/EnterTjunction/main/EnterTjunction.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"cicv-data-closedloop/pjisuv_msgs"
-	"cicv-data-closedloop/pjisuv_param"
 	"math"
 )
 
@@ -34,7 +33,7 @@ var (
 	pointlist = []Point{point3, point4, point5, point6, point7, point8}
 )
 
-func Rule(data *pjisuv_msgs.PerceptionLocalization, param pjisuv_param.PjisuvParam) string {
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
 	if count2%10 == 0 {
 
 		enterflag := IfEnter(pointlist, 12.0, data.Latitude, data.Longitude)

+ 1 - 2
trigger/pjisuv/cicv_location/FindTrafficLight/main/FindTrafficLight.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"cicv-data-closedloop/pjisuv_msgs"
-	"cicv-data-closedloop/pjisuv_param"
 	"math"
 )
 
@@ -32,7 +31,7 @@ var (
 	pointlist = []Point{point2, point3, point4, point5}
 )
 
-func Rule(data *pjisuv_msgs.PerceptionLocalization, param pjisuv_param.PjisuvParam) string {
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
 	if count1%10 == 0 {
 
 		enterflag := IfEnter(pointlist, 15.0, data.Latitude, data.Longitude)

+ 1 - 2
trigger/pjisuv/cicv_location/OverSpeed/main/OverSpeed.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"cicv-data-closedloop/pjisuv_msgs"
-	"cicv-data-closedloop/pjisuv_param"
 	"math"
 )
 
@@ -14,7 +13,7 @@ func Label() string {
 	return "OverSpeed"
 }
 
-func Rule(data *pjisuv_msgs.PerceptionLocalization, param pjisuv_param.PjisuvParam) string {
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
 	//threshold := 65.0
 	threshold := 9999.0
 	if math.Pow(math.Pow(data.VelocityX, 2)+math.Pow(data.VelocityY, 2), 0.5)*3.6 >= threshold {

+ 1 - 2
trigger/pjisuv/cicv_location/OverSwing/main/OverSwing.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"cicv-data-closedloop/pjisuv_msgs"
-	"cicv-data-closedloop/pjisuv_param"
 	"math"
 )
 
@@ -34,7 +33,7 @@ func Label() string {
 	return "OverSwing"
 }
 
-func Rule(data *pjisuv_msgs.PerceptionLocalization, param pjisuv_param.PjisuvParam) string {
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
 	if math.Abs(data.AngularVelocityZ) >= 27.0 {
 		return "OverSwing"
 	} else {

+ 1 - 2
trigger/pjisuv/cicv_location/RapidAccel/main/RapidAccel.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"cicv-data-closedloop/pjisuv_msgs"
-	"cicv-data-closedloop/pjisuv_param"
 )
 
 func Topic() string {
@@ -13,7 +12,7 @@ func Label() string {
 	return "RapidAccel"
 }
 
-func Rule(data *pjisuv_msgs.PerceptionLocalization, param pjisuv_param.PjisuvParam) string {
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
 	if data.AccelX*9.8 > 5.0 {
 		return "RapidAccel"
 	} else {