From 8cbd482ff0bf58594df2f339b57f22c836494929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 28 Sep 2015 15:45:42 +0200 Subject: Add name of configuration option to generator name for single-sat When generated with single-sat generator, configuration in database haven't had information about what configuration option was used as forced input while generating. --- scripts/configurations.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/configurations.py b/scripts/configurations.py index b30bfc8..9cfb738 100644 --- a/scripts/configurations.py +++ b/scripts/configurations.py @@ -176,6 +176,7 @@ def __register_conf__(con, conf_num, generator): return True def __generate_single__(var_num, conf_num): + utils.build_symbol_map() measure_list = set() if not os.path.isfile(sf(conf.single_generated_file)): with open(sf(conf.measure_file), 'r') as fi: @@ -187,15 +188,17 @@ def __generate_single__(var_num, conf_num): measure_list.add(int(ln)) if not measure_list: return False + measuring = measure_list.pop() tfile = __buildtempcnf__(var_num, (sf(conf.rules_file), - sf(conf.fixed_file)), [str(measure_list.pop())]) + sf(conf.fixed_file)), [str(measuring)]) with open(sf(conf.single_generated_file), 'w') as fo: for ln in measure_list: fo.write(str(ln) + '\n') try: confs = __exec_sat__(tfile, ['-i', '0'], conf_num) for con in confs: - if not __register_conf__(con, conf_num, 'single-sat'): + if not __register_conf__(con, conf_num, 'single-sat-' + + utils.smap[measuring]): return __generate_single__(var_num, conf_num) except exceptions.NoSolution: return __generate_single__(var_num, conf_num) -- cgit v1.2.3