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
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
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
2ab2f0a9
Commit
2ab2f0a9
authored
Apr 02, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Model: Cleanup
parent
b733b06a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
31 deletions
+18
-31
src/test/resources/ba/System.emam
src/test/resources/ba/System.emam
+14
-17
src/test/resources/ba/collision/CollisionDetection.emam
src/test/resources/ba/collision/CollisionDetection.emam
+0
-1
src/test/resources/ba/intersection/IntersectionController.emam
...est/resources/ba/intersection/IntersectionController.emam
+4
-5
src/test/resources/ba/util/CommQualityMatrix.emam
src/test/resources/ba/util/CommQualityMatrix.emam
+0
-8
No files found.
src/test/resources/ba/System.emam
View file @
2ab2f0a9
package
ba
;
import
ba
.
intersection
.
IntersectionController
;
import
ba
.
util
.
RelToAbsTrajectory
;
import
ba
.
util
.
CommQuality
;
import
ba
.
vehicle
.
VelocityController
;
import
ba
.
collision
.
CollisionDetection
;
import
ba
.
struct
.
Rectangle
;
//
component
System
<
N1
n
=
2
,
N1
x
=
1
,
N1
m
=
5
,
N1
m1
=
4
,
N1
m2
=
10
>{
component
System
{
ports
//
Intersection
ports
ports
in
Q
(
0
s
:
10
s
)
cutoffTimeIn
,
in
B
isActiveIn
,
in
Q
^{
3
,
5
}
absTrajectory
[
2
];
in
Q
(
0
s
:
10
s
)
cutoffTimeIn
,
in
B
isActiveIn
,
in
Q
^{
3
,
5
}
absTrajectory
[
2
],
//
Collision
detection
ports
ports
in
Rectangle
hullsIn
[
2
],
out
B
collisionOut
;
in
Rectangle
hullsIn
[
2
],
out
B
collisionOut
,
//
Vehicle
ports
ports
in
Q
(
0
m
/
s
^
2
:
100
m
/
s
^
2
)
maxAccel
[
2
],
in
Q
(
0
m
/
s
:
60
m
/
s
)
maxVel
[
2
],
in
Q
(
0
s
:
10
s
)
deltaTime
[
2
],
in
Q
(
0
s
:
60
s
)
holdTime
[
2
],
in
B
resetVel
[
2
],
in
B
slowDown
[
2
],
out
Q
(
0
m
/
s
:
60
m
/
s
)
curVel
[
2
];
in
Q
(
0
m
/
s
^
2
:
100
m
/
s
^
2
)
maxAccel
[
2
],
in
Q
(
0
m
/
s
:
60
m
/
s
)
maxVel
[
2
],
in
Q
(
0
s
:
10
s
)
deltaTime
[
2
],
in
Q
(
0
s
:
60
s
)
holdTime
[
2
],
in
B
resetVel
[
2
],
in
B
slowDown
[
2
],
out
Q
(
0
m
/
s
:
60
m
/
s
)
curVel
[
2
];
instance
IntersectionController
intersectionController
;
instance
CollisionDetection
collisionDetection
;
instance
CommQuality
<
B
>
stopCommQuality
[
2
];
instance
VelocityController
(
3.0
)
velocityController
[
2
];
//
Intersection
connect
cutoffTimeIn
->
intersectionController
.
cutoffTime
;
connect
isActiveIn
->
intersectionController
.
isActive
;
...
...
src/test/resources/ba/collision/CollisionDetection.emam
View file @
2ab2f0a9
...
...
@@ -4,7 +4,6 @@ import ba.util.SingleSetCompareRectangle;
import
ba
.
struct
.
Rectangle
;
component
CollisionDetection
<
N1
n
=
2
,
N1
x
=
1
>{
//
component
CollisionDetection
{
ports
in
Rectangle
hulls
[
n
],
out
B
collision
;
...
...
src/test/resources/ba/intersection/IntersectionController.emam
View file @
2ab2f0a9
...
...
@@ -2,15 +2,14 @@ package ba.intersection;
import
ba
.
util
.
SingleSetCompareMatrix
;
//
TODO
:
x
=
(
n
-
1
)
n
/
2
//
TODO
:
m1
=
m
-
1
,
m2
=
m1
(
m1
+
1
)/
2
//
component
IntersectionController
<
N1
n
=
2
,
N1
x
=
1
,
N1
m
=
5
,
N1
m1
=
4
,
N1
m2
=
10
>{
component
IntersectionController
{
ports
in
Q
^{
3
,
5
}
trajectoryIn
[
2
],
component
IntersectionController
<
N1
n
=
2
,
N1
x
=
1
,
N1
m
=
5
,
N1
m1
=
4
,
N1
m2
=
10
>{
ports
in
Q
^{
3
,
5
}
trajectoryIn
[
n
],
in
Q
(
0
m
:
10
m
)
cutoffTime
,
in
B
isActive
,
out
B
stop
[
2
];
out
B
stop
[
n
];
instance
SingleSetCompareMatrix
<
3
,
5
,
2
,
1
>
singleSetCompare
;
instance
TrajectoryCollision
<
5
,
4
,
10
>
trajectoryCollision
[
1
];
instance
TrajectoryCollision
<
5
,
4
,
10
>
trajectoryCollision
[
x
];
instance
CollisionToStop
<
2
,
1
,
5
>
collisionToStop
;
connect
trajectoryIn
[:]
->
singleSetCompare
.
setIn
[:];
...
...
src/test/resources/ba/util/CommQualityMatrix.emam
deleted
100644 → 0
View file @
b733b06a
package
ba
.
util
;
//
TODO
:
remove
once
EMAM2Cpp
can
handle
matrix
generics
//
Dummy
component
.
Behaviour
is
implemented
in
ROS
.
The
Ports
are
only
used
to
define
the
incoming
and
outgoing
topics
component
CommQualityMatrix
<
N1
rows
=
3
,
N1
cols
=
3
>{
port
in
Q
^{
rows
,
cols
}
commIn
,
out
Q
^{
rows
,
cols
}
commOut
;
}
\ No newline at end of file
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