Fix warp graph

eos/graph/__init__.py

@@ -18,6 +18,7 @@
 # ===============================================================================
 
 
+import math
 from abc import ABCMeta, abstractmethod
 
 
@@ -33,20 +34,26 @@ class Graph(metaclass=ABCMeta):
     def getYForX(self, fit, extraData, x):
         raise NotImplementedError
 
-    def _xIter(self, xRange, xAmount):
-        rangeStart, rangeEnd = sorted(xRange)
+    def _xIter(self, fit, extraData, xRange, xAmount):
+        rangeLow, rangeHigh = sorted(xRange)
+        limitLow, limitHigh = self._getXLimits(fit, extraData)
+        rangeLow = max(limitLow, rangeLow)
+        rangeHigh = min(limitHigh, rangeHigh)
         # Amount is amount of ranges between points here, not amount of points
-        step = (rangeEnd - rangeStart) / xAmount
+        step = (rangeHigh - rangeLow) / xAmount
         if step == 0:
             yield xRange[0]
         else:
-            current = rangeStart
+            current = rangeLow
             # Take extra half step to make sure end of range is always included
             # despite any possible float errors
-            while current <= (rangeEnd + step / 2):
+            while current <= (rangeHigh + step / 2):
                 yield current
                 current += step
 
+    def _getXLimits(self, fit, extraData):
+        return -math.inf, math.inf
+
     def clearCache(self, key=None):
         if key is None:
             self.cache.clear()
@@ -59,7 +66,7 @@ class SmoothGraph(Graph, metaclass=ABCMeta):
     def getPlotPoints(self, fit, extraData, xRange, xAmount):
         xs = []
         ys = []
-        for x in self._xIter(xRange, xAmount):
+        for x in self._xIter(fit, extraData, xRange, xAmount):
             xs.append(x)
             ys.append(self.getYForX(fit, extraData, x))
         return xs, ys

eos/graph/fitWarpTimeVsDistance.py

@@ -1,35 +1,24 @@
 import math
-from logbook import Logger
 
-from eos.graph import Graph
-
-
-pyfalog = Logger(__name__)
+from eos.graph import SmoothGraph
 
 
 AU_METERS = 149597870700
 
 
-class FitWarpTimeDistanceGraph(Graph):
+class FitWarpTimeVsDistanceGraph(SmoothGraph):
 
-    defaults = {"distance": 0}
-
-    def __init__(self, fit, data=None):
-        Graph.__init__(self, fit, self.calcTime, data if data is not None else self.defaults)
-        self.fit = fit
-
-    def calcTime(self, data):
-        distance = data["distance"]
+    def getYForX(self, fit, extraData, distance):
         if distance == 0:
             return 0
-        maxWarpDistance = self.fit.maxWarpDistance
-        if distance > maxWarpDistance:
-            return None
-        maxSubwarpSpeed = self.fit.ship.getModifiedItemAttr('maxVelocity')
-        maxWarpSpeed = self.fit.warpSpeed
+        maxSubwarpSpeed = fit.ship.getModifiedItemAttr('maxVelocity')
+        maxWarpSpeed = fit.warpSpeed
         time = calculate_time_in_warp(maxWarpSpeed, maxSubwarpSpeed, distance * AU_METERS)
         return time
 
+    def _getXLimits(self, fit, extraData):
+        return 0, fit.maxWarpDistance
+
 
 # Taken from https://wiki.eveuniversity.org/Warp_time_calculation#Implementation
 # with minor modifications