Merge branch 'johannes' into 'master'

Johannes

See merge request !9

INSTALL

@@ -28,6 +28,9 @@ The basic procedure to build and install macaon from sources is the following.
      or
 	sudo apt-get install openjdk-7-jdk 
 
+   Attention: if you have libpython2.7-dev and libpython3.X-dev installed, cmake will choose the latter
+   in this case the generated libraries for Python will only work with Python 3
+
 - Build the sources with:
     make
 - Install macaon

build/debug.sh

-cmake -DCMAKE_BUILD_TYPE=Debug ..
-make
-sudo make install

build/script.sh

-cmake ..
-make
-sudo make install

maca_export/CMakeLists.txt

@@ -3,122 +3,29 @@ if(MACA_EXPORT)
 	FIND_PACKAGE(SWIG)
 	if (SWIG_FOUND)
 		FIND_PACKAGE(PythonLibs)
-
 		if(PYTHONLIBS_FOUND)
-      set(SOURCES src/maca_export.i)
-      set(PYTHON_MODULE_NAME Macaon)
-
-      include_directories(${PYTHON_INCLUDE_PATH})
-      include_directories(../maca_trans_parser/src)
-      include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
-
-      #message(eeeeeeeeeeee ${CMAKE_CURRENT_SOURCE_DIR})
-      add_custom_command(
-        DEPENDS ${SOURCES}
-        OUTPUT maca_export_py.cc
-        COMMAND swig -python -c++  -o maca_export_py.cc ../../maca_export/src/maca_export.i
-        )
-	
-      # Specify the lib
-      add_library(${PYTHON_MODULE_NAME} SHARED
-        maca_export_py.cc
-        src/maca_trans_tagger_export.cc
-        src/maca_lemmatizer_export.cc
-        src/maca_trans_parser_export.cc
-        )
-
-      set_target_properties(${PYTHON_MODULE_NAME} PROPERTIES PREFIX _)
-      target_link_libraries(${PYTHON_MODULE_NAME} transparse maca_common perceptron)
-    else()
-      message("pythonlibs not installed on your system")
+			message(STATUS "OK: PythonLibs ${PYTHONLIBS_VERSION_STRING} found. Run your python scripts with python ${PYTHONLIBS_VERSION_STRING}!")
 		endif()
 
-
-
 		FIND_PACKAGE(Java 1.7)
+#		if (Java_FOUND OR JAVA_FOUND)
+#			message(STATUS "OK: Java ${Java_VERSION_STRING} found")
 			FIND_PACKAGE(JNI)
-    if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND))
-      set(JAVA_MODULE_NAME Macaon)
-      set(JAVA_LIBRARY MacaonJava)
-      set(JAVA_CLASS_TAGGER MacaonTransTagger)
-      set(JAVA_CLASS_LEMMATIZER MacaonTransLemmatizer)
-      set(JAVA_CLASS_TRANSPARSER MacaonTransParser)
-      set(JAVA_PACKAGE lif)
-      set(JAR_FILENAME macaon)
-
-      #set(ADDITIONNAL_JAVA_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/MacaonTransParserWrapper.java)
-
-      # Add include directories 
-      include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-  
-      # Run swig executable to generate java code
-      add_custom_command(
-        DEPENDS ${SOURCES}
-        OUTPUT maca_export_java.cc
-        COMMAND swig -java -package ${JAVA_PACKAGE} -c++ -o maca_export_java.cc ../../maca_export/src/maca_export.i
-        )
-
-      add_library(${JAVA_LIBRARY} SHARED
-        maca_export_java.cc
-        src/maca_trans_tagger_export.cc
-        src/maca_lemmatizer_export.cc
-        src/maca_trans_parser_export.cc
-        )
+#			if (JNI_FOUND)
+#				message(STATUS "OK: JNI found")
+#			endif()
+#		endif()
 
-      target_link_libraries(${JAVA_LIBRARY} transparse maca_common perceptron)
+		add_subdirectory(tagger)
+		add_subdirectory(lemmatizer)
+		add_subdirectory(parser)
 
