move the sanity tests in tests/sanity/
* spot/sanity/: Move ... * tests/sanity/: ... here. * spot/sanity/Makefile.am: Merge with... * tests/Makefile.am: ... this. * tests/run.in: Learn to run perl tests. * README, configure.ac, spot/Makefile.am: Adjust. * spot/tl/mark.hh: Add missing SPOT_API detected by fixed private.test. * spot/twaalgos/weight.cc, spot/twaalgos/weight.hh: Move... * spot/priv/weight.cc, spot/priv/weight.hh: ... here, as suggested by fixed private.test. * spot/twaalgos/tau03opt.cc, spot/twaalgos/Makefile.am, spot/priv/Makefile.am: Adjust.
This commit is contained in:
Alexandre Duret-Lutz
parent
6b881a2e38
commit
6e854b6d83
19 changed files with 79 additions and 139 deletions
|
|
@ -1,5 +1,5 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
## Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire
|
||||
## Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Laboratoire
|
||||
## de Recherche et Développement de l'Epita (LRDE).
|
||||
## Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris
|
||||
## 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
||||
|
|
@ -134,8 +134,6 @@ libtwaalgos_la_SOURCES = \
|
|||
tau03opt.cc \
|
||||
totgba.cc \
|
||||
translate.cc \
|
||||
weight.cc \
|
||||
weight.hh \
|
||||
word.cc
|
||||
|
||||
libtwaalgos_la_LIBADD = gtec/libgtec.la
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2011, 2013, 2014, 2015 Laboratoire de Recherche et
|
||||
// Copyright (C) 2011, 2013, 2014, 2015, 2016 Laboratoire de Recherche et
|
||||
// Développement de l'Epita (LRDE).
|
||||
// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
#include <spot/twaalgos/emptiness.hh>
|
||||
#include <spot/twaalgos/emptiness_stats.hh>
|
||||
#include <spot/twaalgos/tau03opt.hh>
|
||||
#include <spot/twaalgos/weight.hh>
|
||||
#include <spot/priv/weight.hh>
|
||||
#include <spot/twaalgos/ndfs_result.hxx>
|
||||
|
||||
namespace spot
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2011, 2014 Laboratoire de Recherche et Developpement
|
||||
// de l'Epita.
|
||||
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <cassert>
|
||||
#include <ostream>
|
||||
#include <spot/twaalgos/weight.hh>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
weight::weight(const acc_cond& acc):
|
||||
m(acc.num_sets())
|
||||
{
|
||||
}
|
||||
|
||||
weight& weight::add(acc_cond::mark_t a)
|
||||
{
|
||||
for (auto s: a.sets())
|
||||
++m[s];
|
||||
return *this;
|
||||
}
|
||||
|
||||
weight& weight::sub(acc_cond::mark_t a)
|
||||
{
|
||||
for (auto s: a.sets())
|
||||
if (m[s] > 0)
|
||||
--m[s];
|
||||
return *this;
|
||||
}
|
||||
|
||||
acc_cond::mark_t weight::diff(const acc_cond& acc, const weight& w) const
|
||||
{
|
||||
unsigned max = acc.num_sets();
|
||||
std::vector<unsigned> res;
|
||||
for (unsigned n = 0; n < max; ++n)
|
||||
if (m[n] > w.m[n])
|
||||
res.push_back(n);
|
||||
return acc_cond::mark_t(res.begin(), res.end());
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, const weight& w)
|
||||
{
|
||||
unsigned s = w.m.size();
|
||||
for (unsigned n = 0; n < s; ++n)
|
||||
os << '(' << n << ',' << w.m[n] << ')';
|
||||
return os;
|
||||
}
|
||||
|
||||
};
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2015 Laboratoire de Recherche et Développement de
|
||||
// l'Epita (LRDE).
|
||||
// Copyright (C) 2004, 2014 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <iosfwd>
|
||||
#include <map>
|
||||
#include <bddx.h>
|
||||
#include <spot/twa/acc.hh>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
/// \brief Manage for a given automaton a vector of counter indexed by
|
||||
/// its acceptance condition
|
||||
|
||||
class weight
|
||||
{
|
||||
public:
|
||||
/// Construct a empty vector (all counters set to zero).
|
||||
weight(const acc_cond& acc);
|
||||
/// Increment by one the counters of each acceptance condition in \a a.
|
||||
weight& add(acc_cond::mark_t a);
|
||||
/// Decrement by one the counters of each acceptance condition in \a a.
|
||||
weight& sub(acc_cond::mark_t a);
|
||||
/// Return the set of each acceptance condition such that its counter is
|
||||
/// strictly greatest than the corresponding counter in w.
|
||||
///
|
||||
/// \pre For each acceptance condition, its counter is greatest or equal to
|
||||
/// the corresponding counter in w.
|
||||
acc_cond::mark_t diff(const acc_cond& acc, const weight& w) const;
|
||||
friend std::ostream& operator<<(std::ostream& os,
|
||||
const weight& w);
|
||||
|
||||
private:
|
||||
std::vector<int> m;
|
||||
};
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue