[Lohnrechner-commits] r68 - trunk

[scm-commit@wald.intevation.org]

Author: wilde
Date: 2007-01-25 12:20:34 +0100 (Thu, 25 Jan 2007)
New Revision: 68

Modified:
   trunk/LST2007.py
Log:
Minor code cleanup.


Modified: trunk/LST2007.py
===================================================================
--- trunk/LST2007.py	2007-01-25 11:13:08 UTC (rev 67)
+++ trunk/LST2007.py	2007-01-25 11:20:34 UTC (rev 68)
@@ -430,9 +430,9 @@
                 self._ANP = 102
         if (self.STKL < 6) and (self._ZRE4 > self._ZVBEZ):
             if (self._ZRE4 - self._ZVBEZ) < 920:
-                self._ANP = self._ANP + self._ZRE4 - self._ZVBEZ
+                self._ANP += self._ZRE4 - self._ZVBEZ
             else:
-                self._ANP = self._ANP + 920
+                self._ANP += 920
         self._KZTAB = 1
         if self.STKL == 1:
             self._SAP = 36
@@ -503,9 +503,9 @@
 
     def _UMVSP(self):
         if self._KENNZ == 1:
-            self._VSPVOR = self._VSPVOR - self._ZRE4VP1 * 0.16
+            self._VSPVOR -= self._ZRE4VP1 * 0.16
         else:
-            self._VSPVOR = self._VSPVOR - self._ZRE4VP * 0.16
+            self._VSPVOR -= self._ZRE4VP * 0.16
         if self._VSPVOR < 0:
             self._VSPVOR = 0.0
         if self._VSPO > self._VSPVOR:
@@ -529,7 +529,7 @@
             self._ZX = 25812
             self._UP5_6()
             if self._ZZX > 200000:
-                self._ST = self._ST + (200000 - 25812) * 0.42
+                self._ST += (200000 - 25812) * 0.42
                 self._ST = floor(self._ST + (self._ZZX - 200000) * 0.45)
             else:
                 self._ST = floor(self._ST + (self._ZZX - 25812) * 0.42)
@@ -635,7 +635,7 @@
             self._LST1 = self._ST * 100
             self.VBEZ = self.JVBEZ + self.VBS
             self.RE4 = self.JRE4 + self.SONSTB
-            self.VBEZS = self.VBEZS + self.STERBE
+            self.VBEZS += self.STERBE
             self._MRE4LZZ()
             self._MRE4LZZ2()
             self._MLSTJAHR()
@@ -682,9 +682,9 @@
             self._MRE4LZZ2()
             self._MLSTJAHR()
             self._LST1 = self._ST * 100
-            self.VMT = self.VMT + self.VKAPA
-            self.VBEZS = self.VBEZS + self.VKAPA
-            self.VBEZ = self.VBEZ + self.VKAPA
+            self.VMT += self.VKAPA
+            self.VBEZS += self.VKAPA
+            self.VBEZ += self.VKAPA
             self.RE4 = self.JRE4 + self.SONSTB + self.VMT
             self._MRE4LZZ()
             self._MRE4LZZ2()
@@ -692,12 +692,12 @@
             self._ZRE4VP1 = self._ZRE4VP
             self._MLSTJAHR()
             self._LST3 = self._ST * 100
-            self.VBEZ = self.VBEZ - self.VKAPA
-            self.VBEZS = self.VBEZS - self.VKAPA
+            self.VBEZ -= self.VKAPA
+            self.VBEZS -= self.VKAPA
             self.RE4 = self.JRE4 + self.SONSTB
             self._MRE4LZZ()
             if (self.RE4 - self.JFREIB + self.JHINZU) < 0:
-                self.RE4 = self.RE4 - self.JFREIB + self.JHINZU
+                self.RE4 -= self.JFREIB + self.JHINZU
                 self.JFREIB = 0
                 self.JHINZU = 0
                 self.RE4 = (self.RE4 + self.VMT) / 5
@@ -706,7 +706,7 @@
                 self._LST2 = self._ST * 100
                 self.STV = self._LST2 * 5
             else:
-                self.RE4 = self.RE4 + self.VMT / 5
+                self.RE4 += self.VMT / 5
                 self._MRE4LZZ2()
                 self._MLSTJAHR()
                 self._LST2 = self._ST * 100