diff --git a/maca_export/example/example.py b/maca_export/example/example.py index 03f7aa43df1f2dcc950c64cec5c0c352e3647b11..335296675a7c14b4883155a1b89a1e7d98fe41fe 100755 --- a/maca_export/example/example.py +++ b/maca_export/example/example.py @@ -17,9 +17,9 @@ import MacaonLemmatizer import MacaonParser # for this example you should be in maca_data2 -mt = MacaonTagger.MacaonTransTagger("jh-seq", "jh-seq/eval/wplgfs.mcd") -ml = MacaonLemmatizer.MacaonTransLemmatizer("jh-seq", "jh-seq/eval/wplgfs.mcd") -mp = MacaonParser.MacaonTransParser("jh-seq", "jh-seq/eval/wplgfs.mcd") +mt = MacaonTagger.MacaonTransTagger("fr", "fr/eval/wplgfs.mcd") +ml = MacaonLemmatizer.MacaonTransLemmatizer("fr", "fr/eval/wplgfs.mcd") +mp = MacaonParser.MacaonTransParser("fr", "fr/eval/wplgfs.mcd") mcf="""La grosse diff --git a/maca_export/lemmatizer/maca_lemmatizer_export.cc b/maca_export/lemmatizer/maca_lemmatizer_export.cc index 4d8075f16edfbaf01040c18ac63ad2f89114d9ee..9acf43119736ccfa3a72b1a85e5ac5149b3fb0c0 100644 --- a/maca_export/lemmatizer/maca_lemmatizer_export.cc +++ b/maca_export/lemmatizer/maca_lemmatizer_export.cc @@ -3,17 +3,17 @@ #include <iostream> -#ifdef __cplusplus -extern "C"{ -#endif +//#ifdef __cplusplus +//extern "C"{ +//#endif #include "dico.h" #include "word.h" #include "util.h" -#ifdef __cplusplus -} -#endif +//#ifdef __cplusplus +//} +//#endif #include "maca_lemmatizer_export.h" diff --git a/maca_export/lemmatizer/maca_lemmatizer_export.h b/maca_export/lemmatizer/maca_lemmatizer_export.h index c14401b9504d7195f39ab33bd1862d02176ad8c8..b4a183c12550746af6aa5036b1c981214571e6a6 100644 --- a/maca_export/lemmatizer/maca_lemmatizer_export.h +++ b/maca_export/lemmatizer/maca_lemmatizer_export.h @@ -1,14 +1,14 @@ -#ifdef __cplusplus -extern "C"{ -#endif +//#ifdef __cplusplus +//extern "C"{ +//#endif #include "context.h" #include "../../../maca_trans_parser/src/config.h" #include "word.h" -#ifdef __cplusplus -} -#endif +//#ifdef __cplusplus +//} +//#endif class MacaonTransLemmatizer { diff --git a/maca_export/parser/maca_trans_parser_export.cc b/maca_export/parser/maca_trans_parser_export.cc index d3d62d5524d19b7df6a061b2d297538027626cea..03150189967d3536d577cec08e41301407cb23f9 100644 --- a/maca_export/parser/maca_trans_parser_export.cc +++ b/maca_export/parser/maca_trans_parser_export.cc @@ -2,15 +2,10 @@ #include <cstring> -#ifdef __cplusplus -extern "C"{ -#endif - - //#include "context.h" - //#include "maca_trans_parser/src/simple_decoder_parser_arc_eager.h" - //#include "maca_trans_parser/src/movement_parser_arc_eager.h" - //#include "maca_trans_parser/src/feat_fct.h" - //#include "maca_trans_parser/src/config2feat_vec.h" +//#ifdef __cplusplus +//extern "C"{ +//#endif + #include "simple_decoder_parser_arc_eager.h" #include "movement_parser_arc_eager.h" #include "feat_fct.h" @@ -19,9 +14,9 @@ extern "C"{ #include "feature_table.h" #include "dico.h" -#ifdef __cplusplus -} -#endif +//#ifdef __cplusplus +//} +//#endif #include "maca_trans_parser_export.h" diff --git a/maca_export/parser/maca_trans_parser_export.h b/maca_export/parser/maca_trans_parser_export.h index b95220e1b2b5a7d95a59772084c479ef41c78631..403f704681d4e1a3d55987a75b5c87cda60b6c44 100644 --- a/maca_export/parser/maca_trans_parser_export.h +++ b/maca_export/parser/maca_trans_parser_export.h @@ -1,14 +1,14 @@ -#ifdef __cplusplus -extern "C"{ -#endif +//#ifdef __cplusplus +//extern "C"{ +//#endif #include "context.h" #include "config.h" -#ifdef __cplusplus -} -#endif +//#ifdef __cplusplus +//} +//#endif class MacaonTransParser { diff --git a/maca_export/tagger/maca_trans_tagger_export.cc b/maca_export/tagger/maca_trans_tagger_export.cc index dac1fed88416f1f8161fa32e72e24e6ecadf9865..8265743c3028c9e1b9a4466256f3dc778025c217 100644 --- a/maca_export/tagger/maca_trans_tagger_export.cc +++ b/maca_export/tagger/maca_trans_tagger_export.cc @@ -2,22 +2,17 @@ #include <cstring> -#ifdef __cplusplus -extern "C"{ -#endif - - //#include "context.h" - //#include "maca_trans_parser/src/context.h" - //#include "maca_trans_parser/src/config2feat_vec.h" - //#include "maca_trans_parser/src/movement_tagger.h" - //#include "maca_trans_parser/src/simple_decoder_tagger.h" +//#ifdef __cplusplus +//extern "C"{ +//#endif + #include "config2feat_vec.h" #include "movement_tagger.h" #include "simple_decoder_tagger.h" -#ifdef __cplusplus -} -#endif +//#ifdef __cplusplus +//} +//#endif #include "maca_trans_tagger_export.h" diff --git a/maca_export/tagger/maca_trans_tagger_export.h b/maca_export/tagger/maca_trans_tagger_export.h index eb87c0752f235311e76acdb4b623696fbaebecd2..1e234a885d383510cb41ff1b2d0a3059d74a0087 100644 --- a/maca_export/tagger/maca_trans_tagger_export.h +++ b/maca_export/tagger/maca_trans_tagger_export.h @@ -1,16 +1,16 @@ //#include "maca_trans_parser/src/context.h" //#include "maca_common/include/word.h" -#ifdef __cplusplus -extern "C"{ -#endif +//#ifdef __cplusplus +//extern "C"{ +//#endif #include "context.h" #include "../../maca_common/include/word.h" -#ifdef __cplusplus -} -#endif +//#ifdef __cplusplus +//} +//#endif class MacaonTransTagger {