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

Cache graph values on GUI graphs so they do not get recalculated when graph options are changed

Browse Source
This commit is contained in:
DarkPhoenix
2019-05-21 19:06:11 +03:00
parent a09a2a5f4b
commit 8fae275e5a
13 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eos/graph/__init__.py
View File

@@ -25,7 +25,7 @@ from abc import ABCMeta, abstractmethod
class Graph(metaclass=ABCMeta):
def __init__(self):
self.cache = {}
self._cache = {}
@abstractmethod
def getPlotPoints(self, fit, extraData, xRange, xAmount):
@@ -60,9 +60,9 @@ class Graph(metaclass=ABCMeta):
def clearCache(self, key=None):
if key is None:
self.cache.clear()
elif key in self.cache:
del self.cache[key]
self._cache.clear()
elif key in self._cache:
del self._cache[key]
class SmoothGraph(Graph, metaclass=ABCMeta):

8
eos/graph/fitDmgVsTime.py
View File

@@ -29,12 +29,12 @@ class FitDmgVsTimeGraph(Graph):
# We deliberately ignore xAmount here to build graph which will reflect
# all steps of building up the damage
minX, maxX = self._limitXRange(xRange, fit, extraData)
if fit.ID not in self.cache:
if fit.ID not in self._cache:
self.__generateCache(fit, maxX)
currentY = None
xs = []
ys = []
cache = self.cache[fit.ID]
cache = self._cache[fit.ID]
for time in sorted(cache):
prevY = currentY
currentX = time / 1000
@@ -74,7 +74,7 @@ class FitDmgVsTimeGraph(Graph):
def getYForX(self, fit, extraData, x):
time = x * 1000
cache = self.cache[fit.ID]
cache = self._cache[fit.ID]
closestTime = max((t for t in cache if t <= time), default=None)
if closestTime is None:
return 0
@@ -84,7 +84,7 @@ class FitDmgVsTimeGraph(Graph):
return 0, 1000
def __generateCache(self, fit, maxTime):
cache = self.cache[fit.ID] = {}
cache = self._cache[fit.ID] = {}
def addDmg(addedTime, addedDmg):
if addedDmg == 0:

8
eos/graph/fitDpsVsTime.py
View File

@@ -31,12 +31,12 @@ class FitDpsTimeGraph(Graph):
# We deliberately ignore xAmount here to build graph which will reflect
# all steps of building up the damage
minX, maxX = self._limitXRange(xRange, fit, extraData)
if fit.ID not in self.cache:
if fit.ID not in self._cache:
self.__generateCache(fit, maxX)
currentY = None
xs = []
ys = []
cache = self.cache[fit.ID]
cache = self._cache[fit.ID]
for time in sorted(cache):
prevY = currentY
currentX = time / 1000
@@ -76,7 +76,7 @@ class FitDpsTimeGraph(Graph):
def getYForX(self, fit, extraData, x):
time = x * 1000
cache = self.cache[fit.ID]
cache = self._cache[fit.ID]
closestTime = max((t for t in cache if t <= time), default=None)
if closestTime is None:
return 0
@@ -160,4 +160,4 @@ class FitDpsTimeGraph(Graph):
entries = (e for e in cache if e[0] <= time < e[1])
dps = sum(e[2] for e in entries)
finalCache[time] = dps
self.cache[fit.ID] = finalCache
self._cache[fit.ID] = finalCache

6
eos/graph/fitWarpTimeVsDistance.py
View File

@@ -16,10 +16,10 @@ class FitWarpTimeVsDistanceGraph(SmoothGraph):
def getYForX(self, fit, extraData, distance):
if distance == 0:
return 0
if fit.ID not in self.cache:
if fit.ID not in self._cache:
self.__generateCache(fit)
maxWarpSpeed = fit.warpSpeed
subwarpSpeed = self.cache[fit.ID]['cleanSubwarpSpeed']
subwarpSpeed = self._cache[fit.ID]['cleanSubwarpSpeed']
time = calculate_time_in_warp(maxWarpSpeed, subwarpSpeed, distance * AU_METERS)
return time
@@ -54,7 +54,7 @@ class FitWarpTimeVsDistanceGraph(SmoothGraph):
projFighterStates[fighter] = fighter.active
fighter.active = False
fit.calculateModifiedAttributes()
self.cache[fit.ID] = {'cleanSubwarpSpeed': fit.ship.getModifiedItemAttr('maxVelocity')}
self._cache[fit.ID] = {'cleanSubwarpSpeed': fit.ship.getModifiedItemAttr('maxVelocity')}
for projInfo, state in projFitStates.items():
projInfo.active = state
for mod, state in modStates.items():

