explicit imports; fix problem of ambiguous Math reference

shogun-toolbox · Jun 7, 2016 · bf15b80 · bf15b80
1 parent ae0e85a
commit bf15b80
Showing 1 changed file with 5 additions and 3 deletions.
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\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",