From 47a7ae550ad7c24efc3d9be5a30946adb32aab12 Mon Sep 17 00:00:00 2001
From: TheAeryan <e.ccaarlos@go.ugr.es>
Date: Fri, 23 Jun 2023 13:19:33 -0400
Subject: [PATCH] Solved bug that occurred when parsing problems whose goal
 contained a single atom

---
 setup.py                                      |   2 +-
 src/lifted_pddl/__init__.py                   |   2 +-
 .../__pycache__/__init__.cpython-39.pyc       | Bin 229 -> 229 bytes
 .../__pycache__/parser.cpython-39.pyc         | Bin 17580 -> 17818 bytes
 src/lifted_pddl/parser.py                     |  12 +++++++++---
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index ef7397c..b07c72e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
     long_description = fh.read()
 
 setuptools.setup(name='lifted-pddl',
-      version='1.2.1',
+      version='1.2.2',
       description='A lightweight framework for parsing PDDL in lifted form.',
       long_description=long_description,
       long_description_content_type="text/markdown",
diff --git a/src/lifted_pddl/__init__.py b/src/lifted_pddl/__init__.py
index 0584430..48680cc 100644
--- a/src/lifted_pddl/__init__.py
+++ b/src/lifted_pddl/__init__.py
@@ -1,5 +1,5 @@
 # __init__.py
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 from lifted_pddl.parser import Parser
diff --git a/src/lifted_pddl/__pycache__/__init__.cpython-39.pyc b/src/lifted_pddl/__pycache__/__init__.cpython-39.pyc
index c2dc739ebb01458b83345e10af866c9fb472bfd6..91627fda5610c5ca76169b1684dc2a70daad3784 100644
GIT binary patch
delta 23
dcmaFL_>_?=k(ZZ?0SMeCPvml7G@R%?3jjk=1-JkJ

delta 23
dcmaFL_>_?=k(ZZ?0SH!BP2_T5G??f;3jjt+1_1y7

diff --git a/src/lifted_pddl/__pycache__/parser.cpython-39.pyc b/src/lifted_pddl/__pycache__/parser.cpython-39.pyc
index bad74c7ae09b710f958accc9694f714424b591cd..fb440e960c1b2c447d9160de200b824a712c9836 100644
GIT binary patch
delta 640
zcmXAmUr3Wt7{<TnOh3Q<(^<^+>2z!5=A4O*GB%ro)Qd?MQG%hBnBP=J*jS&XVu)C#
zNM7_3+8??qA<#-rH<ejkDs;1p6-8j(N6<}w!Opi1oFC8ooQL<koU=TO+jA)Hwc9O{
zSl6>Rwb#?D#cfVYktj`KUs$8l&YrWnWt^p~x^0SO7Ij4{G^&(6Rjij>llq~_TG16H
z?>SnfDNLc?G$1%5^^^{I^Zt&@vaaN_ipE4%{+}}vnsh=6nrYJ9NWX11zPD@x=%CMj
zC+$<K>5(g7{VN8^gapO{wB_<B1IeM}NIKI@Uw6Hs<LVwJf!?|9F@P?q?WGdL+_H$v
zVB2*F?xd{R63Rq`(^W8VzV}?lY&1+52pDi0Xg5%4po4tnCtc-2O0Yqe6*%CKEpRC|
zG?-|<{240%PgIEe>~z#U4hwC#?=lA{QQ@KK%2lYsc2h@HE6V6r)h66r^ArNrl=2S4
zM_b-csORgu7fooV&g#eLq_jUl$NV022{njrK_C6`$IwHOz*Xq<Dlm!%dAGYJjwPW~
z`c`SCmo=MMrkUWRprtm6HA>fxBAY)qg&rbDE1@uQd@J;vA<FO6zW_e+&W0zzFH*wq
z85sW(ZUesangcl?NZSV&5aSDtVZg^X53K`zG#i;iA9qG&pr71L!-6-OF5(O~A0C8t
wf{91Ve@~PU-%l&CI!y2nF*h(tKbl7b)A3Un<8R|RhIxMfNQvl8Pg{Qe1Cv~}djJ3c

delta 512
zcmXAiUr3W-6vn^j-F%y$-`1oYOTRfa@Y_F#R&8P1l(t>ion^41%?T@qM1f6fwP0dH
z%^>Jp6crW)L1du3&_AJWB1&THCh5k@E`qv<pkzYzRtL_H=R6#q=jI$1W?>t)T2)2P
z>#LNzTv@UuTU4_=O>)naDcv&EU1Fo^XwyYruuLl_kZZ`XOO_H(C{viij54I<ltYS_
z(_~|a>Y669j(4Cpwq~k27b)j7SY4s}+veGZLh;rE&Go;*T!MrB4!~=r`PR7gsCne{
z@X4`3>5sWcYfEi)NU1;r=N8yu=PI0>N^Q^CFGYlP25h1pR|#f%>beb;LV5=k+Ly3J
zx;pK5Ct#;(_X-^1U`GSsrc~!RbgFi)!6O#BZkU=9kX?RRaz09BUzDzN=P^JTqn~1i
z8-r5iaagj8J{wUSA;VL_DSGTF;?6&}-`mUXf?nC2wAS88kGv~*Koh=6$#vgxJfV!g
z$lm{d_~w6z8r=#6Q4`g`3x?fdcE>XCK_quB0^jLJ@FUxRsO?GuUxZ`NDzKfthOQ$l
zD&ZiYi)VXZ0%<ziGl#S=?c+d})X2DGIWmEi_!-FqMasrTP!w-tI&gtL^`4W=^c_P%
TEcdN4%!q68%`%PdCD#7{EVG<!

diff --git a/src/lifted_pddl/parser.py b/src/lifted_pddl/parser.py
index 5ce5948..4f00f8a 100644
--- a/src/lifted_pddl/parser.py
+++ b/src/lifted_pddl/parser.py
@@ -246,9 +246,15 @@ def parse_problem(self, problem_path):
 		# Each goal is represented as a tuple (is_true, pred_name, object_indexes)
 		# object_indexes is a tuple containing the index of each object the atom of the goal is instantiated on
 		# is_true equals False if the goal is negative (e.g., (not (at t1 l1)) ) and True otherwise
-		subformulas = problem.goal.subformulas
-		self.goals = set([(True, x.predicate.name, tuple(self.object_names.index(obj.name) for obj in x.subterms)) if isinstance(x, Atom) else \
-					  (False, x.subformulas[0].predicate.name, tuple(self.object_names.index(obj.name) for obj in x.subformulas[0].subterms)) for x in subformulas])
+		
+		# The goal contains a single atom (e.g., ( :goal (and (on b2 b1))) )
+		if isinstance(problem.goal, Atom):
+			self.goals = set([(True, problem.goal.predicate.name, tuple(self.object_names.index(obj.name) for obj in problem.goal.subterms))])			
+
+		else: # The goal contains more than a single atom
+			subformulas = problem.goal.subformulas
+			self.goals = set([(True, x.predicate.name, tuple(self.object_names.index(obj.name) for obj in x.subterms)) if isinstance(x, Atom) else \
+						  (False, x.subformulas[0].predicate.name, tuple(self.object_names.index(obj.name) for obj in x.subformulas[0].subterms)) for x in subformulas])
 
 	# Returns the name of the object whose index is @obj_ind
 	def get_object_name(self, obj_ind):