diff --git a/src/gboml/parsing.py b/src/gboml/parsing.py index 5241af531b8f0f564fc809fb2d55bcea02ccbb04..150dc23be6774b663e7720a626c895bc60bb26d9 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 fd7c11da5e3ceae806570da5da5d250473129f30..7ac1c9dd5affdae2682d66983b9a015fa4b84e81 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;