Renaming and clean up
"Strategy" was used for mealy machines and game strategies a like. Introduced the notion of mealy machine in three different flavors: mealy machine: twa_graph with synthesis-outputs separated mealy machine: mealy machine and all transitions have conditions of the form (bdd over inputs)&(bdd over outputs) split mealy machine: mealy machine that alternates between env and player states. Needs state-players * bin/ltlsynt.cc: renaming * python/spot/impl.i: Add vector for const_twa_graph_ptr * spot/twaalgos/aiger.cc, spot/twaalgos/aiger.hh: Adapting functions * spot/twaalgos/mealy_machine.cc, spot/twaalgos/mealy_machine.hh: Add test functions and propagate properties correctly. Adjust for names * spot/twaalgos/synthesis.cc, spot/twaalgos/synthesis.hh: Removing unnecessary functions and adapt to new names * tests/python/aiger.py, tests/python/_mealy.ipynb, tests/python/mealy.py, tests/python/synthesis.ipynb: Adjust
This commit is contained in:
parent
6ebe3d7447
commit
98ebbea17e
12 changed files with 3376 additions and 3038 deletions
|
|
@ -3339,9 +3339,10 @@ for strat_string, (ins_str, outs_str) in strats:
|
|||
for ss in [""] + [f"+sub{ii}" for ii in range(3)]:
|
||||
for ddx in ["", "+dc"]:# todo prob here
|
||||
for uud in ["", "+ud"]:
|
||||
aig = spot.strategy_to_aig(strat, m+ss+ddx+uud)
|
||||
aig = spot.mealy_machine_to_aig(strat, m+ss+ddx+uud)
|
||||
strat2_s = aig.as_automaton(True)
|
||||
if not spot.is_mealy_specialization(strat_s, strat2_s):
|
||||
if not spot.is_split_mealy_specialization(strat_s,
|
||||
strat2_s):
|
||||
print(f"Mode is {m+ss+ddx+uud}")
|
||||
print(f"""Strat is \n{strat_s.to_str("hoa")}""")
|
||||
print(f"""Aig as aut is \n{strat2_s.to_str("hoa")}""")
|
||||
|
|
@ -3361,7 +3362,7 @@ for aout in outs_str:
|
|||
outs &= buddy.bdd_ithvar(strat.register_ap(aout))
|
||||
|
||||
spot.set_synthesis_outputs(strat, outs)
|
||||
aig = spot.strategy_to_aig(strat, "isop")
|
||||
aig = spot.mealy_machine_to_aig(strat, "isop")
|
||||
|
||||
ins = [True, False, False, False, True, True, True, True, True, True]
|
||||
exp_latches = [(False, False),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue