Skip to content
Snippets Groups Projects
Commit b3784348 authored by Jan Trávníček's avatar Jan Trávníček
Browse files

implement TikZ converter

parent 1914cdaf
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
aconvert2/src/DotConverter.cpp
+ 8
− 8
View file @ b3784348
......@@ -914,8 +914,8 @@ void DotConverter::transitions(const automaton::NFTA& fta, const std::map<automa
}
 
//Print auxilary dots
for (unsigned i = states.size() + 1; i < transitions.size(); i++) {
out << "node [shape = point, label=\"\"]; " << i << ";\n";
for (unsigned i = 1; i < transitions.size(); i++) {
out << "node [shape = point, label=\"\"]; " << states.size() + i << ";\n";
}
 
//print the map
......@@ -925,8 +925,8 @@ void DotConverter::transitions(const automaton::NFTA& fta, const std::map<automa
replace(transition.second, "\n", "\\n");
out << "[label=\"" << transition.second << "\"]\n";
unsigned j = 0;
for(int to : transition.first.second) {
out << to << " -> " << i;
for(int from : transition.first.second) {
out << from << " -> " << i;
out << "[label=\"" << j << "\"]\n";
j++;
}
......@@ -963,8 +963,8 @@ void DotConverter::transitions(const automaton::DFTA& fta, const std::map<automa
}
 
//Print auxilary dots
for (unsigned i = states.size() + 1; i < transitions.size(); i++) {
out << "node [shape = point, label=\"\"]; " << i << ";\n";
for (unsigned i = 1; i < transitions.size(); i++) {
out << "node [shape = point, label=\"\"]; " << states.size() + i << ";\n";
}
 
//print the map
......@@ -974,8 +974,8 @@ void DotConverter::transitions(const automaton::DFTA& fta, const std::map<automa
replace(transition.second, "\n", "\\n");
out << "[label=\"" << transition.second << "\"]\n";
unsigned j = 0;
for(int to : transition.first.second) {
out << to << " -> " << i;
for(int from : transition.first.second) {
out << from << " -> " << i;
out << "[label=\"" << j << "\"]\n";
j++;
}
......
aconvert2/src/TikZConverter.cpp 0 → 100644
+ 1985
− 0
View file @ b3784348
This diff is collapsed.
aconvert2/src/TikZConverter.h 0 → 100644
+ 72
− 0
View file @ b3784348
/*
* TikZConverter.h
*
* Created on: Dec 1, 2015
* Author: Jan Travnicek
*/
#ifndef TIKZ_CONVERTER_H_
#define TIKZ_CONVERTER_H_
#include <ostream>
#include <common/multipleDispatch.hpp>
#include <automaton/Automaton.h>
#include <automaton/AutomatonFeatures.h>
#include <map>
#include <utility>
class TikZConverter : public std::SingleDispatchFirstStaticParam < void, std::ostream &, automaton::AutomatonBase > {
static void transitions ( const automaton::EpsilonNFA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::MultiInitialStateNFA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::NFA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::DFA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::ExtendedNFA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::CompactNFA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::NFTA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::DFTA & fsm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::DPDA & pda, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::SinglePopDPDA & tm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::InputDrivenDPDA & pda, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::InputDrivenNPDA & pda, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::VisiblyPushdownDPDA & tm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::VisiblyPushdownNPDA & tm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::RealTimeHeightDeterministicDPDA & tm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::RealTimeHeightDeterministicNPDA & tm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::NPDA & pda, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::SinglePopNPDA & tm, const std::map < automaton::State, int > & states, std::ostream & out );
static void transitions ( const automaton::OneTapeDTM & tm, const std::map < automaton::State, int > & states, std::ostream & out );
public:
static void convert ( std::ostream & out, const automaton::Automaton & a );
static void convert ( std::ostream & out, const automaton::EpsilonNFA & a );
static void convert ( std::ostream & out, const automaton::MultiInitialStateNFA & a );
static void convert ( std::ostream & out, const automaton::NFA & a );
static void convert ( std::ostream & out, const automaton::DFA & a );
static void convert ( std::ostream & out, const automaton::ExtendedNFA & a );
static void convert ( std::ostream & out, const automaton::CompactNFA & a );
static void convert ( std::ostream & out, const automaton::NFTA & a );
static void convert ( std::ostream & out, const automaton::DFTA & a );
static void convert ( std::ostream & out, const automaton::DPDA & a );
static void convert ( std::ostream & out, const automaton::SinglePopDPDA & a );
static void convert ( std::ostream & out, const automaton::InputDrivenDPDA & a );
static void convert ( std::ostream & out, const automaton::InputDrivenNPDA & a );
static void convert ( std::ostream & out, const automaton::VisiblyPushdownDPDA & a );
static void convert ( std::ostream & out, const automaton::VisiblyPushdownNPDA & a );
static void convert ( std::ostream & out, const automaton::RealTimeHeightDeterministicDPDA & a );
static void convert ( std::ostream & out, const automaton::RealTimeHeightDeterministicNPDA & a );
static void convert ( std::ostream & out, const automaton::NPDA & a );
static void convert ( std::ostream & out, const automaton::SinglePopNPDA & a );
static void convert ( std::ostream & out, const automaton::OneTapeDTM & a );
static TikZConverter & getInstance ( ) {
static TikZConverter res;
return res;
}
};
#endif /* TIKZ_CONVERTER_H_ */
aconvert2/src/aconvert.cpp
+ 18
− 2
View file @ b3784348
......@@ -15,6 +15,7 @@
 
#include "DotConverter.h"
#include "GasTexConverter.h"
#include "TikZConverter.h"
 
void automatonFromString ( std::istream & in, std::ostream & out ) {
automaton::Automaton automaton = alib::StringDataFactory::fromStream < automaton::Automaton > ( in );
......@@ -124,6 +125,15 @@ void automatonToGasTex ( std::istream & in, std::ostream & out ) {
GasTexConverter::convert ( out, automaton );
}
 
void automatonToTikZ ( std::istream & in, std::ostream & out ) {
automaton::Automaton automaton = alib::XmlDataFactory::fromStream < automaton::Automaton > ( in );
std::chrono::measurements::end ( );
std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY );
TikZConverter::convert ( out, automaton );
}
int main ( int argc, char * argv[] ) {
try {
TCLAP::CmdLine cmd ( "Convert binary", ' ', "0.01" );
......@@ -140,6 +150,9 @@ int main ( int argc, char * argv[] ) {
TCLAP::SwitchArg automaton_to_gastex ( "", "automaton_to_gastex", "Convert automaton to gastex representation" );
cmd.add ( automaton_to_gastex );
 
TCLAP::SwitchArg automaton_to_tikz ( "", "automaton_to_tikz", "Convert automaton to tikz representation" );
cmd.add ( automaton_to_tikz );
TCLAP::SwitchArg grammar_from_string ( "", "grammar_from_string", "Convert grammar from string representation" );
cmd.add ( grammar_from_string );
 
......@@ -175,9 +188,10 @@ int main ( int argc, char * argv[] ) {
 
cmd.parse ( argc, argv );
 
if(verbose.isSet())
if ( verbose.isSet ( ) )
common::GlobalData::verbose = true;
if(measure.isSet())
if ( measure.isSet ( ) )
common::GlobalData::measure = true;
 
std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL );
......@@ -202,6 +216,8 @@ int main ( int argc, char * argv[] ) {
automatonToDot ( * in, std::cout );
else if ( automaton_to_gastex.getValue ( ) )
automatonToGasTex ( * in, std::cout );
else if ( automaton_to_tikz.getValue ( ) )
automatonToTikZ ( * in, std::cout );
else if ( grammar_from_string.getValue ( ) )
grammarFromString ( * in, std::cout );
else if ( grammar_to_string.getValue ( ) )
......
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