headless simulation

@@ -5,7 +5,7 @@ from snakes.utils.abcd.build import Builder
 from snakes.lang.abcd.parser import parse
 from snakes.lang.abcd.parser import parse
 from snakes.lang.pgen import ParseError
 from snakes.lang.pgen import ParseError
 from snakes.utils.abcd import CompilationError, DeclarationError
 from snakes.utils.abcd import CompilationError, DeclarationError
-from snakes.utils.abcd.simul import Simulator
+from snakes.utils.abcd.simul import Simulator, ABCDSimulator
 from snakes.utils.abcd.checker import Checker
 from snakes.utils.abcd.checker import Checker
 from snakes.utils.abcd.html import build as html
 from snakes.utils.abcd.html import build as html
 from snakes.utils.simul.html import json
 from snakes.utils.simul.html import json
@@ -213,6 +213,20 @@ def save_pnml (net, target) :
         die(ERR_OUTPUT, str(sys.exc_info()[1]))
         die(ERR_OUTPUT, str(sys.exc_info()[1]))
 
 
 ##
 ##
+## simulator (not standalone)
+##
+
+def simulate (source, filename="<string>") :
+    global options, snk
+    getopts(["--simul", filename])
+    node = parse(source, filename=filename)
+    snk = snakes.plugins.load(options.plugins, "snakes.nets", "snk")
+    build = Builder(snk)
+    net = build.build(node)
+    net.label(srcfile=filename, snakes=snk)
+    return ABCDSimulator(node, net, draw(net, None))
+
+##
 ## main
 ## main
 ##
 ##
 
 
@@ -278,7 +292,7 @@ def main (args=sys.argv[1:], src=None) :
         lineno, trace = Checker(net).run()
         lineno, trace = Checker(net).run()
     if options.simul :
     if options.simul :
         try :
         try :
-            simul = Simulator(abcd, node, net, draw(net, None))
+            simul = Simulator(node, net, draw(net, None))
         except :
         except :
             bug()
             bug()
         simul.start()
         simul.start()

@@ -3,8 +3,14 @@ from snakes.utils.simul import *
 import snakes.utils.abcd.html as html
 import snakes.utils.abcd.html as html
 
 
 class ABCDSimulator (BaseSimulator) :
 class ABCDSimulator (BaseSimulator) :
-    def __init__ (self, net, a2html, n2html, gv) :
+    def __init__ (self, node, net, gv) :
         BaseSimulator.__init__(self, net)
         BaseSimulator.__init__(self, net)
+        a2html = html.ABCD2HTML(node)
+        n2html = html.Net2HTML(net, gv, a2html)
+        self.info = {"filename" :  node.st.filename,
+                     "abcd" : a2html.html(),
+                     "tree" : n2html.html(),
+                     "net" : n2html.svg()}
         self.tree = {}
         self.tree = {}
         for node in net.node() :
         for node in net.node() :
             nid = gv.nodemap[node.name]
             nid = gv.nodemap[node.name]
@@ -52,17 +58,11 @@ class ABCDSimulator (BaseSimulator) :
                 }
                 }
 
 
 class Simulator (BaseHTTPSimulator) :
 class Simulator (BaseHTTPSimulator) :
-    def __init__ (self, abcd, node, net, gv) :
-        a2html = html.ABCD2HTML(node)
-        n2html = html.Net2HTML(net, gv, a2html)
-        simul = ABCDSimulator(net, a2html, n2html, gv)
+    def __init__ (self, node, net, gv) :
+        simul = ABCDSimulator(node, net, gv)
         BaseHTTPSimulator.__init__(self, net, simulator=simul)
         BaseHTTPSimulator.__init__(self, net, simulator=simul)
-        self.info = {"filename" :  node.st.filename,
-                     "abcd" : a2html.html(),
-                     "tree" : n2html.html(),
-                     "net" : n2html.svg()}
     def init_model (self) :
     def init_model (self) :
-        return self.res["model.html"] % self.info
+        return self.res["model.html"] % self.simul.info
     def init_ui (self) :
     def init_ui (self) :
         return BaseHTTPSimulator.init_ui(self)[:-1] + [{
         return BaseHTTPSimulator.init_ui(self)[:-1] + [{
             "label" : "Show net",
             "label" : "Show net",