From 91e9c97a6f584bf5fa6904efc6c0a5a3c3e8057c Mon Sep 17 00:00:00 2001
From: T-3B <cle.smagghe@gmail.com>
Date: Wed, 26 Jun 2024 08:52:13 +0200
Subject: [PATCH] revert changes for printing Meta during parsing
---
src/gboml/parsing.py | 4 +---
src/main.py | 19 ++++++++-----------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/gboml/parsing.py b/src/gboml/parsing.py
index 5241af5..150dc23 100644
--- a/src/gboml/parsing.py
+++ b/src/gboml/parsing.py
@@ -11,9 +11,7 @@ from gboml.tools.tree_modifier import modify, visit
def _op_transform(op): return lambda *x, meta: ExpressionOp(op, list(x), meta=meta)
def _bool_op_transform(op): return lambda *x, meta: BoolExpressionOp(op, list(x), meta=meta)
-def gen_meta(lark_token: Token) -> Meta:
- print(lark_token.line, lark_token.column)
- return Meta(line=lark_token.line, column=lark_token.column, filename=None)
+def gen_meta(lark_token: Token) -> Meta: return Meta(line=lark_token.line, column=lark_token.column, filename=None)
def _vargs(f, data, children, _meta):
diff --git a/src/main.py b/src/main.py
index fd7c11d..7ac1c9d 100755
--- a/src/main.py
+++ b/src/main.py
@@ -4,21 +4,18 @@ from gboml.parsing import GBOMLParser
from gboml.semantic import semantic_check
from gboml.scope import RootScope
-tree = GBOMLParser().parse("""#TIMEHORIZON
- T = 1;
-#GLOBAL
- b = 4;
+tree = GBOMLParser().parse("""// Test working constrainting and optimizing only one element of vector
-// Working example where x = -4
+#TIMEHORIZON
+T = 10;
-#NODE H
-#VARIABLES
-internal : x;
-internal : y;
+#NODE A
+#VARIABLES
+internal : x[T];
#CONSTRAINTS
-x<=-4;
+x[T-1]>=0;
#OBJECTIVES
-max : x + global.b;
+min: x[T-1];
""")
# c = 2e2;
# d = -1;
--
GitLab