aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf.py4
-rw-r--r--scripts/configurations.py8
2 files changed, 8 insertions, 4 deletions
diff --git a/conf.py b/conf.py
index 31f343a..fd905b0 100644
--- a/conf.py
+++ b/conf.py
@@ -35,6 +35,10 @@ parse_command = ['./parse_script']
# Identifier of measurement can consist of measure tool name and version
measure_identifier = 'cyclictest-v0.92'
+# measurement_identifier
+# Identifier of measurement can consist of measure tool name and version
+measure_identifier = 'cyclictest-v0.92'
+
# picosat_args
# Additional arguments passed to PicoSAT.
picosat_args = []
diff --git a/scripts/configurations.py b/scripts/configurations.py
index 0a15d5f..a9ede05 100644
--- a/scripts/configurations.py
+++ b/scripts/configurations.py
@@ -171,16 +171,16 @@ def __generate_single__(var_num, conf_num):
if not measure_list:
return False
tfile = __buildtempcnf__(var_num, (sf(conf.rules_file),
- sf(conf.fixed_file)), [str(measure_list.pop())])
+ sf(conf.fixed_file)), (str(measure_list.pop())))
with open(sf(conf.single_generated_file), 'w') as fo:
- for ln in measure_list:
- fo.write(str(ln) + '\n')
+ fo.writelines(measure_list)
try:
confs = __exec_sat__(tfile, ['-i', '0'])
for con in confs:
__register_conf__(con, conf_num, 'single-sat')
except exceptions.NoSolution:
- __generate_single__(var_num, conf_num)
+ os.remove(tfile)
+ return __generate_single__(var_num, conf_num)
finally:
os.remove(tfile)
return True