From bf8ef00b05d48ecdb0caa0d1fd2a927491b46e44 Mon Sep 17 00:00:00 2001 From: rparedis Date: Thu, 23 May 2024 10:54:52 +0200 Subject: [PATCH] Subtle bugfixes cfr. Py2 to Py3 --- src/pypdevs/DEVS.py | 2 +- src/pypdevs/basesimulator.py | 6 +++--- src/pypdevs/realtime/asynchronousComboGenerator.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pypdevs/DEVS.py b/src/pypdevs/DEVS.py index 47cbd50..f07faf2 100644 --- a/src/pypdevs/DEVS.py +++ b/src/pypdevs/DEVS.py @@ -896,7 +896,7 @@ class ExternalWrapper(AtomicDEVS): def extTransition(self, inputs): # 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): """ diff --git a/src/pypdevs/basesimulator.py b/src/pypdevs/basesimulator.py index 66e03aa..a65ff50 100644 --- a/src/pypdevs/basesimulator.py +++ b/src/pypdevs/basesimulator.py @@ -1068,9 +1068,9 @@ class BaseSimulator(Solver): current_realtime_time = (time.time() - self.rt_zerotime) scaled_realtime_time = current_realtime_time / self.realtime_scale self.asynchronous_generator.checkInterrupt(scaled_realtime_time) - next_sim_time = min(self.model.time_next[0], - self.termination_time[0], - self.asynchronous_generator.getNextTime()) + next_sim_time = min(self.model.time_next[0], + self.termination_time[0], + self.asynchronous_generator.getNextTime()) # Scaled realtime next_sim_time *= self.realtime_scale diff --git a/src/pypdevs/realtime/asynchronousComboGenerator.py b/src/pypdevs/realtime/asynchronousComboGenerator.py index f82b5bf..4fb0246 100644 --- a/src/pypdevs/realtime/asynchronousComboGenerator.py +++ b/src/pypdevs/realtime/asynchronousComboGenerator.py @@ -73,7 +73,7 @@ class AsynchronousComboGenerator(object): raise DEVSException( "Inproperly formatted input in file: %s" % event) self.next_scheduled = float(event[0]) - self.file_event = event[1][:-1] + self.file_event = event[1].rstrip() def getNextTime(self): """