dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Replace reduce with sum

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-09 00:29:09 +03:00
parent ac7b6d9ecd
commit 676b09720a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eos/capSim.py
View File

@@ -92,14 +92,17 @@ class CapSimulator:
# Loop over grouped modules, configure staggering and push to the simulation state # Loop over grouped modules, configure staggering and push to the simulation state
for (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector), amount in mods.items(): for (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector), amount in mods.items():
if self.stagger and not disableStagger: if self.stagger and not disableStagger:
# Stagger all mods if they do not need to be reloaded
if clipSize == 0: if clipSize == 0:
duration = int(duration / amount) duration = int(duration / amount)
# Stagger mods after first
else: else:
stagger_amount = (duration * clipSize + reloadTime) / (amount * clipSize) stagger_amount = (duration * clipSize + reloadTime) / (amount * clipSize)
for i in range(1, amount): for i in range(1, amount):
heapq.heappush( heapq.heappush(
self.state, self.state,
[i * stagger_amount, duration, capNeed, 0, clipSize, reloadTime]) [i * stagger_amount, duration, capNeed, 0, clipSize, reloadTime])
# If mods are not staggered - just multiply cap use
else: else:
capNeed *= amount capNeed *= amount
@@ -195,7 +198,7 @@ class CapSimulator:
# calculate EVE's stability value # calculate EVE's stability value
try: try:
avgDrain = reduce(float.__add__, [x[2] / x[1] for x in self.state], 0.0) avgDrain = sum(x[2] / x[1] for x in self.state)
self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity) / capCapacity)) ** 2 self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity) / capCapacity)) ** 2
except ValueError: except ValueError:
self.cap_stable_eve = 0.0 self.cap_stable_eve = 0.0
@@ -205,7 +208,6 @@ class CapSimulator:
self.cap_stable_low = cap_lowest self.cap_stable_low = cap_lowest
self.cap_stable_high = cap_lowest_pre self.cap_stable_high = cap_lowest_pre
else: else:
self.cap_stable_low = \ self.cap_stable_low = self.cap_stable_high = 0.0
self.cap_stable_high = 0.0
self.runtime = time.time() - start self.runtime = time.time() - start