Commit 80593671 authored by Florent Terrones's avatar Florent Terrones
Browse files

2006-03-20 Florent Terrones <terron_f@lrde.epita.fr>

	First change in Vaucanson because of the new version of the XML
	documentation. From now on, the first element of the automaton
	and transducer types is "label_type" and not "type" anymore.

	* src/vaucanson.xsd: Change "label" to "label_type" in the automaton
	and transducer types.
	* include/vaucanson/xml/xml_chooser.hxx,
	* include/vaucanson/xml/node.hxx,
	* include/vaucanson/xml/node.hh: Propagate the change of the xsd file.
	* src/tests/xml/trans_ref.xml,
	* src/tests/xml/r_ref.xml,
	* src/tests/xml/z_ref.xml,
	* src/tests/xml/z_min_plus_ref.xml,
	* src/tests/xml/b_ref.xml,
	* src/tests/xml/z_max_plus_ref.xml,
	* src/tests/xml/fmp_ref.xml,
	* src/tests/xml/session_ref.xml: Change the reference files.
parent 839fd6a2
2006-03-20 Florent Terrones <terron_f@lrde.epita.fr>
First change in Vaucanson because of the new version of the XML
documentation. From now on, the first element of the automaton
and transducer types is "label_type" and not "type" anymore.
* src/vaucanson.xsd: Change "label" to "label_type" in the automaton
and transducer types.
* include/vaucanson/xml/xml_chooser.hxx,
* include/vaucanson/xml/node.hxx,
* include/vaucanson/xml/node.hh: Propagate the change of the xsd file.
* src/tests/xml/trans_ref.xml,
* src/tests/xml/r_ref.xml,
* src/tests/xml/z_ref.xml,
* src/tests/xml/z_min_plus_ref.xml,
* src/tests/xml/b_ref.xml,
* src/tests/xml/z_max_plus_ref.xml,
* src/tests/xml/fmp_ref.xml,
* src/tests/xml/session_ref.xml: Change the reference files.
2006-03-20 Michael Cadilhac <michael.cadilhac@lrde.epita.fr>
 
