fixed typos

dmeoli · dmeoli · commit 08ad6603ce7b · 2019-11-02T01:55:34.000+01:00
diff --git a/logic.py b/logic.py
@@ -128,13 +128,13 @@ def program(percept):
         return action
 
     def make_percept_sentence(percept, t):
-        return Expr("Percept")(percept, t)
+        return Expr('Percept')(percept, t)
 
     def make_action_query(t):
-        return expr("ShouldDo(action, {})".format(t))
+        return expr('ShouldDo(action, {})'.format(t))
 
     def make_action_sentence(action, t):
-        return Expr("Did")(action[expr('action')], t)
+        return Expr('Did')(action[expr('action')], t)
 
     return program
 
@@ -325,7 +325,7 @@ def pl_true(exp, model={}):
     elif op == '^':  # xor or 'not equivalent'
         return pt != qt
     else:
-        raise ValueError("illegal operator in logic expression" + str(exp))
+        raise ValueError('Illegal operator in logic expression' + str(exp))
 
 
 # ______________________________________________________________________________
@@ -1933,7 +1933,7 @@ def tell(self, sentence):
         if is_definite_clause(sentence):
             self.clauses.append(sentence)
         else:
-            raise Exception("Not a definite clause: {}".format(sentence))
+            raise Exception('Not a definite clause: {}'.format(sentence))
 
     def ask_generator(self, query):
         return fol_bc_ask(self, query)
@@ -2085,7 +2085,7 @@ def diff(y, x):
         elif op == 'log':
             return diff(u, x) / u
         else:
-            raise ValueError("Unknown op: {} in diff({}, {})".format(op, y, x))
+            raise ValueError('Unknown op: {} in diff({}, {})'.format(op, y, x))
 
 
 def simp(x):
@@ -2146,7 +2146,7 @@ def simp(x):
         if u == 1:
             return 0
     else:
-        raise ValueError("Unknown op: " + op)
+        raise ValueError('Unknown op: ' + op)
     # If we fall through to here, we can not simplify further
     return Expr(op, *args)
 
diff --git a/planning.py b/planning.py
@@ -173,9 +173,9 @@ class Action:
     Precondition and effect are both lists with positive and negative literals.
     Negative preconditions and effects are defined by adding a 'Not' before the name of the clause
     Example:
-    precond = [expr("Human(person)"), expr("Hungry(Person)"), expr("NotEaten(food)")]
-    effect = [expr("Eaten(food)"), expr("Hungry(person)")]
-    eat = Action(expr("Eat(person, food)"), precond, effect)
+    precond = [expr('Human(person)'), expr('Hungry(Person)'), expr('NotEaten(food)')]
+    effect = [expr('Eaten(food)'), expr('Hungry(person)')]
+    eat = Action(expr('Eat(person, food)'), precond, effect)
     """
 
     def __init__(self, action, precond, effect, domain=None):
@@ -1371,7 +1371,12 @@ def execute(self, display=True):
                 self.constraints = self.protect((act0, G, act1), action, self.constraints)
 
             if step > 200:
-                print("Couldn't find a solution")
+                print('Couldn'
+                t
+                find
+                a
+                solution
+                ')
                 return None, None
 
         if display:
@@ -1450,12 +1455,18 @@ def do_action(self, job_order, available_resources, kb, args):
         if not self.has_consumable_resource(available_resources):
             raise Exception('Not enough consumable resources to execute {}'.format(self.name))
         if not self.inorder(job_order):
-            raise Exception("Can't execute {} - execute prerequisite actions first".
-                            format(self.name))
-        kb = super().act(kb, args)  # update knowledge base
-        for resource in self.consumes:  # remove consumed resources
-            available_resources[resource] -= self.consumes[resource]
-        self.completed = True  # set the task status to complete
+            raise Exception('Can'
+            t
+            execute
+            {} - execute
+            prerequisite
+            actions
+            first
+            '.format(self.name))
+            kb = super().act(kb, args)  # update knowledge base
+            for resource in self.consumes:  # remove consumed resources
+                available_resources[resource] -= self.consumes[resource]
+            self.completed = True  # set the task status to complete
         return kb
 
     def has_consumable_resource(self, available_resources):
diff --git a/search.py b/search.py
@@ -1412,7 +1412,7 @@ class BoggleFinder:
 
     def __init__(self, board=None):
         if BoggleFinder.wordlist is None:
-            BoggleFinder.wordlist = Wordlist(open_data("EN-text/wordlist.txt"))
+            BoggleFinder.wordlist = Wordlist(open_data('EN-text/wordlist.txt'))
         self.found = {}
         if board:
             self.set_board(board)
