use cli in compaction

acompaction2/makefile.conf

 EXECUTABLE:=acompaction2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/

acompaction2/src/acompaction.cpp

@@ -8,11 +8,10 @@
 #include <tclap/CmdLine.h>
 #include <global/GlobalData.h>
 #include <measure>
-#include <sax/FromXMLParserHelper.h>
-#include "exception/CommonException.h"
-#include "factory/XmlDataFactory.hpp"
-#include "automaton/transform/Compaction.h"
+#include <exception/CommonException.h>
+#include <lexer/Lexer.h>
+#include <parser/Parser.h>
 int main(int argc, char** argv) {
 	try {
@@ -37,23 +36,27 @@ int main(int argc, char** argv) {
 		if(measure.isSet())
 			common::GlobalData::measure = true;
-		measurements::start("Overal", measurements::Type::OVERALL);
-		measurements::start("Input read", measurements::Type::AUXILIARY);
-		automaton::Automaton automaton = alib::XmlDataFactory::fromTokens (sax::FromXMLParserHelper::parseInput(input));
-		measurements::end();
-		measurements::start("Algorithm", measurements::Type::MAIN);
-		automaton::Automaton res = automaton::transform::Compaction::convert(automaton);
-		measurements::end();
-		measurements::start("Output write", measurements::Type::AUXILIARY);
-		alib::XmlDataFactory::toStdout(res);
-		measurements::end();
-		measurements::end();
+		cli::Environment environment;
+		environment.setBinding ( "stdin", input.getValue ( ) );
+		environment.setBinding ( "stdout", "-" );
+		measurements::start ( "Overal", measurements::Type::OVERALL );
+		measurements::start ( "Input read", measurements::Type::AUXILIARY );
+		cli::Parser parser ( cli::Lexer ( "execute <#stdin > $inputAutomaton" ) );
+		parser.parse ( )->run ( environment );
+		measurements::end ( );
+		measurements::start ( "Algorithm", measurements::Type::MAIN );
+		parser = cli::Parser ( cli::Lexer ( "execute automaton::transform::Compaction $inputAutomaton > $outputAutomaton" ) );
+		parser.parse ( )->run ( environment );
+		measurements::end ( );
+		measurements::start ( "Output write", measurements::Type::AUXILIARY );
+		parser = cli::Parser ( cli::Lexer ( "execute $outputAutomaton >#stdout" ) );
+		parser.parse ( )->run ( environment );
 		if(measure.getValue()) ext::cmeasure << measurements::results() << std::endl;

alib2algo/src/automaton/transform/Compaction.cpp

@@ -12,17 +12,9 @@ namespace automaton {
 namespace transform {
-automaton::Automaton Compaction::convert(const automaton::Automaton& automaton) {
-	return dispatch(automaton.getData());
-}
-
-auto CompactionCompactNFA = registration::OverloadRegister < Compaction, automaton::CompactNFA < >, automaton::CompactNFA < > > ( Compaction::convert );
-auto CompactionDFA = registration::OverloadRegister < Compaction, automaton::CompactNFA < >, automaton::DFA < > > ( Compaction::convert );
-auto CompactionNFA = registration::OverloadRegister < Compaction, automaton::CompactNFA < >, automaton::NFA < > > ( Compaction::convert );
-
-auto CompactionCompactNFA2 = registration::AbstractRegister < Compaction, automaton::CompactNFA < >, const automaton::CompactNFA < > & > ( Compaction::convert );
-auto CompactionDFA2 = registration::AbstractRegister < Compaction, automaton::CompactNFA < >, const automaton::DFA < > & > ( Compaction::convert );
-auto CompactionNFA2 = registration::AbstractRegister < Compaction, automaton::CompactNFA < >, const automaton::NFA < > & > ( Compaction::convert );
+auto CompactionCompactNFA = registration::AbstractRegister < Compaction, automaton::CompactNFA < >, const automaton::CompactNFA < > & > ( Compaction::convert );
+auto CompactionDFA = registration::AbstractRegister < Compaction, automaton::CompactNFA < >, const automaton::DFA < > & > ( Compaction::convert );
+auto CompactionNFA = registration::AbstractRegister < Compaction, automaton::CompactNFA < >, const automaton::NFA < > & > ( Compaction::convert );
 } /* namespace transform */

alib2algo/src/automaton/transform/Compaction.h

@@ -11,9 +11,6 @@
 #include <stack>
 #include <tuple>
-#include <core/multipleDispatch.hpp>
-
-#include "automaton/Automaton.h"
 #include "automaton/AutomatonFeatures.h"
 #include <automaton/FSM/CompactNFA.h>
 #include <automaton/FSM/DFA.h>
@@ -25,7 +22,7 @@ namespace transform {
 /**
  * Transforms FSM to CompactNFA
  */
-class Compaction : public alib::SingleDispatch<Compaction, automaton::Automaton, const automaton::AutomatonBase &> {
+class Compaction {
 public:
 	template < class SymbolType, class StateType >
 	static automaton::CompactNFA < SymbolType, StateType > convert( const automaton::DFA < SymbolType, StateType > & automaton);
@@ -33,13 +30,6 @@ public:
 	static automaton::CompactNFA < SymbolType, StateType > convert( const automaton::NFA < SymbolType, StateType > & automaton);
 	template < class SymbolType, class StateType >
 	static automaton::CompactNFA < SymbolType, StateType > convert( const automaton::CompactNFA < SymbolType, StateType > & automaton);
-
-	/**
-	 * Transforms
-	 * @param automaton FSM to transform
-	 * @return CompactNFA equivalent to given automaton
-	 */
-	static automaton::Automaton convert( const automaton::Automaton & automaton );
 };
 template < class SymbolType, class StateType >