Add "starting cap" parameter to cap graph

graphs/data/fitCapacitor/__init__.py

@@ -0,0 +1,24 @@
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+
+from .graph import FitCapRegenGraph
+
+
+FitCapRegenGraph.register()

graphs/data/fitCapacitor/getter.py

@@ -0,0 +1,95 @@
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+
+import math
+
+from graphs.data.base import SmoothPointGetter
+
+
+class Time2CapAmountGetter(SmoothPointGetter):
+
+    def _getCommonData(self, miscParams, src, tgt):
+        return {
+            'maxCapAmount': src.item.ship.getModifiedItemAttr('capacitorCapacity'),
+            'capRegenTime': src.item.ship.getModifiedItemAttr('rechargeRate') / 1000}
+
+    def _calculatePoint(self, x, miscParams, src, tgt, commonData):
+        time = x
+        capAmount = calculateCapAmount(
+            maxCapAmount=commonData['maxCapAmount'],
+            capRegenTime=commonData['capRegenTime'],
+            capAmountT0=miscParams['capAmountT0'] or 0,
+            time=time)
+        return capAmount
+
+
+class Time2CapRegenGetter(SmoothPointGetter):
+
+    def _getCommonData(self, miscParams, src, tgt):
+        return {
+            'maxCapAmount': src.item.ship.getModifiedItemAttr('capacitorCapacity'),
+            'capRegenTime': src.item.ship.getModifiedItemAttr('rechargeRate') / 1000}
+
+    def _calculatePoint(self, x, miscParams, src, tgt, commonData):
+        time = x
+        capAmount = calculateCapAmount(
+            maxCapAmount=commonData['maxCapAmount'],
+            capRegenTime=commonData['capRegenTime'],
+            capAmountT0=miscParams['capAmountT0'] or 0,
+            time=time)
+        capRegen = calculateCapRegen(
+            maxCapAmount=commonData['maxCapAmount'],
+            capRegenTime=commonData['capRegenTime'],
+            currentCapAmount=capAmount)
+        return capRegen
+
+
+# Useless, but valid combination of x and y
+class CapAmount2CapAmountGetter(SmoothPointGetter):
+
+    def _calculatePoint(self, x, miscParams, src, tgt, commonData):
+        capAmount = x
+        return capAmount
+
+
+class CapAmount2CapRegenGetter(SmoothPointGetter):
+
+    def _getCommonData(self, miscParams, src, tgt):
+        return {
+            'maxCapAmount': src.item.ship.getModifiedItemAttr('capacitorCapacity'),
+            'capRegenTime': src.item.ship.getModifiedItemAttr('rechargeRate') / 1000}
+
+    def _calculatePoint(self, x, miscParams, src, tgt, commonData):
+        capAmount = x
+        capRegen = calculateCapRegen(
+            maxCapAmount=commonData['maxCapAmount'],
+            capRegenTime=commonData['capRegenTime'],
+            currentCapAmount=capAmount)
+        return capRegen
+
+
+def calculateCapAmount(maxCapAmount, capRegenTime, capAmountT0, time):
+    # https://wiki.eveuniversity.org/Capacitor#Capacitor_recharge_rate
+    return maxCapAmount * (1 + math.exp(5 * -time / capRegenTime) * (math.sqrt(capAmountT0 / maxCapAmount) - 1)) ** 2
+
+
+def calculateCapRegen(maxCapAmount, capRegenTime, currentCapAmount):
+    # https://wiki.eveuniversity.org/Capacitor#Capacitor_recharge_rate
+    return 10 * maxCapAmount / capRegenTime * (math.sqrt(currentCapAmount / maxCapAmount) - currentCapAmount / maxCapAmount)

graphs/data/fitCapacitor/graph.py

@@ -0,0 +1,59 @@
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+
+from graphs.data.base import FitGraph, Input, XDef, YDef
+from .getter import CapAmount2CapAmountGetter, CapAmount2CapRegenGetter, Time2CapAmountGetter, Time2CapRegenGetter
+
+
+class FitCapRegenGraph(FitGraph):
+
+    # UI stuff
+    internalName = 'capRegenGraph'
+    name = 'Capacitor Regeneration'
+    xDefs = [
+        XDef(handle='time', unit='s', label='Time', mainInput=('time', 's')),
+        XDef(handle='capAmount', unit='GJ', label='Cap amount', mainInput=('capAmount', '%')),
+        XDef(handle='capAmount', unit='%', label='Cap amount', mainInput=('capAmount', '%'))]
+    yDefs = [
+        YDef(handle='capAmount', unit='GJ', label='Cap amount'),
+        YDef(handle='capRegen', unit='GJ/s', label='Cap regen')]
+    inputs = [
+        Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=120, defaultRange=(0, 300), conditions=[
+            (('time', 's'), None)]),
+        Input(handle='capAmount', unit='%', label='Cap amount', iconID=1668, defaultValue=25, defaultRange=(0, 100), conditions=[
+            (('capAmount', 'GJ'), None),
+            (('capAmount', '%'), None)]),
+        Input(handle='capAmountT0', unit='%', label='Starting cap amount', iconID=1668, defaultValue=0, defaultRange=(0, 100), conditions=[
+            (('time', 's'), None)])]
+    srcExtraCols = ('CapAmount', 'CapTime')
+
+    # Calculation stuff
+    _normalizers = {
+        ('capAmount', '%'): lambda v, src, tgt: v / 100 * src.item.ship.getModifiedItemAttr('capacitorCapacity'),
+        ('capAmountT0', '%'): lambda v, src, tgt: None if v is None else v / 100 * src.item.ship.getModifiedItemAttr('capacitorCapacity')}
+    _limiters = {
+        'capAmount': lambda src, tgt: (0, src.item.ship.getModifiedItemAttr('capacitorCapacity')),
+        'capAmountT0': lambda src, tgt: (0, src.item.ship.getModifiedItemAttr('capacitorCapacity'))}
+    _getters = {
+        ('time', 'capAmount'): Time2CapAmountGetter,
+        ('time', 'capRegen'): Time2CapRegenGetter,
+        ('capAmount', 'capAmount'): CapAmount2CapAmountGetter,
+        ('capAmount', 'capRegen'): CapAmount2CapRegenGetter}
+    _denormalizers = {('capAmount', '%'): lambda v, src, tgt: v * 100 / src.item.ship.getModifiedItemAttr('capacitorCapacity')}