artur/reactics
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cache. Massive improvement

Browse Source
This commit is contained in:
Artur Meski
2017-03-19 15:58:44 +01:00
parent 9cf5477169
commit 5a34d4028b
2 changed files with 68 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
logics/rsltl_encoder.py
View File

@@ -15,10 +15,45 @@ class rsLTL_Encoder(object):
self.init_ncalls()
def get_encoding(self, formula, bound):
self.cache_init(bound)
return self.encode(formula, 0, bound)
def init_ncalls(self):
self.ncalls_encode = 0
self.ncalls_encode_approx = 0
def cache_init(self, bound):
"""
Cache for formulae encodings
"""
self.cache_hits = 0
self.enc_fcache = [{} for level in range(0,bound+1)]
self.enc_fcache_approx = [{} for level in range(0,bound+1)]
def cache_save(self, formula, level, formula_encoding):
self.enc_fcache[level][formula] = formula_encoding
def cache_approx_save(self, formula, level, formula_encoding):
self.enc_fcache_approx[level][formula] = formula_encoding
def cache_query(self, formula, level):
if formula in self.enc_fcache[level]:
self.cache_hits += 1
return self.enc_fcache[level][formula]
else:
return None
def cache_query_approx(self, formula, level):
if formula in self.enc_fcache_approx[level]:
self.cache_hits += 1
return self.enc_fcache_approx[level][formula]
else:
return None
def get_cache_hits(self):
return self.cache_hits
def get_ncalls(self):
return (self.ncalls_encode, self.ncalls_encode_approx)
@@ -73,6 +108,12 @@ class rsLTL_Encoder(object):
self.ncalls_encode += 1
from_cache = self.cache_query(formula, level)
if from_cache is not None:
return from_cache
enc = None
if not isinstance(formula, Formula_rsLTL):
raise NotImplementedError("Unsupported formula type: " + str(type(formula)))
@@ -80,29 +121,29 @@ class rsLTL_Encoder(object):
raise RuntimeError("level > bound. Unexpected behaviour. The encoding does not support levels higher than a bound.")
if formula.f_type == rsLTL_form_type.bag:
return self.encode_bag_state(formula.bag_descr, level)
enc = self.encode_bag_state(formula.bag_descr, level)
elif formula.f_type == rsLTL_form_type.l_not:
subform = formula.left_operand
if subform.is_bag:
return Not(self.encode_bag_state(subform, level))
enc = Not(self.encode_bag_state(subform, level))
else:
raise RuntimeError("Negation can be applied to bags only")
elif formula.f_type == rsLTL_form_type.l_and:
return And(
enc = And(
self.encode(formula.left_operand, level, bound),
self.encode(formula.right_operand, level, bound)
)
elif formula.f_type == rsLTL_form_type.l_or:
return Or(
enc = Or(
self.encode(formula.left_operand, level, bound),
self.encode(formula.right_operand, level, bound)
)
elif formula.f_type == rsLTL_form_type.l_implies:
return Implies(
enc = Implies(
self.encode(formula.left_operand, level, bound),
self.encode(formula.right_operand, level, bound)
)
@@ -122,8 +163,6 @@ class rsLTL_Encoder(object):
enc = And(enc, self.encode_bag_ctx(formula.sub_operand, level))
enc = simplify(enc)
return enc
elif formula.f_type == rsLTL_form_type.t_globally:
if level < bound:
enc = And(
@@ -148,8 +187,6 @@ class rsLTL_Encoder(object):
)
enc = simplify(enc)
return enc
elif formula.f_type == rsLTL_form_type.t_finally:
if level < bound:
enc = Or(
@@ -179,8 +216,6 @@ class rsLTL_Encoder(object):
enc = simplify(enc)
return enc
elif formula.f_type == rsLTL_form_type.t_until:
if level < bound:
inner_enc = self.encode(formula, level + 1, bound)
@@ -204,8 +239,6 @@ class rsLTL_Encoder(object):
)
)
return enc
elif formula.f_type == rsLTL_form_type.t_release:
if level < bound:
inner_enc = self.encode(formula, level + 1, bound)
@@ -231,11 +264,16 @@ class rsLTL_Encoder(object):
)
)
return enc
else:
raise NotImplementedError("Unsupported operator")
if enc is None:
raise RuntimeError("Encoding is NONE. Should never happen")
self.cache_save(formula, level, enc)
return enc
def encode_approx(self, formula, level, bound):
"""Provides the approximation-encoding
@@ -244,6 +282,12 @@ class rsLTL_Encoder(object):
self.ncalls_encode_approx += 1
enc = None
from_cache = self.cache_query_approx(formula, level)
if from_cache is not None:
return from_cache
if formula.f_type == rsLTL_form_type.t_until:
if level < bound:
enc = Or(
@@ -258,8 +302,6 @@ class rsLTL_Encoder(object):
# level == bound
enc = self.encode(formula.right_operand, bound, bound)
return enc
elif formula.f_type == rsLTL_form_type.t_release:
if level < bound:
enc = And(
@@ -276,8 +318,6 @@ class rsLTL_Encoder(object):
# level == bound
enc = self.encode(formula.right_operand, bound, bound)
return enc
elif formula.f_type == rsLTL_form_type.t_globally:
if level < bound:
enc = And(
@@ -289,8 +329,6 @@ class rsLTL_Encoder(object):
# level == bound
enc = self.encode(formula.left_operand, bound, bound)
return enc
elif formula.f_type == rsLTL_form_type.t_finally:
if level < bound:
enc = Or(
@@ -304,9 +342,12 @@ class rsLTL_Encoder(object):
# level == bound
enc = self.encode(formula.left_operand, bound, bound)
return enc
else:
raise NotImplementedError("Unsupported operator in approximation encoding")
if enc is None:
raise RuntimeError("Encoding is NONE. Should never happen")
self.cache_approx_save(formula, level, enc)
return enc

9
smt/smt_checker_rsc.py
View File

@@ -410,14 +410,9 @@ class SmtCheckerRSC(object):
self.solver.push()
print("[" + colour_str(C_BOLD, "i") + "] Generating the formula encoding...")
encoder.init_ncalls()
f = encoder.encode(formula, 0, self.current_level)
f = encoder.get_encoding(formula, self.current_level)
ncalls = encoder.get_ncalls()
print("[" + colour_str(C_BOLD, "i") + "] Encode calls: " + str(ncalls[0]) + " " + str(ncalls[1]), end="")
if ncalls[0] > 9999:
print(" I bet it is rather slow now... :(")
printed = True
else:
print()
print("[" + colour_str(C_BOLD, "i") + "] Cache hits: " + str(encoder.get_cache_hits()) + ", encode calls: " + str(ncalls[0]) + " (approx: " + str(ncalls[1]) + ")")
print("[" + colour_str(C_BOLD, "i") + "] Adding the formula to the solver...")
self.solver.add(f)