From 015979b483011be86bdb10e5ca0fa7d88695b856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 6 May 2015 17:28:39 +0200 Subject: Fix some comments and if in solution These changes were forgotten after change from minisat to picosat --- conf.py | 2 +- scripts/solution.py | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/conf.py b/conf.py index b769bdb..c68d3bb 100644 --- a/conf.py +++ b/conf.py @@ -9,7 +9,7 @@ novaboot_args = ['--qemu=qemu-system-x86_64'] picosat_args = [] # Programs output show/hide parse_kconfig_output = False -minisat_output = False +picosat_output = False kernel_config_output = True kernel_make_output = True boot_output = True diff --git a/scripts/solution.py b/scripts/solution.py index ee1c043..60e9538 100644 --- a/scripts/solution.py +++ b/scripts/solution.py @@ -10,13 +10,7 @@ from exceptions import NoSolution def generate(): """Collect boolean equations from files: rules, solved and required - And get solution with minisat - - Relevant configurations - rules_file - solver_file - required_file - solution_file + And get solution with picosat """ # Check if rules_file exist. If it was generated. if not os.path.isfile(sf(conf.rules_file)): @@ -52,8 +46,8 @@ def generate(): w_file.close() - # Execute minisat - if conf.minisat_output: + # Execute picosat + if conf.picosat_output: subprocess.call([conf.picosat, w_file.name, '-o', sf(conf.solution_file)] + conf.picosat_args) else: -- cgit v1.2.3