From 6d9749909edbf68e87be25c97d1c4025e3e7cffc Mon Sep 17 00:00:00 2001 From: Kamil Szczerbak Date: Mon, 12 Jun 2023 09:20:02 +0000 Subject: [PATCH 1/8] feat: use PQL and PKB in piptester --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index f79d244..898dabe 100644 --- a/main.py +++ b/main.py @@ -58,4 +58,4 @@ query = input() + "\n" + input() # TODO: use PQL and PKB - print("8") + print(evaluate_query(tree, query)) From 71efe7f8c785e2ff898738db43efb5b6517d1b0e Mon Sep 17 00:00:00 2001 From: Kamil Szczerbak Date: Mon, 12 Jun 2023 09:32:34 +0000 Subject: [PATCH 2/8] fix: print string --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 898dabe..d66d910 100644 --- a/main.py +++ b/main.py @@ -58,4 +58,4 @@ query = input() + "\n" + input() # TODO: use PQL and PKB - print(evaluate_query(tree, query)) + print(str(evaluate_query(tree, query))) From 588c131828f2ca7dcd12ea27369add5562fcf320 Mon Sep 17 00:00:00 2001 From: Kamil Szczerbak Date: Mon, 12 Jun 2023 09:55:41 +0000 Subject: [PATCH 3/8] fix: print string with coma --- main.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/main.py b/main.py index d66d910..66c36f3 100644 --- a/main.py +++ b/main.py @@ -38,16 +38,11 @@ ) ) - queries = parse_query( - # """stmt s1; while w1; Select BOOLEAN such that Follows(s1, w1)""" - """ - procedure p, q; - Select BOOLEAN such that Calls(_, _) - """ - ) + queries = parse_query("""stmt s1, s2; Select s1 such that Follows(s1, s2)""") print(evaluate_query(tree, queries[0])) - + print(str(evaluate_query(tree, queries[0]))) + print(*evaluate_query(tree, queries[0]), sep=", ") elif len(sys.argv) > 0: with open(sys.argv[-1]) as f: code = f.read() @@ -58,4 +53,5 @@ query = input() + "\n" + input() # TODO: use PQL and PKB - print(str(evaluate_query(tree, query))) + + print(*evaluate_query(tree, query[0]), sep=", ") From 33e45a8dfb808034f55c3c3a8c2b03dbe6f4b0c2 Mon Sep 17 00:00:00 2001 From: Kamil Szczerbak Date: Mon, 12 Jun 2023 10:18:23 +0000 Subject: [PATCH 4/8] fix: print results --- main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 66c36f3..ba5dffb 100644 --- a/main.py +++ b/main.py @@ -43,6 +43,7 @@ print(evaluate_query(tree, queries[0])) print(str(evaluate_query(tree, queries[0]))) print(*evaluate_query(tree, queries[0]), sep=", ") + # print(str(*evaluate_query(tree, queries[0]), sep=", ")) elif len(sys.argv) > 0: with open(sys.argv[-1]) as f: code = f.read() @@ -51,7 +52,6 @@ print("Ready") query = input() + "\n" + input() - + queries = parse_query(query) # TODO: use PQL and PKB - - print(*evaluate_query(tree, query[0]), sep=", ") + print(*evaluate_query(tree, queries[0]), sep=", ") From e81988276a37f8268b898c318de5d8034ba0f8ea Mon Sep 17 00:00:00 2001 From: Kamil Szczerbak Date: Mon, 12 Jun 2023 11:38:51 +0000 Subject: [PATCH 5/8] fix: to filip solution --- main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index ba5dffb..3a4ea89 100644 --- a/main.py +++ b/main.py @@ -43,6 +43,9 @@ print(evaluate_query(tree, queries[0])) print(str(evaluate_query(tree, queries[0]))) print(*evaluate_query(tree, queries[0]), sep=", ") + result = evaluate_query(tree, queries[0]) + output = ", ".join(str(part) for part in result) + print(output) # print(str(*evaluate_query(tree, queries[0]), sep=", ")) elif len(sys.argv) > 0: with open(sys.argv[-1]) as f: @@ -52,6 +55,8 @@ print("Ready") query = input() + "\n" + input() + queries = parse_query(query) - # TODO: use PQL and PKB - print(*evaluate_query(tree, queries[0]), sep=", ") + result = evaluate_query(tree, queries[0]) + output = ", ".join(str(part) for part in result) + print(output) From 2dbe57e49db52ead22cff346e2143f4b3bd08e11 Mon Sep 17 00:00:00 2001 From: KamiloSzcz <127205348+KamiloSzcz@users.noreply.github.com> Date: Tue, 13 Jun 2023 12:51:12 +0200 Subject: [PATCH 6/8] Update main.py --- main.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/main.py b/main.py index 3a4ea89..d4c2d73 100644 --- a/main.py +++ b/main.py @@ -47,7 +47,39 @@ output = ", ".join(str(part) for part in result) print(output) # print(str(*evaluate_query(tree, queries[0]), sep=", ")) + + elif len(sys.argv) > 0: + + def no_time_left(): + print("\nPreparationTimeout") + exit(1) + + with open(sys.argv[-1]) as f: + code = f.read() + tree = parse(code) + print("Ready") + + while True: + try: + t = Timer(60, no_time_left) + t.start() + query = input() + "\n" + input() + t.cancel() + # TODO: Wyjątki powinny być zgłaszane na stdout lub stderr, w jednej linni, zaczynającej się od znaku kratki #. + + queries = parse_query(query) + result = evaluate_query(tree, queries[0]) + if len(result) == 0: + print('none') + continue + + output = ", ".join(str(part) for part in result) + print(output) + except Exception: + import traceback + print('#') + ''' with open(sys.argv[-1]) as f: code = f.read() tree = parse(code) @@ -60,3 +92,4 @@ result = evaluate_query(tree, queries[0]) output = ", ".join(str(part) for part in result) print(output) + ''' From 66d38836f1acc0213d75d863a0ede9004a129697 Mon Sep 17 00:00:00 2001 From: KamiloSzcz <127205348+KamiloSzcz@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:08:11 +0200 Subject: [PATCH 7/8] Update main.py --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index d4c2d73..e0f0438 100644 --- a/main.py +++ b/main.py @@ -78,7 +78,7 @@ def no_time_left(): print(output) except Exception: import traceback - print('#') + print('#' + "ahaha") ''' with open(sys.argv[-1]) as f: code = f.read() From cb2f9527d1eaf5aa134402a1fd156a821b45a4b3 Mon Sep 17 00:00:00 2001 From: KamiloSzcz <127205348+KamiloSzcz@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:15:37 +0200 Subject: [PATCH 8/8] Update main.py --- main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index e0f0438..1e1d51e 100644 --- a/main.py +++ b/main.py @@ -70,15 +70,13 @@ def no_time_left(): queries = parse_query(query) result = evaluate_query(tree, queries[0]) - if len(result) == 0: - print('none') - continue + output = ", ".join(str(part) for part in result) print(output) except Exception: import traceback - print('#' + "ahaha") + print('#' + traceback.format_exc()) ''' with open(sys.argv[-1]) as f: code = f.read()