-      string(REGEX REPLACE "[.]" "/" JAVA_PACKAGE_DIR ${JAVA_PACKAGE})
-      add_custom_command(
-        TARGET ${JAVA_LIBRARY} POST_BUILD
-        COMMAND mkdir -p ${JAVA_PACKAGE_DIR}
-        COMMAND ${Java_JAVAC_EXECUTABLE} -encoding utf8 -d ${CMAKE_CURRENT_BINARY_DIR} #${JAVA_PACKAGE_DIR}
-        ${JAVA_MODULE_NAME}JNI.java
-	${JAVA_CLASS_TAGGER}.java
-	${JAVA_CLASS_LEMMATIZER}.java
-        ${JAVA_CLASS_TRANSPARSER}.java
-        ${JAVA_MODULE_NAME}.java
-        ${ADDITIONNAL_JAVA_FILES}
-        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS_TRANSPARSER}.java ${JAVA_CLASS_TAGGER}.java ${JAVA_CLASS_LEMMATIZER}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
-  	)
-      add_custom_command(
-        TARGET ${JAVA_LIBRARY} POST_BUILD
-        COMMAND ${Java_JAR_EXECUTABLE} -cvf ${JAR_FILENAME}.jar -C ${CMAKE_CURRENT_BINARY_DIR} ${JAVA_PACKAGE_DIR}          
-        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS_TRANSPARSER}.java ${JAVA_CLASS_TAGGER}.java ${JAVA_CLASS_LEMMATIZER}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
-        #WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMENT "Building ${JAR_FILENAME}"
-      VERBATIM
-      )
-    else()
-      message("Java JNI support not installed")
-    endif()
 	else()
 		message("swig >= 3.0 not installed on your system")
 	endif()
 
 
-  
-
-  set(TESTSOURCES 
-	src/maca_lemmatizer_export.cc
-	src/maca_trans_parser_export.cc
-	src/maca_trans_tagger_export.cc
-  )
-
-#  #compiling library
-#  include_directories(src)
-#  add_library(swigtransparse ${TESOURCES})
-#target_link_libraries(transparse perceptron)
-
-
-
-   add_executable(testcxx ./src/test.cc ${TESTSOURCES})
-   target_link_libraries(testcxx perceptron)
-   target_link_libraries(testcxx transparse)
-   target_link_libraries(testcxx maca_common)
-#   install (TARGETS testcxx DESTINATION bin)
-
-
-
+	add_subdirectory(src)
 endif()
 
 

maca_export/README.txt

+Using the libraries for python and java
+
+Attention: if you have libpython2.7-dev and libpython3.X-dev installed, cmake will choose the latter
+in this case the generated libraries for Python will only work with Python 3
+
+
+set environment variable MACAON_DIR
+    export MACAON_DIR=/home/jeuh6401/SemanticData/macaon/maca_data2
+
+
+Adapt the lines like mt = MacaonTagger.MacaonTransTagger("fr", "fr/eval/wplgfs.mcd")
+then:
+
+    cd maca_data2
+    ../macaon2/maca_export/example/example.py
+
+
+
+
+another test programme:
+    cd maca_data2
+    ../macaon2/build/maca_export/src/testcxx jh-seq jh-seq/eval/wplgfs.mcd ../macaon2/maca_export/src/test-0.mcf 
+
+

