Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
CarlaComponents
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
applications
CarlaComponents
Commits
5490e75d
Commit
5490e75d
authored
Sep 28, 2019
by
Helge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed autopilot component, abs(x) not working as intended
parent
661b3d2d
Pipeline
#188585
passed with stage
in 3 minutes and 46 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
Autopilot/models/autopilot/de/rwth/armin/modeling/autopilot/common/Abs.emam
...utopilot/de/rwth/armin/modeling/autopilot/common/Abs.emam
+5
-1
Autopilot/models/autopilot/de/rwth/armin/modeling/autopilot/motion/SteeringAngleCorrection.emam
...in/modeling/autopilot/motion/SteeringAngleCorrection.emam
+6
-1
No files found.
Autopilot/models/autopilot/de/rwth/armin/modeling/autopilot/common/Abs.emam
View file @
5490e75d
...
...
@@ -6,6 +6,10 @@ component Abs {
out
Q
output
;
implementation
Math
{
output
=
abs
(
input
);
if
input
<
0
output
=
(-
1
)
*
input
;
else
output
=
input
;
end
}
}
Autopilot/models/autopilot/de/rwth/armin/modeling/autopilot/motion/SteeringAngleCorrection.emam
View file @
5490e75d
...
...
@@ -18,7 +18,12 @@ component SteeringAngleCorrection {
steeringAngleCorrection
=
0.0
;
Q
dist
=
abs
(
signedDistanceToTrajectory
);
Q
dist
=
signedDistanceToTrajectory
;
if
dist
<
0
dist
=
(-
1
)
*
dist
;
//
dist
=
abs
(
signedDistanceToTrajectory
)
end
if
(
dist
>
EPSILON
)
if
(
dist
<
X1
)
steeringAngleCorrection
=
Y1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment