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
c62b9ac2
Commit
c62b9ac2
authored
Mar 02, 2019
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove simulator model(only 3 Components), add spectral to daimler model eval
parent
d69df847
Pipeline
#108789
failed with stages
Changes
10
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
2 additions
and
180 deletions
+2
-180
src/test/java/de/monticore/lang/monticar/generator/middleware/EvaluationTest.java
...re/lang/monticar/generator/middleware/EvaluationTest.java
+1
-7
src/test/resources/config/evaluation/daimler.json
src/test/resources/config/evaluation/daimler.json
+1
-5
src/test/resources/config/evaluation/simulatormodel.json
src/test/resources/config/evaluation/simulatormodel.json
+0
-21
src/test/resources/simulatorModel/simulatorModel/MainController.emam
...sources/simulatorModel/simulatorModel/MainController.emam
+0
-44
src/test/resources/simulatorModel/simulatorModel/StatusController.emam
...urces/simulatorModel/simulatorModel/StatusController.emam
+0
-17
src/test/resources/simulatorModel/simulatorModel/StatusControllerTets.stream
...simulatorModel/simulatorModel/StatusControllerTets.stream
+0
-8
src/test/resources/simulatorModel/simulatorModel/SteeringController.emam
...ces/simulatorModel/simulatorModel/SteeringController.emam
+0
-39
src/test/resources/simulatorModel/simulatorModel/SteeringControllerTest.stream
...mulatorModel/simulatorModel/SteeringControllerTest.stream
+0
-14
src/test/resources/simulatorModel/simulatorModel/VelocityController.emam
...ces/simulatorModel/simulatorModel/VelocityController.emam
+0
-17
src/test/resources/simulatorModel/simulatorModel/VelocityControllerTest.stream
...mulatorModel/simulatorModel/VelocityControllerTest.stream
+0
-8
No files found.
src/test/java/de/monticore/lang/monticar/generator/middleware/EvaluationTest.java
View file @
c62b9ac2
...
@@ -21,13 +21,7 @@ public class EvaluationTest {
...
@@ -21,13 +21,7 @@ public class EvaluationTest {
DistributedTargetGeneratorCli
.
main
(
new
String
[]{
"./src/test/resources/config/evaluation/supermario.json"
});
DistributedTargetGeneratorCli
.
main
(
new
String
[]{
"./src/test/resources/config/evaluation/supermario.json"
});
}
}
@Ignore
(
"Spectral: isolated vertex"
)
@Ignore
(
"Very long runtime(30min+)"
)
@Test
public
void
testSimulatorModel
()
{
DistributedTargetGeneratorCli
.
main
(
new
String
[]{
"./src/test/resources/config/evaluation/simulatormodel.json"
});
}
@Ignore
(
"Spectral: isolated vertex"
)
@Test
@Test
public
void
testDaimlerModel
()
{
public
void
testDaimlerModel
()
{
DistributedTargetGeneratorCli
.
main
(
new
String
[]{
"./src/test/resources/config/evaluation/daimler.json"
});
DistributedTargetGeneratorCli
.
main
(
new
String
[]{
"./src/test/resources/config/evaluation/daimler.json"
});
...
...
src/test/resources/config/evaluation/daimler.json
View file @
c62b9ac2
...
@@ -13,11 +13,7 @@
...
@@ -13,11 +13,7 @@
},
},
{
{
"name"
:
"SpectralClustering"
,
"name"
:
"SpectralClustering"
,
"numberOfClusters"
:
6
"numberOfClusters"
:
10
},
{
"name"
:
"SpectralClustering"
,
"numberOfClusters"
:
19
},
},
{
{
"name"
:
"Markov"
"name"
:
"Markov"
...
...
src/test/resources/config/evaluation/simulatormodel.json
deleted
100644 → 0
View file @
d69df847
{
"modelsDir"
:
"src/test/resources/simulatorModel/"
,
"outputDir"
:
"target/evaluation/simulatormodel/"
,
"rootModel"
:
"simulatorModel.mainController"
,
"generators"
:
[
"cpp"
],
"writeTagFile"
:
true
,
"clusteringParameters"
:{
"flatten"
:
true
,
"algorithmParameters"
:[
{
"name"
:
"SpectralClustering"
,
"numberOfClusters"
:
3
},
{
"name"
:
"Markov"
},
{
"name"
:
"AffinityPropagation"
}
]
}
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/MainController.emam
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
import
SteeringController
;
import
VelocityController
;
import
StatusController
;
component
MainController
{
ports
in
Q
(
0
m
:
200
m
)
fl
,
in
Q
(
0
m
:
200
m
)
fr
,
in
Q
(
0
m
:
200
m
)
slf
,
in
Q
(
0
m
:
200
m
)
slb
,
in
Q
(
0
m
:
200
m
)
srf
,
in
Q
(
0
m
:
200
m
)
srb
,
in
Q
(
0
s
:
oos
)
time
,
in
Q
(
0
m
/
s
:
25
m
/
s
)
velocity
,
in
Q
(-
200
m
:
200
m
)
x
,
in
Q
(-
200
m
:
200
m
)
y
,
out
Q
(-
2
m
/
s
^
2
:
2
m
/
s
^
2
)
acceleration
,
out
Q
(-
180
:
180
)
steering
,
out
B
status
;
instance
SteeringController
steeringController
;
instance
VelocityController
velocityController
;
instance
StatusController
trigger
;
connect
time
->
velocityController
.
time
;
connect
velocity
->
velocityController
.
velocity
;
connect
fl
->
steeringControllerler
.
fl
;
connect
fr
->
steeringController
.
fr
;
connect
slf
->
steeringController
.
slf
;
connect
slb
->
steeringController
.
slb
;
connect
srf
->
steeringController
.
srf
;
connect
srb
->
steeringController
.
srb
;
connect
x
->
trigger
.
x
;
connect
y
->
trigger
.
y
;
connect
time
->
trigger
.
time
;
connect
velocityController
.
acceleration
->
acceleration
;
connect
steeringController
.
steering
->
steering
;
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/StatusController.emam
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
component
StatusController
{
port
in
Q
(-
200
m
:
200
m
)
x
,
in
Q
(-
200
m
:
200
m
)
y
,
out
B
status
;
implementation
Math
{
//
the
track
boundaries
B
boundariesX
=
(
x
>
200
m
)
||
(
x
<
-
200
m
);
B
boundariesY
=
(
y
>
120
m
)
||
(
y
<
-
50
m
);
status
=
boundariesX
||
boundariesY
;
}
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/StatusControllerTets.stream
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
stream
StatusControllerTest
for
StatusController
{
x
:
0
m
tick
200
m
tick
-
200
m
tick
250
m
;
y
:
0
m
tick
120
m
tick
-
50
m
tick
50
m
;
status
:
false
tick
false
tick
false
tick
true
;
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/SteeringController.emam
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
component
SteeringController
{
port
in
Q
(
0
m
:
200
m
)
fl
,
in
Q
(
0
m
:
200
m
)
fr
,
in
Q
(
0
m
:
200
m
)
slf
,
in
Q
(
0
m
:
200
m
)
slb
,
in
Q
(
0
m
:
200
m
)
srf
,
in
Q
(
0
m
:
200
m
)
srb
,
in
Q
(
0
m
:
200
m
)
br
,
in
Q
(
0
m
:
200
m
)
bl
,
out
Q
(-
180
:
180
)
steering
;
implementation
Math
{
Q
(
0
m
:
1
m
)
threshold
=
0.1
m
;
Q
(-
1
m
:
0
m
)
thresholdN
=
-
0.1
m
;
B
comp1
=
(((
fl
-
fr
)
>
threshold
)
&&
((
slf
-
slb
)
>
threshold
))
&&
((
srb
-
srf
)
>
threshold
);
B
comp2
=
(((
fl
-
fr
)
<
thresholdN
)
&&
((
slf
-
slb
)
<
thresholdN
))
&&
((
srb
-
srf
)
<
thresholdN
);
B
comp3
=
(
slf
<
slb
)
&&
(
srf
<
srb
);
if
(
comp3
)
steering
=
-
1
;
else
steering
=
0
;
end
if
(
comp2
)
steering
=
5
;
end
if
(
comp1
)
steering
=
-
5
;
end
}
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/SteeringControllerTest.stream
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
stream
StatusControllerTest
for
StatusController
{
fl
:
70
m
tick
30
tick
32
m
;
fr
:
70
m
tick
32
tick
30
m
;
slf
:
5
m
tick
4
m
tick
5
m
;
slb
:
5
m
tick
5
m
tick
4
m
;
srf
:
5
m
tick
5
m
tick
4
m
;
srb
:
5
m
tick
4
m
tick
5
m
;
br
:
50
m
tick
90
m
tick
90
m
;
bl
:
50
m
tick
90
m
tick
90
m
;
steering
:
0
deg
tick
-
5
deg
tick
5
deg
;
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/VelocityController.emam
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
component
VelocityController
{
port
in
Q
(
0
m
/
s
:
25
m
/
s
)
velocity
,
in
Q
(
0
s
:
oos
)
time
,
out
Q
(-
2
m
/
s
^
2
:
2
m
/
s
^
2
)
acceleration
;
implementation
Math
{
if
(
velocity
>
10
m
/
s
)
acceleration
=
0
m
/
s
^
2
;
else
acceleration
=
1
m
/
s
^
2
;
end
}
}
\ No newline at end of file
src/test/resources/simulatorModel/simulatorModel/VelocityControllerTest.stream
deleted
100644 → 0
View file @
d69df847
package
simulatorModel
;
stream
VelocityControllerTest
for
VelocityController
{
velocity
:
0
m
/
s
tick
10
m
/
s
tick
11
m
/
s
;
time
:
0
s
tick
10
s
tick
11
s
;
acceleration
:
1
m
/
s
^
2
tick
1
m
/
s
^
2
tick
0
m
/
s
^
2
;
}
\ 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