maca_export/example/example.java

 import lif.*;
 /** example to use the macaon parser with java
     compile (in maca_data2)
-       javac -cp ../macaon2/build_debug/maca_export/macaon.jar ../macaon2/maca_export/example/example.java
+     javac -cp ../macaon2/build/maca_export/tagger/macaontagger.jar:../macaon2/build/maca_export/lemmatizer/macaonlemmatizer.jar:../macaon2/build/maca_export/parser/macaonparser.jar ../macaon2/maca_export/example/example.java
+
     run
-       java -cp ../macaon2/build_debug/maca_export/macaon.jar:../macaon2/maca_export/example -Djava.library.path=../macaon2/build_debug/maca_export/ example
+     java -cp ../macaon2/build/maca_export/tagger/macaontagger.jar:../macaon2/build/maca_export/lemmatizer/macaonlemmatizer.jar:../macaon2/build/maca_export/parser/macaonparser.jar:../macaon2/maca_export/example  -Djava.library.path=../macaon2/build/maca_export/tagger:../macaon2/build/maca_export/lemmatizer:../macaon2/build/maca_export/parser example
+
+     make jar
+      jar -cf ../macaon2/maca_export/example/macaon.jar -C ../macaon2/maca_export/example example.class
+
+
  */
 public class example {
-    public static void main(String []args) {
-	System.loadLibrary("MacaonJava"); // use libMacaonExport.so
+    MacaonTransTagger mt;
+    MacaonTransLemmatizer ml;
+    MacaonTransParser mp;
+
     
+    public example(String lg, String mcd, boolean loadlibraries) {
+	if (loadlibraries) {
+	    System.loadLibrary("MacaonTransTaggerJava"); // use libMacaonTransTaggerJava.so
+	    System.loadLibrary("MacaonTransLemmatizerJava");
+	    System.loadLibrary("MacaonTransParserJava");
+	}
+
+	mt = new MacaonTransTagger(lg, mcd);
+	ml = new MacaonTransLemmatizer(lg, mcd);
+	mp = new MacaonTransParser(lg, mcd);
+    }
+
+    public void test1() {
 	/*	StringBuilder mcf1 = new StringBuilder("La	D	le\n");
 	mcf1.append("pose	N	pose\n");
 	mcf1.append("d'	P	de\n");
@@ -52,14 +73,35 @@ public class example {
 	mcf1.append("usagers\n");
 	mcf1.append(".\n");
 
-	MacaonTransTagger mt = new MacaonTransTagger("jh-seq", "jh-seq/eval/wplgfs.mcd");
-	MacaonTransLemmatizer ml = new MacaonTransLemmatizer("jh-seq", "jh-seq/eval/wplgfs.mcd");
-	MacaonTransParser mp = new MacaonTransParser("jh-seq", "jh-seq/eval/wplgfs.mcd");
 	
 	String tags = mt.tagmcf(mcf1.toString());
 	System.out.println(tags);
 	String lemmas = ml.lemmatizemcf(tags);
 	System.out.println(lemmas);
 	System.out.println(mp.parsemcf(lemmas));
+	
+    }
+
+    public String tag(String text) {
+	String t = text.replaceAll("([\\.,\\?;:!/])", " $1 ");
+
+	String [] elems = t.split("[\\s]+");
+	StringBuilder mcf1 = new StringBuilder();
+	for (String elem : elems) {
+	    mcf1.append(elem).append('\n');
+	}
+	//System.out.println(mcf1);
+	String tags = mt.tagmcf(mcf1.toString());
+	//System.out.println(tags);
+	String lemmas = ml.lemmatizemcf(tags);
+
+	return lemmas;
+    }
+
+    public static void main(String []args) {
+	example ex = new example("jh-seq", "jh-seq/eval/wplgfs.mcd", true);
+	ex.test1();
+	//String res = ex.tag("la souris mange.");
+	//System.out.println(res);
     }
 }

maca_export/example/example.py

@@ -6,15 +6,20 @@ import os
 currentdir = os.path.dirname(os.path.abspath(__file__))
 
 import sys
-sys.path.append(currentdir + "/../../build_debug/maca_export")
 
+sys.path.append(currentdir + "/../../build/maca_export/tagger")
+sys.path.append(currentdir + "/../../build/maca_export/lemmatizer")
+sys.path.append(currentdir + "/../../build/maca_export/parser")
 
-import Macaon
+
+import MacaonTagger
+import MacaonLemmatizer
+import MacaonParser
 
 # for this example you should be in maca_data2
-mt = Macaon.MacaonTransTagger("jh-seq", "jh-seq/eval/wplgfs.mcd")
-ml = Macaon.MacaonTransLemmatizer("jh-seq", "jh-seq/eval/wplgfs.mcd")
-mp = Macaon.MacaonTransParser("jh-seq", "jh-seq/eval/wplgfs.mcd")
+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")
 
 mcf="""La
 grosse
@@ -92,8 +97,8 @@ lemmas = ml.lemmatizemcf(tags)
 print lemmas
 print mp.parsemcf(lemmas)
 
-del mp
-del ml
 del mt
+del ml
+del mp
 
 

maca_export/lemmatizer/CMakeLists.txt

+set(SOURCES maca_export_lemmatizer.i)
+
+if(PYTHONLIBS_FOUND)
+
+	set(PYTHON_LEMMATIZER_NAME MacaonLemmatizer)
+
+
+      include_directories(${PYTHON_INCLUDE_PATH})
+      include_directories(../../maca_lemmatizer/src)
+      include_directories(../../maca_common/include)
+      include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+	#message(eeeeeeeeeeee ${CMAKE_CURRENT_SOURCE_DIR})
+	add_custom_command(
+	  DEPENDS ${SOURCES}
+	  OUTPUT maca_export_lemmatizer_py.cc 
+	  COMMAND swig -python -c++  -o maca_export_lemmatizer_py.cc ../../../maca_export/lemmatizer/maca_export_lemmatizer.i
+	  )
+ 
+	# Specify the lib
+	add_library(${PYTHON_LEMMATIZER_NAME} SHARED
+	 maca_export_lemmatizer_py.cc 
+	  maca_lemmatizer_export.cc
+	../../maca_lemmatizer/src/context.c
+	  )
+
+	set_target_properties(${PYTHON_LEMMATIZER_NAME} PROPERTIES PREFIX _)
+	target_link_libraries(${PYTHON_LEMMATIZER_NAME} transparse maca_common)
+else()
+      message("pythonlibs not installed on your system")
+endif()
+
+
+if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND))
+	set(JAVA_MODULE_NAME MacaonLemmatizer)
+	set(JAVA_LIBRARY MacaonTransLemmatizerJava)
+	set(JAVA_CLASS MacaonTransLemmatizer)
+	set(JAVA_PACKAGE lif)
+      set(JAR_FILENAME macaonlemmatizer)
+
+
+      # Add include directories 
+      include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
+  
+      # Run swig executable to generate java code
+      add_custom_command(
+        DEPENDS ${SOURCES}
+	OUTPUT maca_export_lemmatizer_java.cc
+        COMMAND swig -java -package ${JAVA_PACKAGE} -c++ -o maca_export_lemmatizer_java.cc ../../../maca_export/lemmatizer/maca_export_lemmatizer.i
+        )
+
+      add_library(${JAVA_LIBRARY} SHARED
+	maca_export_lemmatizer_java.cc
+        maca_lemmatizer_export.cc
+	../../maca_lemmatizer/src/context.c
+        )
+
+      target_link_libraries(${JAVA_LIBRARY} transparse maca_common)
+
+      string(REGEX REPLACE "[.]" "/" JAVA_PACKAGE_DIR ${JAVA_PACKAGE})
+      add_custom_command(
+        TARGET ${JAVA_LIBRARY} POST_BUILD
+        COMMAND mkdir -p ${JAVA_PACKAGE_DIR}
+        COMMAND ${Java_JAVAC_EXECUTABLE} -encoding utf8 -d ${CMAKE_CURRENT_BINARY_DIR} #${JAVA_PACKAGE_DIR}
+           ${JAVA_MODULE_NAME}JNI.java
+	   ${JAVA_CLASS}.java
+           ${JAVA_MODULE_NAME}.java
+           ${ADDITIONNAL_JAVA_FILES}
+        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
+  	)
+      add_custom_command(
+        TARGET ${JAVA_LIBRARY} POST_BUILD
+        COMMAND ${Java_JAR_EXECUTABLE} -cvf ${JAR_FILENAME}.jar -C ${CMAKE_CURRENT_BINARY_DIR} ${JAVA_PACKAGE_DIR}          
+        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
+        #WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "Building ${JAR_FILENAME}"
+      VERBATIM
+      )
+    else()
+      message("Java JNI support not installed")
+    endif()

maca_export/src/maca_export.i → maca_export/lemmatizer/maca_export_lemmatizer.i

-%module Macaon
+%module MacaonLemmatizer
 
 %{
-#include <maca_trans_tagger_export.h>
 #include <maca_lemmatizer_export.h>
-#include <maca_trans_parser_export.h>
 %}
 
-class MacaonTransTagger {
-    public:
-	MacaonTransTagger(char *lg, char *mcd);
-	~MacaonTransTagger();
-	const char *tagmcf(const char *mcf);
-};
-
-
 class MacaonTransLemmatizer {
     public:
 	MacaonTransLemmatizer(char *lg, char *mcd);
@@ -21,10 +11,3 @@ class MacaonTransLemmatizer {
 	const char *lemmatizemcf(const char *mcf);
 };
 
-
-class MacaonTransParser {
-    public:
-	MacaonTransParser(char *lg, char *mcd);
-	~MacaonTransParser();
-	const char *parsemcf(const char *mcf);
-};

maca_export/src/maca_lemmatizer_export.cc → maca_export/lemmatizer/maca_lemmatizer_export.cc

-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
+#include <iostream>
 
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
 
-#include "context.h"
-#include "feat_fct.h"
-#include "config2feat_vec.h"
-#include "feature_table.h"
  #include "dico.h"
+ #include "word.h"
+ #include "util.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 #include "maca_lemmatizer_export.h"
 
+
 MacaonTransLemmatizer::MacaonTransLemmatizer(char *lg, char *mcd) {
     char * argv[] = { (char *)"initParser",
 		      (char *)"-L", lg,
 		      (char *)"-C", mcd,
 		      0
     };
-
     ctx = context_read_options(5, argv);
     form_pos_ht = hash_new(1000000);
   
     //maca_lemmatizer_check_options(ctx);
     maca_lemmatizer_set_linguistic_resources_filenames(ctx);
-
     lemma_array = read_fplm_file(ctx->fplm_filename, form_pos_ht, ctx->debug_mode, &lemma_array_size);
     resultstring = NULL;
+
 }
 
 MacaonTransLemmatizer::~MacaonTransLemmatizer() {

maca_export/src/maca_lemmatizer_export.h → maca_export/lemmatizer/maca_lemmatizer_export.h

+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
+
  #include "context.h"
+ #include "../../../maca_trans_parser/src/config.h"
+ #include "word.h"
+
+//#ifdef __cplusplus
+//}
+//#endif
+
 
 class MacaonTransLemmatizer {
  public:

maca_export/parser/CMakeLists.txt

+if(PYTHONLIBS_FOUND)
+	set(SOURCES maca_export_parser.i)
+	set(PYTHON_PARSER_NAME MacaonParser)
+
+	include_directories(${PYTHON_INCLUDE_PATH})
+	include_directories(../../maca_trans_parser/src)
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+	#message(eeeeeeeeeeee ${CMAKE_CURRENT_SOURCE_DIR})
+	add_custom_command(
+	  DEPENDS ${SOURCES}
+	  OUTPUT maca_export_parser_py.cc 
+	  COMMAND swig -python -c++  -o maca_export_parser_py.cc ../../../maca_export/parser/maca_export_parser.i
+	  )
+ 
+	# Specify the lib
+	add_library(${PYTHON_PARSER_NAME} SHARED
+	 maca_export_parser_py.cc 
+	  maca_trans_parser_export.cc
+	  )
+
+	set_target_properties(${PYTHON_PARSER_NAME} PROPERTIES PREFIX _)
+	target_link_libraries(${PYTHON_PARSER_NAME} transparse maca_common perceptron)
+else()
+      message("pythonlibs not installed on your system")
+endif()
+
+
+if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND))
+	set(JAVA_MODULE_NAME MacaonParser)
+	set(JAVA_LIBRARY MacaonTransParserJava)
+	set(JAVA_CLASS MacaonTransParser)
+	set(JAVA_PACKAGE lif)
+      set(JAR_FILENAME macaonparser)
+
+
+      # Add include directories 
+      include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
+  
+      # Run swig executable to generate java code
+      add_custom_command(
+        DEPENDS ${SOURCES}
+	OUTPUT maca_export_parser_java.cc
+        COMMAND swig -java -package ${JAVA_PACKAGE} -c++ -o maca_export_parser_java.cc ../../../maca_export/parser/maca_export_parser.i
+        )
+
+      add_library(${JAVA_LIBRARY} SHARED
+	maca_export_parser_java.cc
+        maca_trans_parser_export.cc
+        )
+
+      target_link_libraries(${JAVA_LIBRARY} transparse maca_common perceptron)
+
+      string(REGEX REPLACE "[.]" "/" JAVA_PACKAGE_DIR ${JAVA_PACKAGE})
+      add_custom_command(
+        TARGET ${JAVA_LIBRARY} POST_BUILD
+        COMMAND mkdir -p ${JAVA_PACKAGE_DIR}
+        COMMAND ${Java_JAVAC_EXECUTABLE} -encoding utf8 -d ${CMAKE_CURRENT_BINARY_DIR} #${JAVA_PACKAGE_DIR}
+           ${JAVA_MODULE_NAME}JNI.java
+	   ${JAVA_CLASS}.java
+           ${JAVA_MODULE_NAME}.java
+           ${ADDITIONNAL_JAVA_FILES}
+        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
+  	)
+      add_custom_command(
+        TARGET ${JAVA_LIBRARY} POST_BUILD
+        COMMAND ${Java_JAR_EXECUTABLE} -cvf ${JAR_FILENAME}.jar -C ${CMAKE_CURRENT_BINARY_DIR} ${JAVA_PACKAGE_DIR}          
+        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
+        #WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "Building ${JAR_FILENAME}"
+      VERBATIM
+      )
+else()
+      message("Java JNI support not installed")
+endif()

maca_export/parser/maca_export_parser.i

+%module MacaonParser
+
+%{
+#include <maca_trans_parser_export.h>
+%}
+
+
+
+class MacaonTransParser {
+    public:
+	MacaonTransParser(char *lg, char *mcd);
+	~MacaonTransParser();
+	const char *parsemcf(const char *mcf);
+};

maca_export/src/maca_trans_parser_export.cc → maca_export/parser/maca_trans_parser_export.cc

-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
 
-#include "context.h"
 #include "simple_decoder_parser_arc_eager.h"
 #include "movement_parser_arc_eager.h"
 #include "feat_fct.h"
 #include "config2feat_vec.h"
+
 #include "feature_table.h"
 #include "dico.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 #include "maca_trans_parser_export.h"
 
@@ -37,7 +37,7 @@ MacaonTransParser::MacaonTransParser(char *lg, char *mcd) {
 
 
     set_linguistic_resources_filenames_parser(ctx);
-    ctx->features_model = feat_model_read(ctx->features_model_filename, ctx->verbose);
+    ctx->features_model = feat_model_read(ctx->features_model_filename, feat_lib_build(), ctx->verbose);
     ctx->vocabs = dico_vec_read(ctx->vocabs_filename, ctx->hash_ratio);
 
     mcd_link_to_dico(ctx->mcd_struct, ctx->vocabs, ctx->verbose);

maca_export/src/maca_trans_parser_export.h → maca_export/parser/maca_trans_parser_export.h

+
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
+
  #include "context.h"
+ #include "config.h"
+
+//#ifdef __cplusplus
+//}
+//#endif
 
 
 class MacaonTransParser {

maca_export/src/CMakeLists.txt

+
+include_directories(../../maca_trans_parser/src)
+include_directories(../../maca_lemmatizer/src)
+include_directories(../../maca_common/include)
+
+include_directories(../tagger)
+include_directories(../lemmatizer)
+include_directories(../parser)
+
+
+
+
+add_executable(testcxx
+	test.cc
+	../tagger/maca_trans_tagger_export.cc
+	../lemmatizer/maca_lemmatizer_export.cc
+	../parser/maca_trans_parser_export.cc)
+target_link_libraries(testcxx transparse maca_common perceptron openblas)
+
+##   install (TARGETS testcxx DESTINATION bin)

maca_export/src/test.cc

@@ -6,6 +6,10 @@
 #include "maca_trans_tagger_export.h"
 
 // test programme to be able using valgrind on the exported part of macaon
+// run (in maca_data2)
+/**
+   ../macaon2/build/maca_export/src/testcxx  jh-seq jh-seq/eval/wplgfs.mcd ../macaon2/maca_export/src/test.mcf 
+ */
 
 using namespace std ;
 
@@ -15,8 +19,8 @@ int main(int argc, char *argv[]) {
 	return 1;
     }
 
-    //MacaonTransTagger *mt = new MacaonTransTagger(argv[1], argv[2]);
-    //MacaonTransLemmatizer *ml = new MacaonTransLemmatizer(argv[1], argv[2]);
+    MacaonTransTagger *mt = new MacaonTransTagger(argv[1], argv[2]);
+    MacaonTransLemmatizer *ml = new MacaonTransLemmatizer(argv[1], argv[2]);
     MacaonTransParser *mp = new MacaonTransParser(argv[1], argv[2]);
 
     ifstream ifp(argv[3]);
@@ -27,13 +31,15 @@ int main(int argc, char *argv[]) {
 	text += line + "\n";
     }
 
-    //const char *tags = mt->tagmcf(text.c_str());
-    //const char *lemmas = ml->lemmatizemcf(tags);
-    //const char *deps = mp->parsemcf(lemmas);
-    const char *deps = mp->parsemcf(text.c_str());
-
+    const char *tags = mt->tagmcf(text.c_str());
+    //cout << tags << endl;
+    const char *lemmas = ml->lemmatizemcf(tags);
+    const char *deps = mp->parsemcf(lemmas);
+    //const char *deps = mp->parsemcf(text.c_str());
     cout << deps << endl;
+
+
+    delete mt;
+    delete ml;
     delete mp;
-    //delete ml;
-    //delete mt;
 }

maca_export/src/test.mcf

+La	D	le
+pose	N	pos
+d'	P	de
+un	D	un
+panneau	N	panneau
+stop	N	stop
+paraît	V	paraître
+être	V	être
+la	D	le
+formule	N	formule
+la	D	le
+mieux	ADV	mieux
+adaptée	A	adapté
+pour	P	pour
+assurer	V	assurer
+la	D	le
+sécurité	N	sécurité
+des	P+D	de
+usagers	N	usager
+.	PONCT	.
\ No newline at end of file

maca_export/tagger/CMakeLists.txt

+set(SOURCES maca_export_tagger.i)
+
+
+
+
+if(PYTHONLIBS_FOUND)
+
+	set(PYTHON_TAGGER_NAME MacaonTagger)
+
+	include_directories(${PYTHON_INCLUDE_PATH})
+	include_directories(../../maca_trans_parser/src)
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+	#message(eeeeeeeeeeee ${CMAKE_CURRENT_SOURCE_DIR})
+	add_custom_command(
+	  DEPENDS ${SOURCES}
+	  OUTPUT maca_export_tagger_py.cc 
+	  COMMAND swig -python -c++  -o maca_export_tagger_py.cc ../../../maca_export/tagger/maca_export_tagger.i
+	  )
+ 
+	# Specify the lib
+	add_library(${PYTHON_TAGGER_NAME} SHARED
+  	  maca_export_tagger_py.cc 
+	  maca_trans_tagger_export.cc
+	  )
+
+	set_target_properties(${PYTHON_TAGGER_NAME} PROPERTIES PREFIX _)
+	target_link_libraries(${PYTHON_TAGGER_NAME} transparse maca_common perceptron)
+else()
+      message("pythonlibs not installed on your system")
+
+endif()
+
+
+
+if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND))
+	set(JAVA_MODULE_NAME MacaonTagger)
+	set(JAVA_LIBRARY MacaonTransTaggerJava)
+	set(JAVA_CLASS MacaonTransTagger)
+	set(JAVA_PACKAGE lif)
+      set(JAR_FILENAME macaontagger)
+
+
+      # Add include directories 
+      include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
+  
+      # Run swig executable to generate java code
+      add_custom_command(
+        DEPENDS ${SOURCES}
+	OUTPUT maca_export_tagger_java.cc
+        COMMAND swig -java -package ${JAVA_PACKAGE} -c++ -o maca_export_tagger_java.cc ../../../maca_export/tagger/maca_export_tagger.i
+        )
+
+      add_library(${JAVA_LIBRARY} SHARED
+	maca_export_tagger_java.cc
+        maca_trans_tagger_export.cc
+        )
+
+      target_link_libraries(${JAVA_LIBRARY} transparse maca_common perceptron)
+
+      string(REGEX REPLACE "[.]" "/" JAVA_PACKAGE_DIR ${JAVA_PACKAGE})
+      add_custom_command(
+        TARGET ${JAVA_LIBRARY} POST_BUILD
+        COMMAND mkdir -p ${JAVA_PACKAGE_DIR}
+        COMMAND ${Java_JAVAC_EXECUTABLE} -encoding utf8 -d ${CMAKE_CURRENT_BINARY_DIR} #${JAVA_PACKAGE_DIR}
+           ${JAVA_MODULE_NAME}JNI.java
+	   ${JAVA_CLASS}.java
+           ${JAVA_MODULE_NAME}.java
+           ${ADDITIONNAL_JAVA_FILES}
+        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
+  	)
+      add_custom_command(
+        TARGET ${JAVA_LIBRARY} POST_BUILD
+        COMMAND ${Java_JAR_EXECUTABLE} -cvf ${JAR_FILENAME}.jar -C ${CMAKE_CURRENT_BINARY_DIR} ${JAVA_PACKAGE_DIR}          
+        DEPENDS ${JAVA_MODULE_NAME}JNI.java ${JAVA_CLASS}.java ${JAVA_MODULE_NAME}.java ${ADDITIONNAL_JAVA_FILES}
+        #WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      COMMENT "Building ${JAR_FILENAME}"
+      VERBATIM
+      )
+    else()
+      message("Java JNI support not installed")
+    endif()

maca_export/tagger/maca_export_tagger.i

+%module MacaonTagger
+
+%{
+#include <maca_trans_tagger_export.h>
+%}
+
+class MacaonTransTagger {
+    public:
+	MacaonTransTagger(char *lg, char *mcd);
+	~MacaonTransTagger();
+	const char *tagmcf(const char *mcf);
+};