Commit 0d8a88b2 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz

degen: improve test coverage

* spot/twaalgos/degen.cc: Make use_cust_acc_orders as unlikely, as it
was never true in the whole test suite before this patch.
* tests/core/ltlcross2.test: Play with degen-order and degen-lcache
options to test more cases.
parent 4e9303e3
...@@ -276,11 +276,10 @@ namespace spot ...@@ -276,11 +276,10 @@ namespace spot
if (s.second == 0) if (s.second == 0)
{ {
auto set = outgoing.common_acc(s.first); auto set = outgoing.common_acc(s.first);
if (use_cust_acc_orders) if (SPOT_UNLIKELY(use_cust_acc_orders))
s.second = orders.next_level(m->initial(), s.second, set); s.second = orders.next_level(m->initial(), s.second, set);
else else
while (s.second < order.size() while (s.second < order.size() && set.has(order[s.second]))
&& set.has(order[s.second]))
{ {
++s.second; ++s.second;
if (!skip_levels) if (!skip_levels)
......
#!/bin/sh #!/bin/sh
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2012, 2013, 2014, 2015, 2016 Laboratoire de Recherche # Copyright (C) 2012-2017 Laboratoire de Recherche et Développement de
# et Développement de l'Epita (LRDE). # l'Epita (LRDE).
# #
# This file is part of Spot, a model checking library. # This file is part of Spot, a model checking library.
# #
...@@ -40,8 +40,8 @@ ltlcross --products=3 --timeout=60 \ ...@@ -40,8 +40,8 @@ ltlcross --products=3 --timeout=60 \
"$ltl2tgba --lbtt -x comp-susp,!skel-wdba,!skel-simul --small %f >%T" \ "$ltl2tgba --lbtt -x comp-susp,!skel-wdba,!skel-simul --small %f >%T" \
"$ltl2tgba --spin --ba -x degen-lskip=0 %f >%N" \ "$ltl2tgba --spin --ba -x degen-lskip=0 %f >%N" \
"$ltl2tgba --lbtt --ba --high %f > %T" \ "$ltl2tgba --lbtt --ba --high %f > %T" \
"$ltl2tgba --spin=6 --ba --medium %f > %N" \ "$ltl2tgba --spin=6 --ba -x degen-order,degen-lcache=2 --medium %f > %N" \
"$ltl2tgba --hoa -BDC %f > %H" \ "$ltl2tgba --hoa -x degen-lcache=3 -BDC %f > %H" \
"$ltl2tgba --lbtt -BC %f > %T" \ "$ltl2tgba --lbtt -BC %f > %T" \
"$ltl2tgba --lbtt --unambiguous --low %f > %T" \ "$ltl2tgba --lbtt --unambiguous --low %f > %T" \
"$ltl2tgba --lbtt --unambiguous --high %f > %T" \ "$ltl2tgba --lbtt --unambiguous --high %f > %T" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment