浏览代码

Shifted all services to a dedicated folder

Yentl Van Tendeloo 7 年之前
父节点
当前提交
791c6eb964

+ 2 - 2
scripts/run_local_modelverse.py

@@ -10,8 +10,8 @@ else:
 
 # Start up the HUTN compilation service already
 try:
-    hutn = subprocess.Popen([sys.executable, "scripts/HUTN_service.py", "127.0.0.1:%s" % port])
-    json = subprocess.Popen([sys.executable, "scripts/JSON_service.py", "127.0.0.1:%s" % port])
+    hutn = subprocess.Popen([sys.executable, "services/HUTN/main.py", "127.0.0.1:%s" % port])
+    json = subprocess.Popen([sys.executable, "services/JSON/main.py", "127.0.0.1:%s" % port])
 
     os.chdir("wrappers")
     subprocess.check_call([sys.executable, "-m", "sccd.compiler.sccdc", "-p", "threads", "modelverse_SCCD.xml"])

+ 1 - 1
scripts/DEVS_service.py

@@ -8,7 +8,7 @@ from multiprocessing import Process, Pipe, freeze_support
 #address = "msdl.uantwerpen.be:8001"
 address = "localhost:8001"
 
-sys.path.append('interface/PDEVS/pypdevs/src')
+sys.path.append('services/DEVS/pypdevs/src')
 
 from simulator import Controller
 import threading, time

interface/PDEVS/pypdevs/examples/client.py → services/DEVS/pypdevs/examples/client.py


interface/PDEVS/pypdevs/examples/experiment.py → services/DEVS/pypdevs/examples/experiment.py


interface/PDEVS/pypdevs/examples/exported_model.py → services/DEVS/pypdevs/examples/exported_model.py


interface/PDEVS/pypdevs/examples/helpers.py → services/DEVS/pypdevs/examples/helpers.py


interface/PDEVS/pypdevs/examples/infinity.py → services/DEVS/pypdevs/examples/infinity.py


interface/PDEVS/pypdevs/examples/model.py → services/DEVS/pypdevs/examples/model.py


interface/PDEVS/pypdevs/examples/ps_model.py → services/DEVS/pypdevs/examples/ps_model.py


interface/PDEVS/pypdevs/src/DEVS.py → services/DEVS/pypdevs/src/DEVS.py


interface/PDEVS/pypdevs/src/devsexception.py → services/DEVS/pypdevs/src/devsexception.py


interface/PDEVS/pypdevs/src/infinity.py → services/DEVS/pypdevs/src/infinity.py


interface/PDEVS/pypdevs/src/mvk_widget.py → services/DEVS/pypdevs/src/mvk_widget.py


interface/PDEVS/pypdevs/src/scheduler.py → services/DEVS/pypdevs/src/scheduler.py


interface/PDEVS/pypdevs/src/simulator.py → services/DEVS/pypdevs/src/simulator.py


interface/PDEVS/pypdevs/src/simulator.xml → services/DEVS/pypdevs/src/simulator.xml


scripts/HUTN_service.py → services/HUTN/main.py


scripts/JSON_service.py → services/JSON/main.py


+ 1 - 1
wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Thu Nov  9 10:27:28 2017
+Date:   Thu Nov  9 10:44:33 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server