Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
16bbde85
Commit
16bbde85
authored
May 07, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Model: renaming
parent
35e5b573
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
src/test/resources/ba/intersection/FirstLineIntersection.emam
...test/resources/ba/intersection/FirstLineIntersection.emam
+4
-4
src/test/resources/ba/intersection/TrajectoryCollision.emam
src/test/resources/ba/intersection/TrajectoryCollision.emam
+2
-2
src/test/resources/ba/util/TrajectoryToLines.emam
src/test/resources/ba/util/TrajectoryToLines.emam
+1
-1
No files found.
src/test/resources/ba/intersection/FirstLineIntersection.emam
View file @
16bbde85
...
...
@@ -6,8 +6,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{
in
Q
^{
2
,
1
}
pointsIn
[
m2
],
out
B
collisionOut
,
out
Z
l
in
exA
,
out
Z
l
in
exB
,
out
Z
l
Ind
exA
,
out
Z
l
Ind
exB
,
out
Q
^{
2
,
1
}
pos
;
//
TODO
:
bug
:
must
not
always
be
earliest
crash
pos
...
...
@@ -20,8 +20,8 @@ component FirstLineIntersection<N1 m1 = 9, N1 m2 = 45>{
for
j
=
i
:
m1
if
found
==
false
if
collisionIn
(
k
)
l
in
exA
=
i
;
l
in
exB
=
j
;
l
Ind
exA
=
i
;
l
Ind
exB
=
j
;
pos
=
pointsIn
(
k
);
found
=
true
;
end
...
...
src/test/resources/ba/intersection/TrajectoryCollision.emam
View file @
16bbde85
...
...
@@ -26,8 +26,8 @@ component TrajectoryCollision<N1 m = 10, N1 m1 = 9, N1 m2 = 45>{
connect
lineIntersection
[:].
point
->
firstLineIntersection
.
pointsIn
[:];
connect
firstLineIntersection
.
collisionOut
->
timeCutoffFilter
.
collisionIn
;
connect
firstLineIntersection
.
l
in
exA
->
timeCutoffFilter
.
indexInA
;
connect
firstLineIntersection
.
l
in
exB
->
timeCutoffFilter
.
indexInB
;
connect
firstLineIntersection
.
l
Ind
exA
->
timeCutoffFilter
.
indexInA
;
connect
firstLineIntersection
.
l
Ind
exB
->
timeCutoffFilter
.
indexInB
;
connect
firstLineIntersection
.
pos
->
timeCutoffFilter
.
colPosIn
;
connect
trajectoryA
->
timeCutoffFilter
.
trajectoryInA
;
connect
trajectoryB
->
timeCutoffFilter
.
trajectoryInB
;
...
...
src/test/resources/ba/util/TrajectoryToLines.emam
View file @
16bbde85
...
...
@@ -7,7 +7,7 @@ component TrajectoryToLines<N1 m = 10, N1 m1 = 9>{
implementation
Math
{
for
i
=
1
:
m1
Q
^{
4
,
1
}
tmpLine
;
Q
^{
4
}
tmpLine
;
tmpLine
(
1
,
1
)
=
trajectoryIn
(
1
,
i
);
tmpLine
(
2
,
1
)
=
trajectoryIn
(
2
,
i
);
tmpLine
(
3
,
1
)
=
trajectoryIn
(
1
,
i
+
1
);
...
...
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