Merge pull request #103 from haz/main

Fixing three subtle bugs with numerics in problem files.

pddl/parser/common.lark

@@ -58,7 +58,7 @@ DECREASE: "decrease"
 MAXIMIZE: "maximize"
 MINIMIZE: "minimize"
 TOTAL_COST: "total-cost"
-NUMBER: /[0-9]+(.[0-9]+)*/
+NUMBER: /[0-9]+(\.[0-9]+)*/
 
 // available requirements
 STRIPS: ":strips"
@@ -81,4 +81,4 @@ ACTION_COSTS: ":action-costs"
 LPAR : "("
 RPAR : ")"
 TYPE_SEP: "-"
-TYPE_NUMBER: "number"
+TYPE_NUMBER: "number"

pddl/parser/problem.lark

@@ -20,14 +20,13 @@ basic_function_term:   NAME
                    |   LPAR NAME NAME* RPAR
 
 atomic_formula_name:   LPAR predicate NAME* RPAR
-                   |   LPAR EQUAL_OP NAME NAME RPAR
 
 goal:  LPAR GOAL gd_name RPAR
 
 gd_name:    atomic_formula_name
        |    LPAR NOT atomic_formula_name RPAR
        |    LPAR AND gd_name* RPAR
-       |    LPAR binary_comp f_exp f_exp RPAR
+       |    LPAR binary_comp metric_f_exp metric_f_exp RPAR
 
 metric_spec: LPAR METRIC optimization metric_f_exp RPAR
 

tests/test_parser/test_problem.py

@@ -111,3 +111,70 @@ def test_problem_init_predicate_repetition_name_allowed() -> None:
     """
     )
     ProblemParser()(problem_str)
+
+
+def test_numeric_comparison_in_goal() -> None:
+    """Try to parse a goal with a numeric condition."""
+    problem_str = dedent(
+        """
+    (define (problem hello-3-times)
+        (:domain hello-world-functions)
+
+        (:init
+            ; if this was undefined, some planners would not assumed `0`
+            (= (hello_counter jimmy) 0)
+        )
+
+        (:goal
+            (> 5 3)
+        )
+    )
+    """
+    )
+    ProblemParser()(problem_str)
+
+
+def test_numeric_function_comparison_in_goal() -> None:
+    """Try to parse a goal with a numeric condition and function."""
+    problem_str = dedent(
+        """
+    (define (problem hello-3-times)
+        (:domain hello-world-functions)
+
+        (:init
+            ; if this was undefined, some planners would not assumed `0`
+            (= (hello_counter jimmy) 0)
+        )
+
+        (:goal
+            (>= (hello_counter jimmy) 3)
+        )
+    )
+    """
+    )
+    ProblemParser()(problem_str)
+
+
+def test_numeric_function_equality_in_goal() -> None:
+    """Try to parse a goal with a numeric condition and function."""
+    problem_str = dedent(
+        """
+    (define (problem hello-3-times)
+        (:domain hello-world-functions)
+
+        (:init
+            ; if this was undefined, some planners would not assumed `0`
+            (= (hello_counter jimmy) 0)
+            (= (hello_counter jammy) 0)
+        )
+
+        (:goal
+            (and
+                (= 3 (hello_counter jimmy))
+                (= (hello_counter jammy) 5)
+            )
+        )
+    )
+    """
+    )
+    ProblemParser()(problem_str)