Merge branch 'fixOutput'

Author: kilikkuo

main.py

@@ -18,19 +18,21 @@ def loadJSON(fInput):
     name = data.get('name')
     lstTypes = data.get('types')
     lstFuncs = data.get('functions')
+    strOutFolder = os.path.join(os.path.dirname(__file__), 'out')
+    print "Output files to : %s"%(os.path.abspath(strOutFolder))
 
     from dsFileBuilder import DSFileBuilder
-    dsb = DSFileBuilder(name, lstTypes)
+    dsb = DSFileBuilder(name, lstTypes, strOutFolder)
     dsb.buildDS()
     dicNumpyDS = dsb.getGeneratedNumpyDS()
 
     from kernelFuncBuilder import KernelFuncBuilder
-    kfb = KernelFuncBuilder(name, lstFuncs)
+    kfb = KernelFuncBuilder(name, lstFuncs, strOutFolder)
     kfb.buildKF()
     dicKFuncDS = kfb.getGeneratedKFuncDS()
 
     from oclPyObjGenerator import OCLPyObjGenerator
-    opg = OCLPyObjGenerator(name, dicNumpyDS, dicKFuncDS)
+    opg = OCLPyObjGenerator(name, dicNumpyDS, dicKFuncDS, strOutFolder)
     opg.generateOCLPyObj()
     a = opg.getObj()
     print a

oclPyObjGenerator.py

@@ -126,12 +126,13 @@ def __init__(self, strName, dicNumpyDS, dicKFuncDS, strFolder='out'):
 
     def getObj(self):
         import pkgutil
+        import imp
         modules = pkgutil.iter_modules(path=[self.strOutputFolder])
         instance = None
         for loader, mod_name, ispkg in modules:
             if mod_name == self.className:
-                loaded_mod = __import__(self.strRelFolder+'.'+mod_name, fromlist=[mod_name])
-                loaded_class = getattr(loaded_mod, self.className)
+                module_src = imp.load_source(os.path.splitext(self.strFileName)[0], self.strFilePath)
+                loaded_class = getattr(module_src, self.className)
                 instance = loaded_class()
                 break
         return instance