|
|
@@ -5,7 +5,7 @@ sys.path.append("interface/HUTN")
|
|
|
from modelverse_state.main import ModelverseState as MvS
|
|
|
from modelverse_kernel.main import ModelverseKernel as MvK
|
|
|
from hutn_compiler.compiler import main as do_compile
|
|
|
-from hutn_compiler.linker import link as link_code
|
|
|
+from hutn_compiler.linker import link
|
|
|
|
|
|
from pypdevs.DEVS import AtomicDEVS, CoupledDEVS
|
|
|
from pypdevs.simulator import Simulator
|
|
|
@@ -21,9 +21,12 @@ def get_object_constructor(code, filename):
|
|
|
f.write(code)
|
|
|
f.flush()
|
|
|
constructors = do_compile(".code.alc", "interface/HUTN/grammars/actionlanguage.g", "CS")
|
|
|
- constructors = ['3', '"upload"', '"%s"' % filename, '"%s"' % random.random(), 'true'] + constructors + ['false']
|
|
|
+ constructors = [3, "upload", filename, str(random.random()), True] + constructors + [False]
|
|
|
return constructors
|
|
|
|
|
|
+def link_code(main_function, username, objects):
|
|
|
+ return [3, "link_and_load"] + objects + ["", main_function]
|
|
|
+
|
|
|
def translate(operation):
|
|
|
return {
|
|
|
"CN": "create_node",
|
|
|
@@ -49,7 +52,7 @@ class MvSState(object):
|
|
|
def __init__(self):
|
|
|
self.queue = []
|
|
|
self.output = None
|
|
|
- self.mvs = MvS("bootstrap/bootstrap.m")
|
|
|
+ self.mvs = MvS("bootstrap/bootstrap.m.gz")
|
|
|
self.timer = float("inf")
|
|
|
|
|
|
class ModelverseState(AtomicDEVS):
|
