Attempt at fixing issue #113

Author: gfrances

python/parser/asp/parser/grounder.py

@@ -423,8 +423,14 @@ def ground(self):
                             cond_args = tokens[2].split(",")
                         else:
                             cond_args = []
-                        cond_args = [self.asp_objects[arg].name for arg in cond_args]
-                        self.problem.code_conds[cond_name].groundings.append(tuple(cond_args))
+                        condition = self.problem.code_conds[cond_name]
+
+                        grounding = tuple(self.asp_objects[arg].name for arg in cond_args)
+                        condition.groundings.append(grounding)
+
+                        if hasattr(condition, "variables"):
+                            binding = dict(zip(condition.relevant_vars, grounding))
+                            condition.bindings.append(tuple(binding.get(var, var) for var in condition.variables))
 
                     elif tokens[0] == "reachable_a":
                         pred_name = tokens[1]
@@ -433,9 +439,11 @@ def ground(self):
                         else:
                             pred_args = []
 
-                        pred_args = [self.asp_objects[arg].name for arg in pred_args]
-                        # if ("clean" in pred_name): print(pred_name)
-                        self.asp_actions[pred_name].groundings.append(tuple(pred_args))
+                        action = self.asp_actions[pred_name]
+                        grounding = tuple(self.asp_objects[arg].name for arg in pred_args)
+                        binding = dict(zip(action.param_names, grounding))
+                        action.groundings.append(grounding)
+                        action.bindings.append(tuple(binding.get(var) for var in action.param_names))
 
                     elif tokens[0] == "reachable_f":
                         pred_name = tokens[1]

python/parser/asp/problem.py

@@ -13,6 +13,7 @@
 
 import itertools
 
+from ..asp import strips_problem
 from ..exceptions import UnimplementedFeature
 from ..asp.utilities import ProblemException, default_type_name, cond_prefix,\
     inequality_prefix, grounding_error_code, lower_var_alphabet, NOT_CONDITION,\
@@ -75,6 +76,8 @@ def __str__(self):
         """
         return self.name
 
+    __repr__ = __str__
+
     def add_object(self, obj):
         """ Add the object to the type and to all of its ancestors.
             (Type, str) -> None
@@ -143,9 +146,9 @@ def __str__(self):
         """ Return a short string representation of the predicate
             (Predicate) -> str
         """
-        return "( " + self.name + " " + " ".join([x + " - " + str(y)\
-            for x, y in zip(self.variables, self.types)]) + " )"
+        return "( " + self.name + " " + " ".join(x + " - " + str(y) for x, y in zip(self.variables, self.types)) + " )"
 
+    __repr__ = __str__
 
 class Condition(object):
     """ A formula used as a precondition or head of an axiom or conditional effect. """
@@ -155,6 +158,7 @@ def __init__(self):
             (Condition) -> None
         """
         self.groundings = []
+        self.bindings = []
         self.desc = None
 
     def substitute_derived_predicates(self, derived_predicates, seen_preds):
@@ -298,12 +302,9 @@ def detect_statics(self, candidates, neg_candidates):
         """ Remove entries from candidates which are deleted somewhere in this effect.
             (PredicateCondition, set([(Predicate, [str])], set([(Predicate, [str])) -> None
         """
-        if self.sign:
-            for grounding in self.groundings:
-                neg_candidates.discard((self.pred, grounding))
-        else:
-            for grounding in self.groundings:
-                candidates.discard((self.pred, grounding))
+        cand_list = candidates if not self.sign else neg_candidates
+        for binding in self.bindings:
+            cand_list.discard((self.pred, binding))
 
     def link_groundings(self, static_preds, neg_static_preds):
         """ Link the groundings in this condition to the groundings in its
@@ -1484,6 +1485,7 @@ def __init__(self, name, parameters, types, precondition, effect, is_derived):
         self.is_noop = False
 
         self.groundings = []
+        self.bindings = []  # Same as groundings, but maps variable name to actual value
         self.ground_preconditions = {}
         self.ground_effects = {}