Browse Source

Fixed model to load correct files

Yentl Van Tendeloo 9 years ago
parent
commit
23c3e16708
1 changed files with 9 additions and 3 deletions
  1. 9 3
      model/model.py

+ 9 - 3
model/model.py

@@ -1,8 +1,10 @@
 import sys
 import sys
 sys.path.append("../kernel/")
 sys.path.append("../kernel/")
 sys.path.append("../state/")
 sys.path.append("../state/")
+sys.path.append("../interface/HUTN")
 from modelverse_state.main import ModelverseState as MvS
 from modelverse_state.main import ModelverseState as MvS
 from modelverse_kernel.main import ModelverseKernel as MvK
 from modelverse_kernel.main import ModelverseKernel as MvK
+from hutn_compiler.compiler import main as do_compile
 
 
 from pypdevs.DEVS import AtomicDEVS, CoupledDEVS
 from pypdevs.DEVS import AtomicDEVS, CoupledDEVS
 from pypdevs.simulator import Simulator
 from pypdevs.simulator import Simulator
@@ -13,7 +15,7 @@ def get_object_constructor(code):
     with open(".code.alc", "w") as f:
     with open(".code.alc", "w") as f:
         f.write(code)
         f.write(code)
         f.flush()
         f.flush()
-    constructors = do_compile(".code.alc", "interface/HUTN/grammars/actionlanguage.g", "CD")
+    constructors = do_compile(".code.alc", "../interface/HUTN/grammars/actionlanguage.g", "CS")
     return constructors
     return constructors
 
 
 def translate(operation):
 def translate(operation):
@@ -481,19 +483,23 @@ class System(CoupledDEVS):
         self.connectPorts(self.mvk.to_mvi, self.mvk2mvi.input_port)
         self.connectPorts(self.mvk.to_mvi, self.mvk2mvi.input_port)
         self.connectPorts(self.mvk2mvi.output_port, self.mvi.from_mvk)
         self.connectPorts(self.mvk2mvi.output_port, self.mvi.from_mvk)
 
 
+files = ["../bootstrap/primitives.alc"]
 code = \
 code = \
     """
     """
 include "primitives.alh"
 include "primitives.alh"
 
 
-Element function main():
+Void function main():
 \tlog("Executed the code!")
 \tlog("Executed the code!")
 \treturn
 \treturn
     """
     """
 
 
-operations = [get_object_constructor(f.read()) for f in files] + \
+operations = [get_object_constructor(open(f, 'r').read()) for f in files] + \
               get_object_constructor(code) + \
               get_object_constructor(code) + \
               get_link_and_load("main", files + ["code.alc"])
               get_link_and_load("main", files + ["code.alc"])
 
 
+print("Generated operations:")
+print(operations)
+
 args = {
 args = {
         "username":             "test_user",
         "username":             "test_user",
         "operations":           operations,
         "operations":           operations,