Fixed some remaining bugs with new merge of Yentl

interface/HUTN/hutn_compiler/constructors_object_visitor.py

@@ -1,6 +1,5 @@
 import sys
 sys.path.append("scripts")
-from process import send_to_mv
 
 from constructors_visitor import ConstructorsVisitor
 from cached_exception import CachedException

interface/HUTN/hutn_compiler/linker.py

@@ -4,12 +4,15 @@ import urllib2
 import json
 
 sys.path.append("scripts")
-from process import send_to_mv
 
 def link(address, username, objects):
     # Read out all symbol tables that are to be linked
     definers = {}
     users = {}
+    def flush_data(data):
+        if data:
+            urllib2.urlopen(urllib2.Request(address, urllib.urlencode({"op": "set_input", "data": json.dumps(data), "username": username})), timeout=10).read()
+        return []
     flush_data(address, [3, "link_and_load"] + objects + ["", "main"], username)
 
     v = urllib2.urlopen(urllib2.Request(address, urllib.urlencode({"op": "get_output", "username": username}))).read()

model/model.py

@@ -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_code
+from hutn_compiler.linker import link as link_code
 
 from pypdevs.DEVS import AtomicDEVS, CoupledDEVS
 from pypdevs.simulator import Simulator