Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
stgroup
ttc18
Commits
b1fb4203
Commit
b1fb4203
authored
Jun 26, 2018
by
René Schöne
Browse files
Fixing parser to allow request to have optional names. Also fixed test models.
parent
4cee4793
Changes
6
Hide whitespace changes
Inline
Side-by-side
jastadd-mquat-base/src/main/jastadd/mquat.parser
View file @
b1fb4203
...
...
@@ -37,7 +37,7 @@ import java.util.HashMap;
%
goal
solution
;
Request
request
=
REQUEST
NAME
FOR
component_ref
.
c
LB_CURLY
request_body
.
b
RB_CURLY
{:
b
.
setTarget
(
c
);
return
b
;
:}
REQUEST
NAME
?
FOR
component_ref
.
c
LB_CURLY
request_body
.
b
RB_CURLY
{:
b
.
setTarget
(
c
);
return
b
;
:}
;
Request
request_body
=
...
...
jastadd-mquat-solver/src/test/resources/test_01.txt
View file @
b1fb4203
...
...
@@ -85,7 +85,7 @@ component c1 {
providing energy = ((0.02*(size^2))+(0.71*compute_resource_0.flops))
}
}
request c0 {
request
for
c0 {
meta size = 6
requiring quality >= 35
}
...
...
jastadd-mquat-solver/src/test/resources/test_02.txt
View file @
b1fb4203
...
...
@@ -88,7 +88,7 @@ component c1 {
providing energy = ((0.02*(size^2))+(0.71*compute_resource_0.flops))
}
}
request c0 {
request
for
c0 {
meta size = 1
requiring quality >= 35
}
...
...
jastadd-mquat-solver/src/test/resources/test_03.txt
View file @
b1fb4203
...
...
@@ -104,11 +104,11 @@ component c1 {
providing energy = ((0.02*(size^2))+(0.71*compute_resource_0.flops))
}
}
request c0 {
request
for
c0 {
meta size = 1
requiring quality >= 35
}
request c1 {
request
for
c1 {
meta size = 40
requiring quality >= 35
}
...
...
jastadd-mquat-solver/src/test/resources/test_04.txt
View file @
b1fb4203
...
...
@@ -124,7 +124,7 @@ component c2 {
}
}
request c0 {
request
for
c0 {
meta size = 2
requiring quality >= 35
}
...
...
jastadd-mquat-solver/src/test/resources/test_05.txt
View file @
b1fb4203
...
...
@@ -226,7 +226,7 @@ component G {
}
}
request A {
request
for
A {
meta size = 2
requiring quality >= 35
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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