PMML feature : new node PyPMMLLoad

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a019b4265ba1fad0f856710d467a594c9f06d7c1..1d8ba285ef5b70487233bb3a8f28d8780af02d3e 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@
 ##
 SET(SUBDIRS_COMMON
   bases engine runtime wrappergen yacsloader yacsorb salomeloader
+  pmml
   )
 
 ##

diff --git a/src/salomegui/resources/YACSSchemaCatalog.xml b/src/salomegui/resources/YACSSchemaCatalog.xml
index 3020badbe8cd5756ce46d12e4a1636203c372ec5..1673967d6abda69e17b0d499097cf89e4e29829a 100644 (file)
--- a/src/salomegui/resources/YACSSchemaCatalog.xml
+++ b/src/salomegui/resources/YACSSchemaCatalog.xml
@@ -23,6 +23,23 @@ box = geompy.MakeBoxDXDYDZ(10,10,10)
 id_cyl_Int = geompy.addToStudy(box,"Box_%d" % n)]]></code></script>
       <outport name="box" type="GEOM_Shape"/>
    </inline>
+   <inline name="PyLoadPMML">
+      <script><code><![CDATA[ 
+import sys;
+from PMML import *;
+pmmlObj = PMMLlib( filename );   
+pmmlObj.SetCurrentModel( modelname , eval(pmmltype) );
+myFunc = "pyFunc";
+myHeader = "Function processed in YACCS";
+myCode = pmmlObj.ExportPyStr(myFunc, myHeader);
+exec myCode;
+]]></code></script>
+      <inport name="filename" type="string"/>
+      <inport name="modelname" type="string"/> 
+      <inport name="pmmltype" type="string"/>      
+      <outport name="pyFunc" type="pyobj"/>
+   </inline>   
    <presentation name="PyScript0" x="9" y="80.5" width="227.5" height="110"/>
+   <presentation name="PyTestPMML" x="9" y="80.5" width="227.5" height="110"/>   
    <presentation name="__ROOT__" x="0" y="0" width="246" height="199.5"/>
 </proc>

diff --git a/src/yacsloader/CMakeLists.txt b/src/yacsloader/CMakeLists.txt
index 18e0d448a2b88c12e1f14cf56734eb8fa133fb6e..3057cd9e852e736e8b00839a6769675418b07ec4 100644 (file)
--- a/src/yacsloader/CMakeLists.txt
+++ b/src/yacsloader/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 IF(SALOME_BUILD_TESTS)
   ADD_SUBDIRECTORY(Test)
+  ADD_SUBDIRECTORY(pmml)
 ENDIF(SALOME_BUILD_TESTS)
 
 # --- options ---
@@ -172,5 +173,6 @@ INSTALL(FILES ${YACSloader_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
 FILE(GLOB sample_files
   ${PROJECT_SOURCE_DIR}/src/yacsloader/samples/*.xml 
+  ${PROJECT_SOURCE_DIR}/src/yacsloader/samples/*.pmml
   ${PROJECT_SOURCE_DIR}/src/yacsloader/samples/*.data)
 INSTALL(FILES ${sample_files} DESTINATION ${SALOME_YACS_INSTALL_SAMPLES})