From 4d39d58d2ac6c8bda6f5bcf9dd6f29e53678cc5a Mon Sep 17 00:00:00 2001 From: Carlos Alfredo Yeverino Rodriguez Date: Sat, 23 Feb 2019 00:37:28 +0100 Subject: [PATCH] Change syntax 'Q (0: 01: 1) fieldName;' in structs to '(0: 01: 1) fieldName;' since it is now forbidden --- .../dp/subcomponents/Affordance.struct | 28 +++++++++---------- .../dp/subcomponents/ConstantMatrix.emadl | 4 +-- .../dp/subcomponents/Affordance.struct | 28 +++++++++---------- .../dp/subcomponents/ConstantMatrix.emadl | 4 +-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/Affordance.struct b/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/Affordance.struct index 96c723d..9c0deb1 100644 --- a/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/Affordance.struct +++ b/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/Affordance.struct @@ -1,21 +1,21 @@ package dp.subcomponents; struct Affordance { - Q(-0.5rad:0.001rad:0.5rad) angle; + (-0.5rad:0.001rad:0.5rad) angle; - Q(-7m : 0.01m : -2.5m) toMarkingL; - Q(-2m : 0.01m : 3.5m) toMarkingM; - Q(2.5m : 0.01m : 7m) toMarkingR; - Q(0m : 0.1m : 75m) distL; - Q(0m : 0.1m : 75m) distR; + (-7m : 0.01m : -2.5m) toMarkingL; + (-2m : 0.01m : 3.5m) toMarkingM; + (2.5m : 0.01m : 7m) toMarkingR; + (0m : 0.1m : 75m) distL; + (0m : 0.1m : 75m) distR; - Q(-9.5m : 0.01m : -4m) toMarkingLL; - Q(-5.5m : 0.01m : -0.5m) toMarkingML; - Q(0.5m : 0.01m : 5.5m) toMarkingMR; - Q(4m : 0.01m : 9.5m) toMarkingRR; - Q(0m : 0.1m : 75m) distLL; - Q(0m : 0.1m : 75m) distMM; - Q(0m : 0.1m : 75m) distRR; + (-9.5m : 0.01m : -4m) toMarkingLL; + (-5.5m : 0.01m : -0.5m) toMarkingML; + (0.5m : 0.01m : 5.5m) toMarkingMR; + (4m : 0.01m : 9.5m) toMarkingRR; + (0m : 0.1m : 75m) distLL; + (0m : 0.1m : 75m) distMM; + (0m : 0.1m : 75m) distRR; - Q(0 : 0.1 : 1) fast; + (0 : 0.1 : 1) fast; } diff --git a/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/ConstantMatrix.emadl b/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/ConstantMatrix.emadl index 2efcabc..ecefeec 100644 --- a/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/ConstantMatrix.emadl +++ b/EMADL2TORCS/src/dpnet_variant/dp/subcomponents/ConstantMatrix.emadl @@ -1,9 +1,9 @@ package dp.subcomponents; -component ConstantMatrix(Q^{n,m} value) { +component ConstantMatrix(Q^{n,m} val) { port out Q^{n,m} out1; implementation Math{ - out1=value; + out1=val; } } diff --git a/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/Affordance.struct b/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/Affordance.struct index 96c723d..9c0deb1 100644 --- a/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/Affordance.struct +++ b/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/Affordance.struct @@ -1,21 +1,21 @@ package dp.subcomponents; struct Affordance { - Q(-0.5rad:0.001rad:0.5rad) angle; + (-0.5rad:0.001rad:0.5rad) angle; - Q(-7m : 0.01m : -2.5m) toMarkingL; - Q(-2m : 0.01m : 3.5m) toMarkingM; - Q(2.5m : 0.01m : 7m) toMarkingR; - Q(0m : 0.1m : 75m) distL; - Q(0m : 0.1m : 75m) distR; + (-7m : 0.01m : -2.5m) toMarkingL; + (-2m : 0.01m : 3.5m) toMarkingM; + (2.5m : 0.01m : 7m) toMarkingR; + (0m : 0.1m : 75m) distL; + (0m : 0.1m : 75m) distR; - Q(-9.5m : 0.01m : -4m) toMarkingLL; - Q(-5.5m : 0.01m : -0.5m) toMarkingML; - Q(0.5m : 0.01m : 5.5m) toMarkingMR; - Q(4m : 0.01m : 9.5m) toMarkingRR; - Q(0m : 0.1m : 75m) distLL; - Q(0m : 0.1m : 75m) distMM; - Q(0m : 0.1m : 75m) distRR; + (-9.5m : 0.01m : -4m) toMarkingLL; + (-5.5m : 0.01m : -0.5m) toMarkingML; + (0.5m : 0.01m : 5.5m) toMarkingMR; + (4m : 0.01m : 9.5m) toMarkingRR; + (0m : 0.1m : 75m) distLL; + (0m : 0.1m : 75m) distMM; + (0m : 0.1m : 75m) distRR; - Q(0 : 0.1 : 1) fast; + (0 : 0.1 : 1) fast; } diff --git a/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/ConstantMatrix.emadl b/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/ConstantMatrix.emadl index 2efcabc..ecefeec 100644 --- a/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/ConstantMatrix.emadl +++ b/EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/ConstantMatrix.emadl @@ -1,9 +1,9 @@ package dp.subcomponents; -component ConstantMatrix(Q^{n,m} value) { +component ConstantMatrix(Q^{n,m} val) { port out Q^{n,m} out1; implementation Math{ - out1=value; + out1=val; } } -- GitLab