Changeset 922:fcbc41076194 for src

Timestamp:

04/27/19 12:07:59 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Using integer division where necessary (re #347).

Location:

src/mlx

Files:

• fsuipc.py (modified) (1 diff)
• pyuipc_sim.py (modified) (9 diffs)

src/mlx/fsuipc.py

@@ -1410 +1410 @@
 
         numNotchesM1 = len(self._flapsNotches) - 1
-        flapsIncrement = 16383 / numNotchesM1
+        flapsIncrement = 16383 // numNotchesM1
         flapsControl = data[self._monidx_flapsControl]
-        flapsIndex = flapsControl / flapsIncrement
+        flapsIndex = flapsControl // flapsIncrement
         if flapsIndex < numNotchesM1:
             if (flapsControl - (flapsIndex*flapsIncrement) >

src/mlx/pyuipc_sim.py

@@ -184 +184 @@
     def _readBCD(value):
         """Convert the given value into BCD format."""
-        bcd = (value/1000) % 10
+        bcd = (value//1000) % 10
         bcd <<= 4
-        bcd |= (value/100) % 10
+        bcd |= (value//100) % 10
         bcd <<= 4
-        bcd |= (value/10) % 10
+        bcd |= (value//10) % 10
         bcd <<= 4
         bcd |= value % 10
@@ -360 +360 @@
             return int(index * flapsIncrement +
                        (self.flapsControl-self.flapsNotches[index]) *
-                       flapsIncrement /
+                       flapsIncrement //
                        (self.flapsNotches[index+1] - self.flapsNotches[index]))
 
@@ -542 +542 @@
         elif offset>=0x1400 and offset<=0x1f40 and \
              ((offset-0x1400)%48)==0: # Payload
-            return self.payload[ (offset - 0x1400) / 48 ]
+            return self.payload[ (offset - 0x1400) // 48 ]
         elif offset==0x2000:       # Engine #1 N1
             return self.n1[self.ENGINE_1]
@@ -568 +568 @@
         elif offset>=0x3210 and offset<0x3210+Values.HOTKEY_SIZE*4:
             tableOffset = offset - 0x3210
-            hotkeyIndex = tableOffset / 4
+            hotkeyIndex = tableOffset // 4
             index = tableOffset % 4
             if type=="b" or type=="c":
@@ -602 +602 @@
             return self._getFlapsControl()
         elif offset==0x3bfa:       # Flaps increment
-            return 16383 / (len(self.flapsNotches)-1)
+            return 16383 // (len(self.flapsNotches)-1)
         elif offset==0x3bfc:       # ZFW
             return int(self.zfw * 256.0 * const.KGSTOLB)
@@ -758 +758 @@
         elif offset==0x0bd0:       # Spoilers
             self.spoilters = 0 if value==0 \
-                             else (value - 4800) / (16383 - 4800)
+                             else (value - 4800) // (16383 - 4800)
         elif offset==0x0bdc:       # Flaps control
             numNotchesM1 = len(self.flapsNotches) - 1
@@ -768 +768 @@
                 self.flapsControl = self.flapsNotches[index]
                 self.flapsControl += (value - index * flapsIncrement) * \
-                    (self.flapsNotches[index+1] - self.flapsNotches[index]) / \
+                    (self.flapsNotches[index+1] - self.flapsNotches[index]) // \
                     flapsIncrement
         elif offset==0x0be0 or offset==0x0be4:    # Flaps left and  right
@@ -816 +816 @@
         elif offset>=0x1400 and offset<=0x1f40 and \
              ((offset-0x1400)%48)==0: # Payload
-            self.payload[ (offset - 0x1400) / 48 ] = value
+            self.payload[ (offset - 0x1400) // 48 ] = value
         elif offset==0x2000:       # Engine #1 N1
             self.n1[self.ENGINE_1] = value
@@ -840 +840 @@
         elif offset>=0x3210 and offset<0x3210+Values.HOTKEY_SIZE*4:
             tableOffset = offset - 0x3210
-            hotkeyIndex = tableOffset / 4
+            hotkeyIndex = tableOffset // 4
             index = tableOffset % 4
             if type=="b" or type=="c":