1
gui/builtinGraphs/fitCapAmountVsTime.py
View File

@@ -29,6 +29,7 @@ class FitCapAmountVsTimeGraph(Graph):
name = 'Cap Amount vs Time'
def __init__(self):
super().__init__()
self.eosGraph = EosGraph()
@property

1
gui/builtinGraphs/fitCapRegenVsCapPerc.py
View File

@@ -29,6 +29,7 @@ class FitCapRegenVsCapPercGraph(Graph):
name = 'Cap Regen vs Cap Amount'
def __init__(self):
super().__init__()
self.eosGraph = EosGraph()
@property

1
gui/builtinGraphs/fitDmgVsTime.py
View File

@@ -30,6 +30,7 @@ class FitDmgVsTimeGraph(Graph):
name = 'Damage vs Time'
def __init__(self):
super().__init__()
self.eosGraphDmg = EosGraphDmg()
self.eosGraphDps = EosGraphDps()

1
gui/builtinGraphs/fitDpsVsRange.py
View File

@@ -29,6 +29,7 @@ class FitDpsVsRangeGraph(Graph):
name = 'DPS vs Range'
def __init__(self):
super().__init__()
self.eosGraph = EosGraph()
@property

1
gui/builtinGraphs/fitMobilityVsTime.py
View File

@@ -30,6 +30,7 @@ class FitMobilityVsTimeGraph(Graph):
name = 'Mobility vs Time'
def __init__(self):
super().__init__()
self.eosGraphSpeed = EosGraphSpeed()
self.eosGraphDistance = EosGraphDistance()

1
gui/builtinGraphs/fitShieldAmountVsTime.py
View File

@@ -30,6 +30,7 @@ class FitShieldAmountVsTimeGraph(Graph):
name = 'Shield Amount vs Time'
def __init__(self):
super().__init__()
self.eosGraph = EosGraph()
self.mainFrame = gui.mainFrame.MainFrame.getInstance()

1
gui/builtinGraphs/fitShieldRegenVsShieldPerc.py
View File

@@ -30,6 +30,7 @@ class FitShieldRegenVsShieldPercGraph(Graph):
name = 'Shield Regen vs Shield Amount'
def __init__(self):
super().__init__()
self.eosGraph = EosGraph()
self.mainFrame = gui.mainFrame.MainFrame.getInstance()

1
gui/builtinGraphs/fitWarpTimeVsDistance.py
View File

@@ -29,6 +29,7 @@ class FitWarpTimeVsDistanceGraph(Graph):
name = 'Warp Time vs Distance'
def __init__(self):
super().__init__()
self.eosGraph = EosGraph()
@property

25
gui/graph.py
View File

@@ -32,6 +32,9 @@ class Graph(metaclass=ABCMeta):
def register(cls):
Graph.views.append(cls)
def __init__(self):
self._cache = {}
@property
@abstractmethod
def name(self):
@@ -56,10 +59,16 @@ class Graph(metaclass=ABCMeta):
return False
def getPlotPoints(self, fit, extraData, xRange, xAmount, yType):
xRange = self.parseRange(xRange)
extraData = {k: float(v) if v else None for k, v in extraData.items()}
graph = getattr(self, self.yDefs[yType].eosGraph, None)
return graph.getPlotPoints(fit, extraData, xRange, xAmount)
try:
plotData = self._cache[fit.ID][yType]
except KeyError:
xRange = self.parseRange(xRange)
extraData = {k: float(v) if v else None for k, v in extraData.items()}
graph = getattr(self, self.yDefs[yType].eosGraph, None)
plotData = graph.getPlotPoints(fit, extraData, xRange, xAmount)
fitCache = self._cache.setdefault(fit.ID, {})
fitCache[yType] = plotData
return plotData
def parseRange(self, string):
m = re.match('\s*(?P<first>\d+(\.\d+)?)\s*(-\s*(?P<second>\d+(\.\d+)?))?', string)
@@ -72,9 +81,13 @@ class Graph(metaclass=ABCMeta):
high = max(first, second)
return (low, high)
def clearCache(self, *args, **kwargs):
def clearCache(self, key=None):
if key is None:
self._cache.clear()
elif key in self._cache:
del self._cache[key]
for yDef in self.yDefs.values():
getattr(self, yDef.eosGraph).clearCache(*args, **kwargs)
getattr(self, yDef.eosGraph).clearCache(key=key)
XDef = namedtuple('XDef', ('inputDefault', 'inputLabel', 'inputIconID', 'axisLabel'))