Commit da49af89 authored by Vivien Delmon's avatar Vivien Delmon
Browse files

Add a new taf-kit for r_automaton and add reduce to libvcsn-r.

	* lib/generate_libvcsn.rb: Add reduce to libvcsn-r.
	* include/vaucanson/contexts/automaton_functions.thh: Add reduce.
	* taf-kit/src/Makefile.am,
	* taf-kit/src/r_commands.cc,
	* taf-kit/tests/Makefile.am: Generate tafkit for Real semiring.
parent 287903ca
2008-12-12 Vivien Delmon <vivien.delmon@lrde.epita.fr>
Add a new taf-kit for r_automaton and add reduce to libvcsn-r.
* lib/generate_libvcsn.rb: Add reduce to libvcsn-r.
* include/vaucanson/contexts/automaton_functions.thh: Add reduce.
* taf-kit/src/Makefile.am,
* taf-kit/src/r_commands.cc,
* taf-kit/tests/Makefile.am: Generate tafkit for Real semiring.
2008-12-12 Vivien Delmon <vivien.delmon@lrde.epita.fr>
 
Revert part of r2578.
......
......@@ -43,6 +43,7 @@
# include <vaucanson/algorithms/normalized.hh>
# include <vaucanson/algorithms/product.hh>
# include <vaucanson/algorithms/realtime.hh>
# include <vaucanson/algorithms/reduce.hh>
# include <vaucanson/algorithms/standard.hh>
# include <vaucanson/algorithms/standard_of.hh>
# include <vaucanson/algorithms/sum.hh>
......
......@@ -68,6 +68,13 @@ def create?(type, file)
file !~ /\/projection.hh/ and # FMP transducer (identity)
file !~ /ltl_to_pair.hh/ and # FMP transducer
file !~ /is_ltl.hh/ and # FMP transducer
( # Real Semiring only
("vcsn-r" == type
) or
(
file !~ /reduce.hh/
)
) and
( # Pair letters only filters.
not ( "vcsn-char-char-b" == type or "vcsn-char-int-b" == type or
"vcsn-int-int-b" == type
......@@ -113,6 +120,7 @@ def create?(type, file)
file !~ /minimization_moore.hh/ and
file !~ /realtime_decl.hh/ and
file !~ /realtime.hh/ and
file !~ /reduce.hh/ and
file !~ /standard.hh/ and
file !~ /standard_of.hh/ and
file !~ /thompson.hh/ and
......@@ -139,7 +147,7 @@ def create?(type, file)
file !~ /\/projection.hh/ and # FMP transducer (identity)
file !~ /composition_cover.hh/ # FMP transducer
)
)
)
)
)
end
......
......@@ -16,7 +16,7 @@ include $(top_srcdir)/vaucanson.mk
AM_CPPFLAGS += $(CXXFLAGS_OPTIMIZE)
AM_LDFLAGS += $(TERMLIBS)
bin_PROGRAMS = vcsn-char-b vcsn-char-z vcsn-char-fmp-b \
bin_PROGRAMS = vcsn-char-b vcsn-char-z vcsn-char-r vcsn-char-fmp-b \
vcsn-int-b vcsn-int-z vcsn-int-fmp-b \
vcsn-int-fmp-z vcsn-char-fmp-z \
vcsn-char-char-b vcsn-int-int-b \
......@@ -66,6 +66,16 @@ vcsn_char_z_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-z.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_r_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
common_automaton_commands.hh \
r_commands.cc
vcsn_char_r_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=r_automaton -DVCSN_USE_LIB \
-DWITH_WEIGHTS
vcsn_char_r_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-r.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_fmp_b_SOURCES = $(COMMON_SOURCES) \
fmp_commands.cc
vcsn_char_fmp_b_CPPFLAGS = $(AM_CPPFLAGS) \
......
// z_commands.cc: this file is part of the Vaucanson project.
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2006, 2008 The Vaucanson Group.
//
// This program 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 2
// of the License, or (at your option) any later version.
//
// The complete GNU General Public Licence Notice can be found as the
// `COPYING' file in the root directory.
//
// The Vaucanson Group consists of people listed in the `AUTHORS' file.
//
/**
* @file z_commands.c
* @author Michaël Cadilhac <michael.cadilhac@lrde.org>
*
* Commands declaration and definition for Z weighted automata.
*/
#include "commands.hh"
#include "ratexp_commands.hh"
#include "common_commands.hh"
#include "common_automaton_commands.hh"
DEFINE_ONE_ARG_COMMAND (ARG_KIND (aut)
ALGO (reduce));
/*-----------------------------.
| Define the set of commands. |
`-----------------------------*/
const command_t command_map[] =
{
USE_IO_COMMAND_GROUP (),
COMMAND_GROUP (
"Tests and evaluation on automata:",
// COMMAND_ENTRY (are_isomorphic, AutAut,
// "Return whether `aut1' and `aut2' are isomorphic."),
COMMAND_ENTRY (eval, AutWord, "Evaluate `word' on `aut'."),
COMMAND_ENTRY (is_ambiguous, Aut,
"Return whether `aut' is ambiguous."),
COMMAND_ENTRY (is_complete, Aut,
"Return whether `aut' is complete."),
COMMAND_ENTRY (is_empty, Aut,
"Return whether `aut' is empty."),
COMMAND_ENTRY (has_succ_comp, Aut,
"Return whether `aut' has successful computations"
" (trimmed `aut` is not empty)."),
// COMMAND_ENTRY (is_normalized, Aut,
// "Return whether `aut' is normalized."),
COMMAND_ENTRY (is_realtime, Aut,
"Return whether `aut' is realtime."),
COMMAND_ENTRY (is_standard, Aut,
"Return whether `aut' is standard.")
),
USE_GENERIC_AUTOMATON_COMMAND_GROUP (),
COMMAND_GROUP (
"Real automaton specific algorithms:",
COMMAND_ENTRY_CN (reduce, reduce, Aut,
"Give the reduced of `aut'.")
),
USE_RATEXP_COMMAND_GROUP (),
{0, 0, 0, 0, 0}
};
LETTER_CONTEXT(letter_t)
......@@ -57,6 +57,7 @@ check_SCRIPTS = \
vcsn-char-fmp-b \
vcsn-char-fmp-z \
vcsn-char-z \
vcsn-char-r \
vcsn-int-b \
vcsn-int-fmp-b \
vcsn-int-fmp-z \
......
Supports Markdown
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