teaching/mosis24DEVS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Subtle bugfixes cfr. Py2 to Py3

Browse source
This commit is contained in:
rparedis 2024-05-23 10:54:52 +02:00
parent 68a247654d
commit bf8ef00b05
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pypdevs/DEVS.py
View file

@ -896,7 +896,7 @@ class ExternalWrapper(AtomicDEVS):
def extTransition(self, inputs): def extTransition(self, inputs):
# Fake object is created with a single fake port, so unpack that # Fake object is created with a single fake port, so unpack that
self.f(self.my_input.values()[0]) self.f(list(self.my_input.values())[0])
def directConnect(component_set, listeners): def directConnect(component_set, listeners):
""" """

6
src/pypdevs/basesimulator.py
View file

@ -1068,9 +1068,9 @@ class BaseSimulator(Solver):
current_realtime_time = (time.time() - self.rt_zerotime) current_realtime_time = (time.time() - self.rt_zerotime)
scaled_realtime_time = current_realtime_time / self.realtime_scale scaled_realtime_time = current_realtime_time / self.realtime_scale
self.asynchronous_generator.checkInterrupt(scaled_realtime_time) self.asynchronous_generator.checkInterrupt(scaled_realtime_time)
next_sim_time = min(self.model.time_next[0], next_sim_time = min(self.model.time_next[0],
self.termination_time[0], self.termination_time[0],
self.asynchronous_generator.getNextTime()) self.asynchronous_generator.getNextTime())
# Scaled realtime # Scaled realtime
next_sim_time *= self.realtime_scale next_sim_time *= self.realtime_scale

2
src/pypdevs/realtime/asynchronousComboGenerator.py
View file

@ -73,7 +73,7 @@ class AsynchronousComboGenerator(object):
raise DEVSException( raise DEVSException(
"Inproperly formatted input in file: %s" % event) "Inproperly formatted input in file: %s" % event)
self.next_scheduled = float(event[0]) self.next_scheduled = float(event[0])
self.file_event = event[1][:-1] self.file_event = event[1].rstrip()
def getNextTime(self): def getNextTime(self):
""" """