Merge pull request #3251 from karlnapf/develop

meta examples: fixes for java & R
shogun-toolbox · Jun 8, 2016 · 19e364a · 19e364a
2 parents d6407a5 + bac2321
commit 19e364a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 661 deletions.
diff --git a/examples/meta/CMakeLists.txt b/examples/meta/CMakeLists.txt
@@ -23,16 +23,6 @@ add_custom_target(meta_examples
 INCLUDE(FindMetaExamples)
 find_meta_examples()
 
-# run the Python generator tests
-IF(ENABLE_TESTING)
-    find_program(NOSETESTS nosetests)
-    IF(NOSETESTS)
-	    add_test(NAME meta-examples-generator
-	    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/generator
-	    COMMAND ${NOSETESTS})
-    ENDIF(NOSETESTS)
-ENDIF(ENABLE_TESTING)
-
 # If testing is enabled we run the examples
 IF(ENABLE_TESTING)
     IF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/data)

diff --git a/examples/meta/generator/targets/java.json b/examples/meta/generator/targets/java.json
@@ -1,9 +1,10 @@
 {
-    "Program": "import org.shogun.*;\nimport org.jblas.*;\n\n${dependencies}class $programName {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\n$program$testing\n}\n}\n",
+    "Program": "import org.jblas.DoubleMatrix;\nimport org.jblas.FloatMatrix;\n\nimport org.shogun.modshogun;\n${dependencies}class $programName {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\n$program$testing\n}\n}\n",
     "Dependencies": {
-        "AllDependencies": "$enumDependencies\n\n",
+        "AllDependencies": "$interfacedClassDependencies\n$enumDependencies\n\n",
+        "InterfacedClassDependencies": "$classlist\n",
         "EnumDependencies": "$enums",
-        "DependencyListElementClass": "$element",
+        "DependencyListElementClass": "import org.shogun.$element;",
         "DependencyListElementEnum": "import static org.shogun.$type.$value;",
         "DependencyListSeparator": "\n"
     },
@@ -16,6 +17,7 @@
     "Assign": "$name = $expr",
     "Type": {
         "Default": "$type",
+        "Math": "org.shogun.Math",
         "bool": "boolean",
         "int": "int",
         "float": "float",

diff --git a/examples/meta/generator/targets/r.json b/examples/meta/generator/targets/r.json
@@ -18,7 +18,7 @@
         },
         "NumberLiteral": "$number",
         "MethodCall": "$object$$$method($arguments)",
-        "StaticCall": "$type$$$$method($arguments)",
+        "StaticCall": "$type$$$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"\"$value\""
     },

diff --git a/examples/meta/generator/tests/test_translate_java.py b/examples/meta/generator/tests/test_translate_java.py
diff --git a/examples/meta/generator/tests/test_translate_octave.py b/examples/meta/generator/tests/test_translate_octave.py