Skip to content

Commit

Permalink
Fixed cache issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@susuhahnml
susuhahnml committed Jun 19, 2024
1 parent bc661bc commit 8e92949
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 55 deletions.
117 changes: 70 additions & 47 deletions clinguin/server/application/backends/clingo_backend.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,9 @@ def _clear_cache(self, methods=None):
self._backup_ds_cache[m] = self.__dict__[m]
del self.__dict__[m]

def _call_solver_with_cache(self, ds_id: str, ds_tag: str = None):
def _call_solver_with_cache(
self, ds_id: str, ds_tag: str, models: int, opt_mode: str, enum_mode: str
):
"""
Generic function to call the using exiting cache on browsing.
Un UNSAT it returns the output saved in the cache
Expand All @@ -334,9 +336,20 @@ def _call_solver_with_cache(self, ds_id: str, ds_tag: str = None):
The program tagged
"""
if self._is_browsing:
self._logger.debug(f"Returning cache for {ds_id}")
return (
self._backup_ds_cache[ds_id] if ds_id in self._backup_ds_cache else ""
)
self._ctl.configuration.solve.models = models
self._ctl.configuration.solve.opt_mode = opt_mode
self._ctl.configuration.solve.enum_mode = enum_mode
self._logger.debug(domctl_log(f'domctl.configuration.solve.models = {models}"'))
self._logger.debug(
domctl_log(f'domctl.configuration.solve.opt_mode = {opt_mode}"')
)
self._logger.debug(
domctl_log(f'domctl.configuration.solve.enum_mode = {enum_mode}"')
)
self._prepare()
symbols, ucore = solve(
self._ctl, [(a, True) for a in self._get_assumptions()], self._on_model
Expand All @@ -352,8 +365,6 @@ def _call_solver_with_cache(self, ds_id: str, ds_tag: str = None):
return (
self._backup_ds_cache[ds_id] if ds_id in self._backup_ds_cache else ""
)
if ds_tag is None:
return " ".join([str(s) + "." for s in symbols]) + "\n"
return " ".join([str(s) + "." for s in list(tag(symbols, ds_tag))]) + "\n"

@functools.lru_cache(maxsize=None)
Expand All @@ -368,6 +379,10 @@ def _ui_uses_predicate(self, name: str, arity: int):
transformer = UsesSignatureTransformer(name, arity)
self._logger.debug(f"Transformer parsing UI files to find {name}/{arity}")
transformer.parse_files(self._ui_files)
if not transformer.contained:
self._logger.debug(
"Predicate NOT contained. Domain constructor will be skipped"
)
return transformer.contained

@property
Expand Down Expand Up @@ -399,6 +414,41 @@ def _ds_context(self):
prg += f"_clinguin_context({str(a.key)},{value})."
return prg + "\n"

@cached_property
def _ds_model(self):
"""
Computes model
When the model is being iterated by the user, the current model is returned.
It uses a cache that is erased after an operation makes changes in the control.
"""
if self._model is None:
self._ctl.configuration.solve.models = 1
self._ctl.configuration.solve.opt_mode = "ignore"
self._ctl.configuration.solve.enum_mode = "auto"
self._logger.debug(
domctl_log('domctl.configuration.solve.enum_mode = "auto"')
)

self._prepare()
symbols, ucore = solve(
self._ctl, [(a, True) for a in self._assumptions], self._on_model
)
self._unsat_core = ucore
if symbols is None:
self._logger.warning(
"Got an UNSAT result with the given domain encoding."
)
return (
self._backup_ds_cache["_ds_model"]
+ "\n".join([str(a) + "." for a in self._atoms])
if "_ds_model" in self._backup_ds_cache
else ""
)
self._model = symbols

return " ".join([str(s) + "." for s in self._model]) + "\n"

@cached_property
def _ds_brave(self):
"""
Expand All @@ -409,11 +459,7 @@ def _ds_brave(self):
if not self._ui_uses_predicate("_any", 1):
return ""

self._ctl.configuration.solve.models = 0
self._ctl.configuration.solve.opt_mode = "ignore"
self._ctl.configuration.solve.enum_mode = "brave"
self._logger.debug(domctl_log('domctl.configuration.solve.enum_mode = "brave"'))
return self._call_solver_with_cache("_ds_brave", "_any")
return self._call_solver_with_cache("_ds_brave", "_any", 0, "ignore", "brave")

@cached_property
def _ds_cautious(self):
Expand All @@ -425,26 +471,9 @@ def _ds_cautious(self):
if not self._ui_uses_predicate("_all", 1):
return ""

self._ctl.configuration.solve.models = 0
self._ctl.configuration.solve.opt_mode = "ignore"
self._ctl.configuration.solve.enum_mode = "cautious"
self._logger.debug(
domctl_log('domctl.configuration.solve.enum_mode = "cautious"')
return self._call_solver_with_cache(
"_ds_cautious", "_all", 0, "ignore", "cautious"
)
return self._call_solver_with_cache("_ds_cautious", "_all")

@cached_property
def _ds_model(self):
"""
Computes model
It uses a cache that is erased after an operation makes changes in the control.
"""
self._ctl.configuration.solve.models = 0
self._ctl.configuration.solve.opt_mode = "ignore"
self._ctl.configuration.solve.enum_mode = "auto"
self._logger.debug(domctl_log('domctl.configuration.solve.enum_mode = "auto"'))
return self._call_solver_with_cache("_ds_model")

@cached_property
def _ds_brave_optimal(self):
Expand All @@ -456,12 +485,9 @@ def _ds_brave_optimal(self):
if not self._ui_uses_predicate("_any_opt", 1):
return ""

self._ctl.configuration.solve.models = 0
self._ctl.configuration.solve.opt_mode = "optN"
self._ctl.configuration.solve.enum_mode = "brave"
self._logger.debug(domctl_log('domctl.configuration.solve.opt_mode = "optN"'))
self._logger.debug(domctl_log('domctl.configuration.solve.enum_mode = "brave"'))
return self._call_solver_with_cache("_ds_brave_optimal", "_any_opt")
return self._call_solver_with_cache(
"_ds_brave_optimal", "_any_opt", 0, "optN", "brave"
)

@cached_property
def _ds_cautious_optimal(self):
Expand All @@ -473,14 +499,9 @@ def _ds_cautious_optimal(self):
if not self._ui_uses_predicate("_all_opt", 1):
return ""

self._ctl.configuration.solve.models = 0
self._ctl.configuration.solve.opt_mode = "optN"
self._ctl.configuration.solve.enum_mode = "cautious"
self._logger.debug(domctl_log('domctl.configuration.solve.opt_mode = "optN"'))
self._logger.debug(
domctl_log('domctl.configuration.solve.enum_mode = "cautious"')
return self._call_solver_with_cache(
"_ds_cautious_optimal", "_all_opt", 0, "optN", "cautious"
)
return self._call_solver_with_cache("_ds_cautious_optimal", "_all_opt")

@property
def _ds_unsat(self):
Expand Down Expand Up @@ -511,15 +532,16 @@ def _ds_opt(self):
"""
Additional program to pass to the UI with optimality info
"""
prg = "#defined _clinguin_cost/2.\n#defined _clinguin_cost/1.\n#defined _clinguin_optimal/1.\n"
prg += f"_clinguin_cost({tuple(self._cost)}).\n"
prg = "#defined _clinguin_cost/2. #defined _clinguin_cost/1. #defined _clinguin_optimal/1. "

for i, c in enumerate(self._cost):
prg += f"_clinguin_cost({i},{c}).\n"
prg += f"_clinguin_cost({i},{c}). "
if self._optimal:
prg += "_clinguin_optimal.\n"
prg += "_clinguin_optimal. "
if self._optimizing:
prg += "_clinguin_optimizing.\n"
prg += "_clinguin_optimizing. "

prg += f"_clinguin_cost({tuple(self._cost)}).\n"
return prg

########################################################################################################
Expand Down Expand Up @@ -647,7 +669,7 @@ def next_solution(self, opt_mode="ignore"):
self._ctl.configuration.solve.opt_mode = opt_mode
self._ctl.configuration.solve.models = 0
self._logger.debug(
domctl_log(f"domctlconfiguration.solve.opt_mode = {opt_mode}")
domctl_log(f"domctl.configuration.solve.opt_mode = {opt_mode}")
)

self._prepare()
Expand All @@ -656,7 +678,7 @@ def next_solution(self, opt_mode="ignore"):
)
self._logger.debug(
domctl_log(
f"domctlsolve({[(a, True) for a in self._get_assumptions()]}, yield_=True)"
f"domctl.solve({[(a, True) for a in self._get_assumptions()]}, yield_=True)"
)
)

Expand All @@ -666,6 +688,7 @@ def next_solution(self, opt_mode="ignore"):
while optimizing and not model.optimality_proven:
self._logger.info("Skipping non-optimal model!")
model = next(self._iterator)

self._clear_cache(["_ds_model"])
self._on_model(model)
self._model = model.symbols(shown=True, atoms=True, theory=True)
Expand Down
8 changes: 4 additions & 4 deletions examples/angular/placement/ui.lp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ attr(window, flex_direction, row).
when(t1, input, context, (t1_content, _value)).

elem(b1, button, c1).
when(b1, click, call, (add_atom(person(_context_value(t1_content))),
set_external(include(_context_value(t1_content)),true))).
when(b1, click, call, (add_atom(person(_context_value(t1_content,str))),
set_external(include(_context_value(t1_content,str)),true))).
attr(b1, label, "Add").
attr(b1, class, "m-1").
attr(b1, class, "btn-secondary").
Expand Down Expand Up @@ -83,15 +83,15 @@ attr(window, flex_direction, row).
elem(included_l(P), container, included(P)):- person(P).
attr(included_l(P), class, "w-75"):- person(P).
attr(included_l(P), flex_direction, row):- person(P).

elem(included_btn(P), button, included_l(P)):- person(P).
attr(included_btn(P), class, "btn-sm"):- person(P).
attr(included_btn(P), class, "rounded-circle"):- person(P).
attr(included_btn(P), icon, "fa-circle-check"):- person(P), include(P).
attr(included_btn(P), icon, "fa-circle-xmark"):- person(P), not include(P).
attr(included_btn(P), class, "text-success"):- person(P), include(P).
attr(included_btn(P), class, "text-danger"):- person(P), not include(P).

elem(included_label(P), label, included_l(P)):- person(P).
attr(included_label(P), label, P):- person(P).
attr(included_label(P), class, "text-capitalize"):- person(P).
Expand Down
4 changes: 2 additions & 2 deletions examples/angular/placement_optimized/encoding.lp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:- assign(B,P1),assign(B,P2),P1<P2.

% Least tables selected
#minimize{1,T:assign(seat(_,T),_)}.
#minimize{1@2,T:assign(seat(_,T),_)}.

% Least empty seats possible
#minimize{1,S,T:seat(S,T),assign(seat(_,T),_),not assign(seat(S,T),_)}.
#minimize{1@1,S,T:seat(S,T),assign(seat(_,T),_),not assign(seat(S,T),_)}.
8 changes: 6 additions & 2 deletions examples/angular/placement_optimized/ui.lp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ attr(window, flex_direction, row).
when(t1, input, context, (t1_content, _value)).

elem(b1, button, c1).
when(b1, click, call, (add_atom(person(_context_value(t1_content))),
set_external(include(_context_value(t1_content)),true))).
when(b1, click, call, (add_atom(person(_context_value(t1_content,str))),
set_external(include(_context_value(t1_content,str)),true))).
attr(b1, label, "Add").
attr(b1, class, "m-1").
attr(b1, class, "btn-secondary").
Expand Down Expand Up @@ -151,6 +151,10 @@ attr(window, flex_direction, row).
attr(table_seat(S,T), selected, P):- _all(assign(seat(S,T),P)).
attr(table_seat(S,T), selected, P):- assign(seat(S,T),P), _clinguin_browsing.

attr(table_seat(S,T), selected, P):- _all_opt(assign(seat(S,T),P)), not _all(assign(seat(S,T),P)).
attr(table_seat(S,T), class, "text-success"):- _all_opt(assign(seat(S,T),P)), not _all(assign(seat(S,T),P)).
attr(table_seat(S,T), class, "text-opacity-50"):- _all_opt(assign(seat(S,T),P)), not _all(assign(seat(S,T),P)).

elem(table_seat_remove(S,T), dropdown_menu_item, table_seat(S,T)):-seat(S,T).
attr(table_seat_remove(S,T), icon, "fa-ban"):-seat(S,T).
attr(table_seat_remove(S,T), class, "text-info"):-seat(S,T).
Expand Down

0 comments on commit 8e92949

Please sign in to comment.