Merge branch 'main' into linter-notes

Author: andrewcropper

popper/bkcons.py

@@ -755,8 +755,7 @@ def deduce_recalls(settings):
             solver.add('base', [], bk)
             solver.ground([('base', [])])
     except Exception as Err:
-        settings.logger.error(f'ERROR deducing recalls: {Err}')
-        traceback.print_exc(None, file=sys.stderr)
+        print('WARNING: cannot deduce recalls', Err)
         return None
 
     for pred, arity in settings.body_preds:

popper/gen2.py

@@ -54,8 +54,9 @@ def __init__(self, settings, bkcons=[]):
         bias_text = re.sub(r'max_body\(\d*\).', '', bias_text)
         bias_text = re.sub(r'max_clauses\(\d*\).', '', bias_text)
 
-        for p, a in settings.pointless:
-            bias_text = re.sub(rf'body_pred\({p},{a}\).', '', bias_text)
+        # AC: NEED TO COMPLETELY REFACTOR THIS CODE
+        for p,a in settings.pointless:
+            bias_text = re.sub(rf'body_pred\({p},\s*{a}\)\.', '', bias_text)
             bias_text = re.sub(rf'constant\({p},.*?\).*', '', bias_text, flags=re.MULTILINE)
 
         encoding.append(bias_text)