* Makefile.am: s/vaucanson_xml.m4/vcsn_xml.m4/.
......
......@@ -106,7 +106,7 @@ namespace vcsn
CREATE_CLASSNODE(automaton)
CREATE_CLASSNODE(transducer)
CREATE_CLASSNODE(type)
CREATE_CLASSNODE(label_type)
CREATE_CLASSNODE(content)
CREATE_CLASSNODE(states)
CREATE_CLASSNODE(transitions)
......@@ -140,12 +140,12 @@ CREATE_PARAM_CLASSNODE(drawing)
# define CREATE_SPEC_TYPE_NODE(TempParam, Type) \
TempParam \
struct typeNode<Type > : Node<Type > \
struct label_typeNode<Type > : Node<Type > \
{ \
void process(xercesc::DOMElement*, Type&, \
typename Node<Type >::map_t&, \
typename Node<Type >::factory_t&); \
static Node<Type >* create() { return new typeNode; } \
static Node<Type >* create() { return new label_typeNode; } \
};
......@@ -184,7 +184,7 @@ CREATE_SPEC_PARAM_NODE(monoid, TParmFMP, FMPtype)
# define register_all_factory(f, T) \
register_in_factory(f, T, automaton) \
register_in_factory(f, T, transducer) \
register_in_factory(f, T, type) \
register_in_factory(f, T, label_type) \
register_in_factory(f, T, semiring) \
register_in_factory(f, T, monoid) \
register_in_factory(f, T, freemonoid) \
......
......@@ -73,9 +73,9 @@ namespace vcsn
if (! type_done) \
{ \
if (XMLString::compareIString(n->getNodeName(), \
STR2XML("type"))) \
STR2XML("label_type"))) \
{ \
typeNode<T>* node = new typeNode<T>; \
label_typeNode<T>* node = new label_typeNode<T>; \
node->process(0, aut, m, f); \
} \
type_done = true; \
......@@ -88,7 +88,8 @@ namespace vcsn
# define PROCESS_TYPE_NODE(TempParam, AutType) \
TempParam \
void typeNode<AutType>::process(xercesc::DOMElement* node, AutType& aut, \
void label_typeNode<AutType>::process(xercesc::DOMElement* node, \
AutType& aut, \
typename Node<AutType>::map_t& m, \
typename Node<AutType>::factory_t& f) \
{ \
......@@ -111,7 +112,7 @@ PROCESS_ROOT_NODE(automaton)
PROCESS_TYPE_NODE(TParm, AUTtype)
PROCESS_TYPE_NODE(TParm, TRANStype)
PROCESS_TYPE_NODE(TParmFMP, FMPtype)
PROCESS_NODE(type)
PROCESS_NODE(label_type)
PROCESS_NODE(content)
PROCESS_NODE(states)
PROCESS_NODE(transitions)
......
......@@ -48,7 +48,7 @@ namespace vcsn
xercesc::DOMDocument* doc,
xercesc::DOMElement* root)
{
xercesc::DOMElement* type = doc->createElement(STR2XML("type"));
xercesc::DOMElement* type = doc->createElement(STR2XML("label_type"));
xercesc::DOMElement* monoid =
tools::create_monoid(aut.structure().series().monoid(), doc, type);
tools::create_alphabet(aut.structure().series().monoid().alphabet(),
......@@ -105,7 +105,7 @@ namespace vcsn
xercesc::DOMDocument* doc,
xercesc::DOMElement* root)
{
xercesc::DOMElement* type = doc->createElement(STR2XML("type"));
xercesc::DOMElement* type = doc->createElement(STR2XML("label_type"));
xercesc::DOMElement* in_monoid =
tools::create_monoid(aut.structure().series().monoid(), doc, type);
tools::create_alphabet(aut.structure().series().monoid().alphabet(),
......@@ -142,7 +142,7 @@ namespace vcsn
xercesc::DOMDocument* doc,
xercesc::DOMElement* root)
{
xercesc::DOMElement* type = doc->createElement(STR2XML("type"));
xercesc::DOMElement* type = doc->createElement(STR2XML("label_type"));
xercesc::DOMElement* monoid =
tools::create_monoid(aut.structure().series().monoid(), doc, type);
......
<automaton xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="B"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<transducer xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="product">
<monoid generators="letters" type="free">
<generator value="a"/>
......@@ -11,7 +11,7 @@
</monoid>
</monoid>
<semiring operations="numerical" set="B"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<automaton xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="R"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<session xmlns="http://vaucanson.lrde.epita.fr">
<automaton>
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="B"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......@@ -20,13 +20,13 @@
</content>
</automaton>
<automaton>
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="B"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<transducer xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
......@@ -11,7 +11,7 @@
</monoid>
<semiring operations="numerical" set="B"/>
</semiring>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<automaton xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="tropicalMax" set="Z"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<automaton xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="tropicalMin" set="Z"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
<automaton xmlns="http://vaucanson.lrde.epita.fr">
<type>
<label_type>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="Z"/>
</type>
</label_type>
<content>
<states>
<state name="s0"/>
......
......@@ -492,7 +492,7 @@ be set.
-->
<xs:complexType name="automaton">
<xs:sequence>
<xs:element name="type" type="type_automaton" minOccurs="0"/>
<xs:element name="label_type" type="type_automaton" minOccurs="0"/>
<xs:element name="content" type="content_automaton"/>
<xs:element name="geometry" type="geometry_full" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
......@@ -507,7 +507,7 @@ be set.
-->
<xs:complexType name="transducer">
<xs:sequence>
<xs:element name="type" type="type_transducer" minOccurs="0"/>
<xs:element name="label_type" type="type_transducer" minOccurs="0"/>
<xs:element name="content" type="content_transducer"/>
<xs:element name="geometry" type="geometry_full" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
......
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