From b1fb42030764a18f02b2a4c406a2a68c89847cd2 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 26 Jun 2018 18:07:46 +0200
Subject: [PATCH] Fixing parser to allow request to have optional names. Also
fixed test models.
---
jastadd-mquat-base/src/main/jastadd/mquat.parser | 2 +-
jastadd-mquat-solver/src/test/resources/test_01.txt | 2 +-
jastadd-mquat-solver/src/test/resources/test_02.txt | 2 +-
jastadd-mquat-solver/src/test/resources/test_03.txt | 4 ++--
jastadd-mquat-solver/src/test/resources/test_04.txt | 2 +-
jastadd-mquat-solver/src/test/resources/test_05.txt | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/jastadd-mquat-base/src/main/jastadd/mquat.parser b/jastadd-mquat-base/src/main/jastadd/mquat.parser
index 768e3b2..ba0955b 100644
--- a/jastadd-mquat-base/src/main/jastadd/mquat.parser
+++ b/jastadd-mquat-base/src/main/jastadd/mquat.parser
@@ -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 =
diff --git a/jastadd-mquat-solver/src/test/resources/test_01.txt b/jastadd-mquat-solver/src/test/resources/test_01.txt
index 0905578..c2b5fbd 100644
--- a/jastadd-mquat-solver/src/test/resources/test_01.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_01.txt
@@ -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
}
diff --git a/jastadd-mquat-solver/src/test/resources/test_02.txt b/jastadd-mquat-solver/src/test/resources/test_02.txt
index 08a3dc5..fa6e4fe 100644
--- a/jastadd-mquat-solver/src/test/resources/test_02.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_02.txt
@@ -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
}
diff --git a/jastadd-mquat-solver/src/test/resources/test_03.txt b/jastadd-mquat-solver/src/test/resources/test_03.txt
index 89501f1..7d6b937 100644
--- a/jastadd-mquat-solver/src/test/resources/test_03.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_03.txt
@@ -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
}
diff --git a/jastadd-mquat-solver/src/test/resources/test_04.txt b/jastadd-mquat-solver/src/test/resources/test_04.txt
index 24a42b8..eb58baf 100644
--- a/jastadd-mquat-solver/src/test/resources/test_04.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_04.txt
@@ -124,7 +124,7 @@ component c2 {
}
}
-request c0 {
+request for c0 {
meta size = 2
requiring quality >= 35
}
diff --git a/jastadd-mquat-solver/src/test/resources/test_05.txt b/jastadd-mquat-solver/src/test/resources/test_05.txt
index 3f5806e..1e4fa15 100644
--- a/jastadd-mquat-solver/src/test/resources/test_05.txt
+++ b/jastadd-mquat-solver/src/test/resources/test_05.txt
@@ -226,7 +226,7 @@ component G {
}
}
-request A {
+request for A {
meta size = 2
requiring quality >= 35
}
--
GitLab