Skip to content

Commit

Permalink
Fixed the namespace of stopwatch.
Browse files Browse the repository at this point in the history
  • Loading branch information
mlaveaux committed Mar 15, 2024
1 parent 8a6e328 commit 9ac173f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion libraries/lps/include/mcrl2/lps/lpsreach.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ class lpsreach_algorithm

while (todo != empty_set() && (m_options.max_iterations == 0 || iteration_count < m_options.max_iterations))
{
stopwatch loop_start;
mcrl2::utilities::stopwatch loop_start;
iteration_count++;
mCRL2log(log::trace) << "--- iteration " << iteration_count << " ---" << std::endl;
mCRL2log(log::trace) << "todo = " << print_states(m_lts.data_index, todo) << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions libraries/pbes/include/mcrl2/pbes/pbesreach.h
Original file line number Diff line number Diff line change
Expand Up @@ -450,15 +450,15 @@ class pbesreach_algorithm

mCRL2log(log::trace) << "initial state = " << core::detail::print_list(m_initial_state) << std::endl;

stopwatch timer;
mcrl2::utilities::stopwatch timer;
m_initial_vertex = initial_state();
m_visited = empty_set();
m_todo = m_initial_vertex;
m_deadlocks = empty_set();

while (m_todo != empty_set() && !solution_found() && (m_options.max_iterations == 0 || iteration_count < m_options.max_iterations))
{
stopwatch loop_start;
mcrl2::utilities::stopwatch loop_start;
iteration_count++;
mCRL2log(log::trace) << "--- iteration " << iteration_count << " ---" << std::endl;
mCRL2log(log::trace) << "todo = " << print_states(m_data_index, m_todo) << std::endl;
Expand Down
14 changes: 7 additions & 7 deletions libraries/pbes/include/mcrl2/pbes/symbolic_parity_game.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class symbolic_parity_game
const ldd& I = sylvan::ldds::empty_set(),
const ldd& T = sylvan::ldds::empty_set()) const
{
stopwatch attractor_watch;
mcrl2::utilities::stopwatch attractor_watch;
mCRL2log(log::debug) << "start attractor set computation\n";

using namespace sylvan::ldds;
Expand All @@ -342,7 +342,7 @@ class symbolic_parity_game

mCRL2log(log::trace) << "todo = " << print_nodes(todo) << std::endl;
mCRL2log(log::trace) << "Zoutside = " << print_nodes(Zoutside) << std::endl;
stopwatch iter_start;
mcrl2::utilities::stopwatch iter_start;

todo = minus(safe_control_predecessors_impl(alpha, todo, Zoutside, Zoutside, V, Vplayer, I), Z);
Z = union_(Z, todo);
Expand Down Expand Up @@ -372,7 +372,7 @@ class symbolic_parity_game
{
using namespace sylvan::ldds;

stopwatch attractor_watch;
mcrl2::utilities::stopwatch attractor_watch;
mCRL2log(log::debug) << "start monotone attractor set computation\n";

using namespace sylvan::ldds;
Expand Down Expand Up @@ -403,7 +403,7 @@ class symbolic_parity_game

mCRL2log(log::trace) << "todo = " << print_nodes(todo) << std::endl;
mCRL2log(log::trace) << "Zoutside = " << print_nodes(Zoutside) << std::endl;
stopwatch iter_start;
mcrl2::utilities::stopwatch iter_start;

todo = intersect(Vc, minus(safe_control_predecessors_impl(alpha, union_(todo, U), V, minus(Zoutside, U), Vc, Vplayer, I), Z));
Z = union_(Z, todo);
Expand Down Expand Up @@ -519,7 +519,7 @@ class symbolic_parity_game
{
const symbolic::summand_group& group = m_summand_groups[i];

stopwatch watch;
mcrl2::utilities::stopwatch watch;
result = union_(result, predecessors(U, V, group));
mCRL2log(log::trace) << "added predecessors for group " << i << " out of " << m_summand_groups.size()
<< " (time = " << std::setprecision(2) << std::fixed << watch.seconds() << "s)\n";
Expand Down Expand Up @@ -566,7 +566,7 @@ class symbolic_parity_game
{
const symbolic::summand_group& group = m_summand_groups[i];

stopwatch watch;
mcrl2::utilities::stopwatch watch;
ldd todo1 = predecessors(U, todo, group);
mCRL2log(log::trace) << "added predecessors for group " << i << " out of " << m_summand_groups.size()
<< " (time = " << std::setprecision(2) << std::fixed << watch.seconds() << "s)\n";
Expand Down Expand Up @@ -598,7 +598,7 @@ class symbolic_parity_game
{
const symbolic::summand_group& group = m_summand_groups[i];

stopwatch watch;
mcrl2::utilities::stopwatch watch;
Pforced = minus(Pforced, predecessors(Pforced, outside, group));

mCRL2log(log::trace) << "removed 1 - alpha predecessors for group " << i << " out of " << m_summand_groups.size()
Expand Down
10 changes: 5 additions & 5 deletions libraries/pbes/include/mcrl2/pbes/symbolic_pbessolve.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class symbolic_pbessolve_algorithm
return { empty_set(), empty_set() };
}

stopwatch timer;
mcrl2::utilities::stopwatch timer;
mCRL2log(log::debug) << "start zielonka recursion\n";
auto [m, U] = m_G.get_min_rank(V);

Expand Down Expand Up @@ -90,7 +90,7 @@ class symbolic_pbessolve_algorithm
const ldd& W1 = sylvan::ldds::empty_set())
{
using namespace sylvan::ldds;
stopwatch timer;
mcrl2::utilities::stopwatch timer;

std::array<ldd, 2> winning = { W0, W1 };
ldd Vtotal = m_G.compute_total_graph(V, empty_set(), Vsinks, winning);
Expand Down Expand Up @@ -207,7 +207,7 @@ class symbolic_pbessolve_algorithm
std::size_t iter = 0;
while (U != Unext)
{
stopwatch timer;
mcrl2::utilities::stopwatch timer;
U = Unext;
Unext = m_G.predecessors(U, U);

Expand Down Expand Up @@ -287,7 +287,7 @@ class symbolic_pbessolve_algorithm
std::size_t iter = 0;
while (U != Unext)
{
stopwatch timer;
mcrl2::utilities::stopwatch timer;
U = Unext;
if (safe_variant)
{
Expand Down Expand Up @@ -331,7 +331,7 @@ class symbolic_pbessolve_algorithm
const ldd& W1 = sylvan::ldds::empty_set())
{
using namespace sylvan::ldds;
stopwatch timer;
mcrl2::utilities::stopwatch timer;

std::array<ldd, 2> winning = { W0, W1 };
ldd Vtotal = m_G.compute_total_graph(V, I, Vsinks, winning);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void learn_successors_callback(WorkerP*, Task*, std::uint32_t* x, std::size_t, v

// add the assignments corresponding to x to sigma
// add x to the transition xy
stopwatch learn_start;
mcrl2::utilities::stopwatch learn_start;
for (std::size_t j = 0; j < x_size; j++)
{
sigma[group.read_parameters[j]] = data_index[group.read[j]][x[j]];
Expand Down

0 comments on commit 9ac173f

Please sign in to comment.