Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
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
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
generators
EMAM2Middleware
Commits
32522771
Commit
32522771
authored
Mar 31, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Model: changed holdTime and timeCutoff to adaptable parameters
parent
93ec824e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
src/test/resources/ba/System.emam
src/test/resources/ba/System.emam
+1
-1
src/test/resources/ba/intersection/TimeCutoffFilter.emam
src/test/resources/ba/intersection/TimeCutoffFilter.emam
+2
-2
src/test/resources/ba/intersection/TrajectoryCollision.emam
src/test/resources/ba/intersection/TrajectoryCollision.emam
+1
-1
src/test/resources/ba/vehicle/VelocityController.emam
src/test/resources/ba/vehicle/VelocityController.emam
+3
-3
No files found.
src/test/resources/ba/System.emam
View file @
32522771
...
...
@@ -27,7 +27,7 @@ component System{
instance
IntersectionController
intersectionController
;
instance
CollisionDetection
collisionDetection
;
instance
CommQuality
<
B
>
stopCommQuality
[
2
];
instance
VelocityController
velocityController
[
2
];
instance
VelocityController
(
3.0
)
velocityController
[
2
];
//
Intersection
...
...
src/test/resources/ba/intersection/TimeCutoffFilter.emam
View file @
32522771
package
ba
.
intersection
;
component
TimeCutoffFilter
{
component
TimeCutoffFilter
(
adaptable
Q
timeCutoff
)
{
ports
in
B
collisionIn
,
in
Z
IndexInA
,
in
Z
IndexInB
,
in
Q
^{
2
,
1
}
colPosIn
,
in
Q
^{
3
,
5
}
trajectoryInA
,
in
Q
^{
3
,
5
}
trajectoryInB
,
in
Q
timeCutoff
,
//
in
Q
timeCutoff
,
out
B
collisionOut
;
implementation
Math
{
...
...
src/test/resources/ba/intersection/TrajectoryCollision.emam
View file @
32522771
...
...
@@ -15,7 +15,7 @@ component TrajectoryCollision<N1 m = 5, N1 m1 = 4, N1 m2 = 10>{
instance
DualSetCompareMatrix
<
4
,
1
,
m1
,
m2
>
dualSetCompare
;
instance
LineIntersection
lineIntersection
[
m2
];
instance
FirstLineIntersection
firstLineIntersection
;
instance
TimeCutoffFilter
timeCutoffFilter
;
instance
TimeCutoffFilter
(
2.0
)
timeCutoffFilter
;
connect
trajectoryA
->
trajectoryToLinesA
.
trajectoryIn
;
connect
trajectoryB
->
trajectoryToLinesB
.
trajectoryIn
;
...
...
src/test/resources/ba/vehicle/VelocityController.emam
View file @
32522771
package
ba
.
vehicle
;
component
VelocityController
{
component
VelocityController
(
adaptable
Q
holdTimeIn
)
{
ports
in
Q
maxVelIn
,
in
Q
maxAccelIn
,
in
Q
deltaTimeIn
,
in
Q
holdTimeIn
,
//
in
Q
holdTimeIn
,
in
B
slowDownIn
,
in
B
resetVelIn
;
...
...
@@ -27,7 +27,7 @@ component VelocityController{
holdFor
=
holdFor
-
deltaTimeIn
;
if
holdFor
<=
0
//
holdFor
is
either
(-
deltaTimeIn
)
//
or
(-
time
since
accel
start
)
//
or
(-
time
since
accel
s
hould
s
tart
)
resVel
=
lastVel
+
maxAccelIn
*
(-
holdFor
);
holdFor
=
0
;
end
...
...
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