Quellcode durchsuchen

Subtle bugfixes cfr. Py2 to Py3

rparedis vor 1 Jahr
Ursprung
Commit
bf8ef00b05

+ 1 - 1
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):
     """

+ 3 - 3
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
 

+ 1 - 1
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):
         """