소스 검색

Recompile log_output, which broke tests for some reason

Yentl Van Tendeloo 8 년 전
부모
커밋
15d75c8a29
2개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 5 5
      unit/log_output.py
  2. 1 1
      wrappers/modelverse_SCCD.py

+ 5 - 5
unit/log_output.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)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Thu Nov  9 14:10:11 2017
+Date:   Fri Nov 10 08:52:06 2017
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   Logging
 Model name:   Logging
@@ -95,11 +95,11 @@ class ObjectManager(ObjectManagerBase):
             raise Exception("Cannot instantiate class " + class_name)
             raise Exception("Cannot instantiate class " + class_name)
         return instance
         return instance
 
 
-class Controller(EventLoopControllerBase):
-    def __init__(self, log, event_loop_callbacks, finished_callback = None, behind_schedule_callback = None):
-        if finished_callback == None: finished_callback = None
+class Controller(ThreadsControllerBase):
+    def __init__(self, log, keep_running = None, behind_schedule_callback = None):
+        if keep_running == None: keep_running = True
         if behind_schedule_callback == None: behind_schedule_callback = None
         if behind_schedule_callback == None: behind_schedule_callback = None
-        EventLoopControllerBase.__init__(self, ObjectManager(self), event_loop_callbacks, finished_callback, behind_schedule_callback)
+        ThreadsControllerBase.__init__(self, ObjectManager(self), keep_running, behind_schedule_callback)
         self.addInputPort("inp")
         self.addInputPort("inp")
         self.addOutputPort("outp")
         self.addOutputPort("outp")
         self.object_manager.createInstance("Logging", [log])
         self.object_manager.createInstance("Logging", [log])

+ 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)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Fri Nov 10 08:46:06 2017
+Date:   Fri Nov 10 08:54:09 2017
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
 Model name:   MvK Server