Correct variables names

deep_expo_percentage.py

@@ -19,18 +19,19 @@ def calc_required_limit(koef, koef_factor):
 
 def calc_deep_exploration(resource_limit, percentage, koef_factor, max_limit):
     """Calculate deep expo for resource"""
-    initial_koef = calc_resource_factor(resource_limit, koef_factor)
-    new_koef = initial_koef * (percentage / 100 + 1)
+    initial_resource_factor = calc_resource_factor(resource_limit, koef_factor)
+    new_resource_factor = initial_resource_factor * (percentage / 100 + 1)
 
-    required_limit = calc_required_limit(new_koef, koef_factor)
-    print(required_limit)
-    if required_limit > max_limit:
-        required_limit = max_limit
+    new_limit = calc_required_limit(new_resource_factor, koef_factor)
+    if new_limit > max_limit:
+        new_limit = max_limit
+    new_resource_factor = calc_resource_factor(new_limit, koef_factor)
+    percentage = 100 / initial_resource_factor * new_resource_factor - 100
     print("{:5.2f} {:4.2f} {:4.2f} {:4.0f}".format(
         percentage,
-        initial_koef,
-        new_koef,
-        required_limit - resource_limit
+        initial_resource_factor,
+        new_resource_factor,
+        new_limit - resource_limit
     ))
 
 if __name__ == "__main__":
@@ -38,11 +39,10 @@ if __name__ == "__main__":
     print('Noord-Nederland')
     calc_deep_exploration(379, 0, 0.4, 637)
     print('Oost-Nederland')
-    calc_deep_exploration(359, 80, 0.4, 637)
+    calc_deep_exploration(359, 50, 0.4, 637)
     print('West-Nederland')
-    calc_deep_exploration(372, 25, 0.4, 637)
+    calc_deep_exploration(372, 20, 0.4, 637)
     print('Zuid-Nederland')
     calc_deep_exploration(366, 25, 0.4, 637)
     print('Amsterdam')
     calc_deep_exploration(418, 45, 0.4, 637)
-    calc_deep_exploration(439, 35, 0.4, 637)