From 0124ff6822df8e626dec1240dc77a0a64da5a725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 2 May 2015 13:28:08 +0200 Subject: Fixes in scripts and add minisat_args --- scripts/solution.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts/solution.py') diff --git a/scripts/solution.py b/scripts/solution.py index 21f6d88..a09257a 100644 --- a/scripts/solution.py +++ b/scripts/solution.py @@ -36,7 +36,7 @@ def generate(): if ln not in lines: lines.add(ln) if os.path.isfile(sf(conf.required_file)): - for lnn in open((conf.required_file), 'r'): + for lnn in open(sf(conf.required_file), 'r'): ln = lnn.rstrip() if ln not in lines: lines.add(ln) @@ -54,9 +54,11 @@ def generate(): # Execute minisat if conf.minisat_output: - subprocess.call(['minisat', w_file.name, sf(conf.solution_file)]) + subprocess.call(['minisat', w_file.name, sf(conf.solution_file)] + + conf.minisat_args) else: - subprocess.call(['minisat', w_file.name, sf(conf.solution_file)], stdout=subprocess.DEVNULL) + subprocess.call(['minisat', w_file.name, sf(conf.solution_file)] + + conf.minisat_args, stdout=subprocess.DEVNULL) os.remove(w_file.name) @@ -98,6 +100,7 @@ def apply(): f.write( ntx + txt + " ") f.write("\n") + # Load variable count with open(sf(conf.symbol_map_file)) as f: for var_num, l in enumerate(f): pass -- cgit v1.2.3