diff --git a/doc/ADEVS.rst b/doc/sphinx/ADEVS.rst similarity index 100% rename from doc/ADEVS.rst rename to doc/sphinx/ADEVS.rst diff --git a/doc/ADEVS_int.rst b/doc/sphinx/ADEVS_int.rst similarity index 100% rename from doc/ADEVS_int.rst rename to doc/sphinx/ADEVS_int.rst diff --git a/doc/BaseDEVS_int.rst b/doc/sphinx/BaseDEVS_int.rst similarity index 100% rename from doc/BaseDEVS_int.rst rename to doc/sphinx/BaseDEVS_int.rst diff --git a/doc/CDEVS.rst b/doc/sphinx/CDEVS.rst similarity index 100% rename from doc/CDEVS.rst rename to doc/sphinx/CDEVS.rst diff --git a/doc/CDEVS_int.rst b/doc/sphinx/CDEVS_int.rst similarity index 100% rename from doc/CDEVS_int.rst rename to doc/sphinx/CDEVS_int.rst diff --git a/doc/DEVS.rst b/doc/sphinx/DEVS.rst similarity index 100% rename from doc/DEVS.rst rename to doc/sphinx/DEVS.rst diff --git a/doc/DEVS_int.rst b/doc/sphinx/DEVS_int.rst similarity index 100% rename from doc/DEVS_int.rst rename to doc/sphinx/DEVS_int.rst diff --git a/doc/Makefile b/doc/sphinx/Makefile similarity index 100% rename from doc/Makefile rename to doc/sphinx/Makefile diff --git a/doc/RootDEVS_int.rst b/doc/sphinx/RootDEVS_int.rst similarity index 100% rename from doc/RootDEVS_int.rst rename to doc/sphinx/RootDEVS_int.rst diff --git a/doc/activity.png b/doc/sphinx/activity.png similarity index 100% rename from doc/activity.png rename to doc/sphinx/activity.png diff --git a/doc/activity.rst b/doc/sphinx/activity.rst similarity index 100% rename from doc/activity.rst rename to doc/sphinx/activity.rst diff --git a/doc/activity_relocation.rst b/doc/sphinx/activity_relocation.rst similarity index 100% rename from doc/activity_relocation.rst rename to doc/sphinx/activity_relocation.rst diff --git a/doc/activityprediction.rst b/doc/sphinx/activityprediction.rst similarity index 100% rename from doc/activityprediction.rst rename to doc/sphinx/activityprediction.rst diff --git a/doc/activitytracking.rst b/doc/sphinx/activitytracking.rst similarity index 100% rename from doc/activitytracking.rst rename to doc/sphinx/activitytracking.rst diff --git a/doc/activityvisualisation_int.rst b/doc/sphinx/activityvisualisation_int.rst similarity index 100% rename from doc/activityvisualisation_int.rst rename to doc/sphinx/activityvisualisation_int.rst diff --git a/doc/addAllDocs.sh b/doc/sphinx/addAllDocs.sh similarity index 100% rename from doc/addAllDocs.sh rename to doc/sphinx/addAllDocs.sh diff --git a/doc/advanced.rst b/doc/sphinx/advanced.rst similarity index 100% rename from doc/advanced.rst rename to doc/sphinx/advanced.rst diff --git a/doc/allocators_int.rst b/doc/sphinx/allocators_int.rst similarity index 100% rename from doc/allocators_int.rst rename to doc/sphinx/allocators_int.rst diff --git a/doc/asynchronouscombogenerator_int.rst b/doc/sphinx/asynchronouscombogenerator_int.rst similarity index 100% rename from doc/asynchronouscombogenerator_int.rst rename to doc/sphinx/asynchronouscombogenerator_int.rst diff --git a/doc/autoallocator_int.rst b/doc/sphinx/autoallocator_int.rst similarity index 100% rename from doc/autoallocator_int.rst rename to doc/sphinx/autoallocator_int.rst diff --git a/doc/base_dsdevs.py b/doc/sphinx/base_dsdevs.py similarity index 100% rename from doc/base_dsdevs.py rename to doc/sphinx/base_dsdevs.py diff --git a/doc/basesimulator_int.rst b/doc/sphinx/basesimulator_int.rst similarity index 100% rename from doc/basesimulator_int.rst rename to doc/sphinx/basesimulator_int.rst diff --git a/doc/basicboundaryrelocator_int.rst b/doc/sphinx/basicboundaryrelocator_int.rst similarity index 100% rename from doc/basicboundaryrelocator_int.rst rename to doc/sphinx/basicboundaryrelocator_int.rst diff --git a/doc/boundaryrelocator_int.rst b/doc/sphinx/boundaryrelocator_int.rst similarity index 100% rename from doc/boundaryrelocator_int.rst rename to doc/sphinx/boundaryrelocator_int.rst diff --git a/doc/celldevs.gif b/doc/sphinx/celldevs.gif similarity index 100% rename from doc/celldevs.gif rename to doc/sphinx/celldevs.gif diff --git a/doc/celldevs.png b/doc/sphinx/celldevs.png similarity index 100% rename from doc/celldevs.png rename to doc/sphinx/celldevs.png diff --git a/doc/celltracing.rst b/doc/sphinx/celltracing.rst similarity index 100% rename from doc/celltracing.rst rename to doc/sphinx/celltracing.rst diff --git a/doc/changelog.rst b/doc/sphinx/changelog.rst similarity index 100% rename from doc/changelog.rst rename to doc/sphinx/changelog.rst diff --git a/doc/checkpoint.rst b/doc/sphinx/checkpoint.rst similarity index 100% rename from doc/checkpoint.rst rename to doc/sphinx/checkpoint.rst diff --git a/doc/classicdevswrapper_int.rst b/doc/sphinx/classicdevswrapper_int.rst similarity index 100% rename from doc/classicdevswrapper_int.rst rename to doc/sphinx/classicdevswrapper_int.rst diff --git a/doc/colors_int.rst b/doc/sphinx/colors_int.rst similarity index 100% rename from doc/colors_int.rst rename to doc/sphinx/colors_int.rst diff --git a/doc/conf.py b/doc/sphinx/conf.py similarity index 100% rename from doc/conf.py rename to doc/sphinx/conf.py diff --git a/doc/continuing.rst b/doc/sphinx/continuing.rst similarity index 100% rename from doc/continuing.rst rename to doc/sphinx/continuing.rst diff --git a/doc/controller_int.rst b/doc/sphinx/controller_int.rst similarity index 100% rename from doc/controller_int.rst rename to doc/sphinx/controller_int.rst diff --git a/doc/customactivitytracking.rst b/doc/sphinx/customactivitytracking.rst similarity index 100% rename from doc/customactivitytracking.rst rename to doc/sphinx/customactivitytracking.rst diff --git a/doc/customscheduler.rst b/doc/sphinx/customscheduler.rst similarity index 100% rename from doc/customscheduler.rst rename to doc/sphinx/customscheduler.rst diff --git a/doc/distributedtermination.rst b/doc/sphinx/distributedtermination.rst similarity index 100% rename from doc/distributedtermination.rst rename to doc/sphinx/distributedtermination.rst diff --git a/doc/distribution.rst b/doc/sphinx/distribution.rst similarity index 100% rename from doc/distribution.rst rename to doc/sphinx/distribution.rst diff --git a/doc/distribution_local_model.png b/doc/sphinx/distribution_local_model.png similarity index 100% rename from doc/distribution_local_model.png rename to doc/sphinx/distribution_local_model.png diff --git a/doc/dynamicallocator.rst b/doc/sphinx/dynamicallocator.rst similarity index 100% rename from doc/dynamicallocator.rst rename to doc/sphinx/dynamicallocator.rst diff --git a/doc/dynamicstructure.rst b/doc/sphinx/dynamicstructure.rst similarity index 100% rename from doc/dynamicstructure.rst rename to doc/sphinx/dynamicstructure.rst diff --git a/doc/elapsed_time.rst b/doc/sphinx/elapsed_time.rst similarity index 100% rename from doc/elapsed_time.rst rename to doc/sphinx/elapsed_time.rst diff --git a/doc/example_notebook.ipynb b/doc/sphinx/example_notebook.ipynb similarity index 100% rename from doc/example_notebook.ipynb rename to doc/sphinx/example_notebook.ipynb diff --git a/doc/examples.rst b/doc/sphinx/examples.rst similarity index 100% rename from doc/examples.rst rename to doc/sphinx/examples.rst diff --git a/doc/examples_classic.rst b/doc/sphinx/examples_classic.rst similarity index 100% rename from doc/examples_classic.rst rename to doc/sphinx/examples_classic.rst diff --git a/doc/examples_ds.rst b/doc/sphinx/examples_ds.rst similarity index 100% rename from doc/examples_ds.rst rename to doc/sphinx/examples_ds.rst diff --git a/doc/experiment_fast.py b/doc/sphinx/experiment_fast.py similarity index 100% rename from doc/experiment_fast.py rename to doc/sphinx/experiment_fast.py diff --git a/doc/experiment_loop.py b/doc/sphinx/experiment_loop.py similarity index 100% rename from doc/experiment_loop.py rename to doc/sphinx/experiment_loop.py diff --git a/doc/experiment_threads.py b/doc/sphinx/experiment_threads.py similarity index 100% rename from doc/experiment_threads.py rename to doc/sphinx/experiment_threads.py diff --git a/doc/experiment_tk.py b/doc/sphinx/experiment_tk.py similarity index 100% rename from doc/experiment_tk.py rename to doc/sphinx/experiment_tk.py diff --git a/doc/greedyallocator_int.rst b/doc/sphinx/greedyallocator_int.rst similarity index 100% rename from doc/greedyallocator_int.rst rename to doc/sphinx/greedyallocator_int.rst diff --git a/doc/howto.rst b/doc/sphinx/howto.rst similarity index 100% rename from doc/howto.rst rename to doc/sphinx/howto.rst diff --git a/doc/index.rst b/doc/sphinx/index.rst similarity index 100% rename from doc/index.rst rename to doc/sphinx/index.rst diff --git a/doc/infinity.rst b/doc/sphinx/infinity.rst similarity index 100% rename from doc/infinity.rst rename to doc/sphinx/infinity.rst diff --git a/doc/injection.py b/doc/sphinx/injection.py similarity index 100% rename from doc/injection.py rename to doc/sphinx/injection.py diff --git a/doc/install_mpi4py.sh b/doc/sphinx/install_mpi4py.sh old mode 100755 new mode 100644 similarity index 100% rename from doc/install_mpi4py.sh rename to doc/sphinx/install_mpi4py.sh diff --git a/doc/installation.rst b/doc/sphinx/installation.rst similarity index 100% rename from doc/installation.rst rename to doc/sphinx/installation.rst diff --git a/doc/interface.rst b/doc/sphinx/interface.rst similarity index 100% rename from doc/interface.rst rename to doc/sphinx/interface.rst diff --git a/doc/internal.rst b/doc/sphinx/internal.rst similarity index 100% rename from doc/internal.rst rename to doc/sphinx/internal.rst diff --git a/doc/listener.rst b/doc/sphinx/listener.rst similarity index 100% rename from doc/listener.rst rename to doc/sphinx/listener.rst diff --git a/doc/location.png b/doc/sphinx/location.png similarity index 100% rename from doc/location.png rename to doc/sphinx/location.png diff --git a/doc/location.rst b/doc/sphinx/location.rst similarity index 100% rename from doc/location.rst rename to doc/sphinx/location.rst diff --git a/doc/location_normal.png b/doc/sphinx/location_normal.png similarity index 100% rename from doc/location_normal.png rename to doc/sphinx/location_normal.png diff --git a/doc/locationscheduler.rst b/doc/sphinx/locationscheduler.rst similarity index 100% rename from doc/locationscheduler.rst rename to doc/sphinx/locationscheduler.rst diff --git a/doc/logger_int.rst b/doc/sphinx/logger_int.rst similarity index 100% rename from doc/logger_int.rst rename to doc/sphinx/logger_int.rst diff --git a/doc/manualrelocator_int.rst b/doc/sphinx/manualrelocator_int.rst similarity index 100% rename from doc/manualrelocator_int.rst rename to doc/sphinx/manualrelocator_int.rst diff --git a/doc/memoization.rst b/doc/sphinx/memoization.rst similarity index 100% rename from doc/memoization.rst rename to doc/sphinx/memoization.rst diff --git a/doc/message_int.rst b/doc/sphinx/message_int.rst similarity index 100% rename from doc/message_int.rst rename to doc/sphinx/message_int.rst diff --git a/doc/messagescheduler_int.rst b/doc/sphinx/messagescheduler_int.rst similarity index 100% rename from doc/messagescheduler_int.rst rename to doc/sphinx/messagescheduler_int.rst diff --git a/doc/middleware_int.rst b/doc/sphinx/middleware_int.rst similarity index 100% rename from doc/middleware_int.rst rename to doc/sphinx/middleware_int.rst diff --git a/doc/minimal.rst b/doc/sphinx/minimal.rst similarity index 100% rename from doc/minimal.rst rename to doc/sphinx/minimal.rst diff --git a/doc/minimal_int.rst b/doc/sphinx/minimal_int.rst similarity index 100% rename from doc/minimal_int.rst rename to doc/sphinx/minimal_int.rst diff --git a/doc/model.png b/doc/sphinx/model.png similarity index 100% rename from doc/model.png rename to doc/sphinx/model.png diff --git a/doc/mpiredirect_int.rst b/doc/sphinx/mpiredirect_int.rst similarity index 100% rename from doc/mpiredirect_int.rst rename to doc/sphinx/mpiredirect_int.rst diff --git a/doc/multisim.rst b/doc/sphinx/multisim.rst similarity index 100% rename from doc/multisim.rst rename to doc/sphinx/multisim.rst diff --git a/doc/nesting.rst b/doc/sphinx/nesting.rst similarity index 100% rename from doc/nesting.rst rename to doc/sphinx/nesting.rst diff --git a/doc/performance.rst b/doc/sphinx/performance.rst similarity index 100% rename from doc/performance.rst rename to doc/sphinx/performance.rst diff --git a/doc/problems.rst b/doc/sphinx/problems.rst similarity index 100% rename from doc/problems.rst rename to doc/sphinx/problems.rst diff --git a/doc/queue.svg b/doc/sphinx/queue.svg similarity index 100% rename from doc/queue.svg rename to doc/sphinx/queue.svg diff --git a/doc/queue_example.py b/doc/sphinx/queue_example.py similarity index 100% rename from doc/queue_example.py rename to doc/sphinx/queue_example.py diff --git a/doc/queue_example_classic.py b/doc/sphinx/queue_example_classic.py similarity index 100% rename from doc/queue_example_classic.py rename to doc/sphinx/queue_example_classic.py diff --git a/doc/queueing.rst b/doc/sphinx/queueing.rst similarity index 100% rename from doc/queueing.rst rename to doc/sphinx/queueing.rst diff --git a/doc/queueing_boxplot.svg b/doc/sphinx/queueing_boxplot.svg similarity index 100% rename from doc/queueing_boxplot.svg rename to doc/sphinx/queueing_boxplot.svg diff --git a/doc/queueing_evolution.svg b/doc/sphinx/queueing_evolution.svg similarity index 100% rename from doc/queueing_evolution.svg rename to doc/sphinx/queueing_evolution.svg diff --git a/doc/random.rst b/doc/sphinx/random.rst similarity index 100% rename from doc/random.rst rename to doc/sphinx/random.rst diff --git a/doc/randomgenerator.rst b/doc/sphinx/randomgenerator.rst similarity index 100% rename from doc/randomgenerator.rst rename to doc/sphinx/randomgenerator.rst diff --git a/doc/randomgenerator_int.rst b/doc/sphinx/randomgenerator_int.rst similarity index 100% rename from doc/randomgenerator_int.rst rename to doc/sphinx/randomgenerator_int.rst diff --git a/doc/realtime.rst b/doc/sphinx/realtime.rst similarity index 100% rename from doc/realtime.rst rename to doc/sphinx/realtime.rst diff --git a/doc/reinitialisation.rst b/doc/sphinx/reinitialisation.rst similarity index 100% rename from doc/reinitialisation.rst rename to doc/sphinx/reinitialisation.rst diff --git a/doc/relocation.rst b/doc/sphinx/relocation.rst similarity index 100% rename from doc/relocation.rst rename to doc/sphinx/relocation.rst diff --git a/doc/relocators_int.rst b/doc/sphinx/relocators_int.rst similarity index 100% rename from doc/relocators_int.rst rename to doc/sphinx/relocators_int.rst diff --git a/doc/schedulerAH_int.rst b/doc/sphinx/schedulerAH_int.rst similarity index 100% rename from doc/schedulerAH_int.rst rename to doc/sphinx/schedulerAH_int.rst diff --git a/doc/schedulerAuto_int.rst b/doc/sphinx/schedulerAuto_int.rst similarity index 100% rename from doc/schedulerAuto_int.rst rename to doc/sphinx/schedulerAuto_int.rst diff --git a/doc/schedulerDH_int.rst b/doc/sphinx/schedulerDH_int.rst similarity index 100% rename from doc/schedulerDH_int.rst rename to doc/sphinx/schedulerDH_int.rst diff --git a/doc/schedulerDT_int.rst b/doc/sphinx/schedulerDT_int.rst similarity index 100% rename from doc/schedulerDT_int.rst rename to doc/sphinx/schedulerDT_int.rst diff --git a/doc/schedulerHS_int.rst b/doc/sphinx/schedulerHS_int.rst similarity index 100% rename from doc/schedulerHS_int.rst rename to doc/sphinx/schedulerHS_int.rst diff --git a/doc/schedulerML_int.rst b/doc/sphinx/schedulerML_int.rst similarity index 100% rename from doc/schedulerML_int.rst rename to doc/sphinx/schedulerML_int.rst diff --git a/doc/schedulerNA_int.rst b/doc/sphinx/schedulerNA_int.rst similarity index 100% rename from doc/schedulerNA_int.rst rename to doc/sphinx/schedulerNA_int.rst diff --git a/doc/schedulerSL_int.rst b/doc/sphinx/schedulerSL_int.rst similarity index 100% rename from doc/schedulerSL_int.rst rename to doc/sphinx/schedulerSL_int.rst diff --git a/doc/schedulers.rst b/doc/sphinx/schedulers.rst similarity index 100% rename from doc/schedulers.rst rename to doc/sphinx/schedulers.rst diff --git a/doc/server.rst b/doc/sphinx/server.rst similarity index 100% rename from doc/server.rst rename to doc/sphinx/server.rst diff --git a/doc/server_int.rst b/doc/sphinx/server_int.rst similarity index 100% rename from doc/server_int.rst rename to doc/sphinx/server_int.rst diff --git a/doc/simconfig_int.rst b/doc/sphinx/simconfig_int.rst similarity index 100% rename from doc/simconfig_int.rst rename to doc/sphinx/simconfig_int.rst diff --git a/doc/simple_dsdevs.py b/doc/sphinx/simple_dsdevs.py similarity index 100% rename from doc/simple_dsdevs.py rename to doc/sphinx/simple_dsdevs.py diff --git a/doc/simulator.rst b/doc/sphinx/simulator.rst similarity index 100% rename from doc/simulator.rst rename to doc/sphinx/simulator.rst diff --git a/doc/simulator_int.rst b/doc/sphinx/simulator_int.rst similarity index 100% rename from doc/simulator_int.rst rename to doc/sphinx/simulator_int.rst diff --git a/doc/solver_int.rst b/doc/sphinx/solver_int.rst similarity index 100% rename from doc/solver_int.rst rename to doc/sphinx/solver_int.rst diff --git a/doc/state_dsdevs.py b/doc/sphinx/state_dsdevs.py similarity index 100% rename from doc/state_dsdevs.py rename to doc/sphinx/state_dsdevs.py diff --git a/doc/statesavers_int.rst b/doc/sphinx/statesavers_int.rst similarity index 100% rename from doc/statesavers_int.rst rename to doc/sphinx/statesavers_int.rst diff --git a/doc/staticallocator.rst b/doc/sphinx/staticallocator.rst similarity index 100% rename from doc/staticallocator.rst rename to doc/sphinx/staticallocator.rst diff --git a/doc/threading.rst b/doc/sphinx/threading.rst similarity index 100% rename from doc/threading.rst rename to doc/sphinx/threading.rst diff --git a/doc/threadingbackend_int.rst b/doc/sphinx/threadingbackend_int.rst similarity index 100% rename from doc/threadingbackend_int.rst rename to doc/sphinx/threadingbackend_int.rst diff --git a/doc/threadinggameloop_int.rst b/doc/sphinx/threadinggameloop_int.rst similarity index 100% rename from doc/threadinggameloop_int.rst rename to doc/sphinx/threadinggameloop_int.rst diff --git a/doc/threadingpython_int.rst b/doc/sphinx/threadingpython_int.rst similarity index 100% rename from doc/threadingpython_int.rst rename to doc/sphinx/threadingpython_int.rst diff --git a/doc/threadingtkinter_int.rst b/doc/sphinx/threadingtkinter_int.rst similarity index 100% rename from doc/threadingtkinter_int.rst rename to doc/sphinx/threadingtkinter_int.rst diff --git a/doc/threadpool_int.rst b/doc/sphinx/threadpool_int.rst similarity index 100% rename from doc/threadpool_int.rst rename to doc/sphinx/threadpool_int.rst diff --git a/doc/tracercell_int.rst b/doc/sphinx/tracercell_int.rst similarity index 100% rename from doc/tracercell_int.rst rename to doc/sphinx/tracercell_int.rst diff --git a/doc/tracers.rst b/doc/sphinx/tracers.rst similarity index 100% rename from doc/tracers.rst rename to doc/sphinx/tracers.rst diff --git a/doc/tracers_all.rst b/doc/sphinx/tracers_all.rst similarity index 100% rename from doc/tracers_all.rst rename to doc/sphinx/tracers_all.rst diff --git a/doc/tracers_int.rst b/doc/sphinx/tracers_int.rst similarity index 100% rename from doc/tracers_int.rst rename to doc/sphinx/tracers_int.rst diff --git a/doc/tracervcd_int.rst b/doc/sphinx/tracervcd_int.rst similarity index 100% rename from doc/tracervcd_int.rst rename to doc/sphinx/tracervcd_int.rst diff --git a/doc/tracerverbose_int.rst b/doc/sphinx/tracerverbose_int.rst similarity index 100% rename from doc/tracerverbose_int.rst rename to doc/sphinx/tracerverbose_int.rst diff --git a/doc/tracerxml_int.rst b/doc/sphinx/tracerxml_int.rst similarity index 100% rename from doc/tracerxml_int.rst rename to doc/sphinx/tracerxml_int.rst diff --git a/doc/trafficLightModel.py b/doc/sphinx/trafficLightModel.py similarity index 100% rename from doc/trafficLightModel.py rename to doc/sphinx/trafficLightModel.py diff --git a/doc/transferfunction.rst b/doc/sphinx/transferfunction.rst similarity index 100% rename from doc/transferfunction.rst rename to doc/sphinx/transferfunction.rst diff --git a/doc/upload.sh b/doc/sphinx/upload.sh old mode 100755 new mode 100644 similarity index 100% rename from doc/upload.sh rename to doc/sphinx/upload.sh diff --git a/doc/util_int.rst b/doc/sphinx/util_int.rst similarity index 100% rename from doc/util_int.rst rename to doc/sphinx/util_int.rst diff --git a/doc/visualisation.rst b/doc/sphinx/visualisation.rst similarity index 100% rename from doc/visualisation.rst rename to doc/sphinx/visualisation.rst diff --git a/src/pypdevs/simulator.py b/src/pypdevs/simulator.py index 3c5ea66..4c24c11 100644 --- a/src/pypdevs/simulator.py +++ b/src/pypdevs/simulator.py @@ -675,7 +675,7 @@ class Simulator(object): else: gvt = max(self.controller.getGVT(), 0) gvt_percentage = int(gvt / finishtime * 100) - gvt_length = min(barwidth, gvt_percentage * barwidth / 100) + gvt_length = int(min(barwidth, gvt_percentage * barwidth / 100)) for node in locations: if self.progress_finished: nodetime = float('inf') @@ -687,16 +687,16 @@ class Simulator(object): s += " |" percentage = int(nodetime / finishtime * 100) s += "#" * gvt_length - length = min(barwidth, percentage * barwidth / 100) - gvt_length + length = int(min(barwidth, percentage * barwidth / 100) - gvt_length) s += self.fillchar * length - s += " " * (barwidth - gvt_length - length) + s += " " * int(barwidth - gvt_length - length) if percentage == 100 and self.fillchar != "E": s += "|DONE" elif percentage == 100 and self.fillchar == "E": s += "|FAIL" else: s += "| %2d" % percentage + "%" - print(s) + print("\r" + s) if self.progress_finished: return @@ -705,6 +705,7 @@ class Simulator(object): The actual simulation part, this is identical for the 'start from scratch' and 'start from checkpoint' algorithm, thus it was split up """ locations = range(self.server.size) + thread = threading.Thread(target=self.showProgress, args=[locations]) try: ## Progress visualisation code if self.progress: @@ -717,8 +718,8 @@ class Simulator(object): # self.progress = False else: self.progress_finished = False - thread = threading.Thread(target=self.show_progress, - args=[locations]) + # thread = threading.Thread(target=self.show_progress, + # args=[locations]) if self.checkpoint_interval < 0: self.progress_event = threading.Event() thread.start() diff --git a/src/pypdevs/tracers/tracerVerbose.py b/src/pypdevs/tracers/tracerVerbose.py index dc23dc7..a945e2b 100644 --- a/src/pypdevs/tracers/tracerVerbose.py +++ b/src/pypdevs/tracers/tracerVerbose.py @@ -64,7 +64,7 @@ class TracerVerbose(BaseTracer): """ string = "" if time > self.prevtime: - string = ("\n__ Current Time: %10.2f " + "_"*42 + " \n\n") % (time[0]) + string = ("\n__ Current Time: %10.6f " + "_"*42 + " \n\n") % (time[0]) self.prevtime = time string += "%s\n" % text try: @@ -87,7 +87,7 @@ class TracerVerbose(BaseTracer): for msg in aDEVS.my_output.get(aDEVS.OPorts[I], []): text += "\t\t\t\t" + str(msg) + "\n" # Don't show the age - text += "\t\tNext scheduled internal transition at time %.2f\n" \ + text += "\t\tNext scheduled internal transition at time %.6f\n" \ % (aDEVS.time_next[0]) runTraceAtController(self.server, self.uid, @@ -114,7 +114,7 @@ class TracerVerbose(BaseTracer): for msg in aDEVS.my_output.get(aDEVS.OPorts[I], []): text += "\t\t\t\t" + str(msg) + "\n" # Don't show the age - text += "\t\tNext scheduled internal transition at time %.2f\n" \ + text += "\t\tNext scheduled internal transition at time %.6f\n" \ % (aDEVS.time_next[0]) runTraceAtController(self.server, self.uid, @@ -136,7 +136,7 @@ class TracerVerbose(BaseTracer): text += "\t\t\t\t" + str(msg) + "\n" text += "\t\tNew State: %s\n" % str(aDEVS.state) # Don't show the age - text += "\t\tNext scheduled internal transition at time %.2f\n" \ + text += "\t\tNext scheduled internal transition at time %.6f\n" \ % (aDEVS.time_next[0]) runTraceAtController(self.server, self.uid, @@ -154,7 +154,7 @@ class TracerVerbose(BaseTracer): text += "\tINITIAL CONDITIONS in model <%s>\n" % aDEVS.getModelFullName() text += "\t\tInitial State: %s\n" % str(aDEVS.state) # Don't show the age - text += "\t\tNext scheduled internal transition at time %.2f\n" \ + text += "\t\tNext scheduled internal transition at time %.6f\n" \ % (aDEVS.time_next[0]) runTraceAtController(self.server, self.uid,