Parse avg, max and min aggregation functions

thiagopbueno · Sep 23, 2018 · dbe708a · dbe708a
1 parent 2fb07fc
commit dbe708a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pyrddl/__init__.py b/pyrddl/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.1.1'
-__release__ = 'v0.1.1-alpha'
+__version__ = '0.1.2'
+__release__ = 'v0.1.2-alpha'
diff --git a/pyrddl/expr.py b/pyrddl/expr.py
@@ -58,6 +58,12 @@ def etype(self) -> Tuple[str, str]:
             return ('aggregation', 'sum')
         elif self._expr[0] == 'prod':
             return ('aggregation', 'prod')
+        elif self._expr[0] == 'avg':
+            return ('aggregation', 'avg')
+        elif self._expr[0] == 'max':
+            return ('aggregation', 'maximum')
+        elif self._expr[0] == 'min':
+            return ('aggregation', 'minimum')
         elif self._expr[0] == 'forall':
             return ('aggregation', 'forall')
         elif self._expr[0] == 'exists':
@@ -84,9 +90,7 @@ def args(self) -> Union[Value, Sequence[ExprArg]]:
             return self._expr[1]
         elif self._expr[0] == 'func':
             return self._expr[1][1]
-        elif self._expr[0] in ['sum', 'prod', 'forall', 'exists']:
-            return self._expr[1]
-        elif self._expr[0] == 'abs':
+        elif self._expr[0] in ['sum', 'prod', 'avg', 'max', 'min', 'forall', 'exists']:
             return self._expr[1]
         elif self._expr[0] == 'if':
             return self._expr[1]