Merge pull request #2779 from GET-R3AL/Application-Profile-Fix

Replace Damage Envelope graph with Application Profile graph

Author: DarkFenX

.gitignore

@@ -13,6 +13,9 @@
 #Pyfa file
 pyfaFits.html
 
+#Local EVE static data dump
+eve.db
+
 #Temporary files
 *.py__jb_tmp__
 

graphs/data/__init__.py

@@ -19,7 +19,7 @@
 
 
 from . import fitDamageStats
-from . import fitDamageEnvelope
+from . import fitApplicationProfile
 from . import fitEwarStats
 from . import fitRemoteReps
 from . import fitShieldRegen

graphs/data/fitDamageEnvelope/__init__.py …s/data/fitApplicationProfile/__init__.pygraphs/data/fitDamageEnvelope/__init__.py renamed to graphs/data/fitApplicationProfile/__init__.py graphs/data/fitDamageEnvelope/__init__.py renamed to graphs/data/fitApplicationProfile/__init__.py

@@ -17,7 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+from .graph import FitAmmoOptimalDpsGraph
 
-from .graph import FitDamageEnvelopeGraph
 
-FitDamageEnvelopeGraph.register()
+FitAmmoOptimalDpsGraph.register()

graphs/data/fitApplicationProfile/calc/__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/>.
+# =============================================================================
+
+# Import key functions for convenient access
+from .projected import (
+    buildProjectedCache,
+    getProjectedParamsAtDistance,
+)

graphs/data/fitApplicationProfile/calc/charges.py

@@ -0,0 +1,255 @@
+# =============================================================================
+# 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/>.
+# =============================================================================
+
+# =============================================================================
+# Constants
+# =============================================================================
+
+# Navy faction ammo prefixes (for S/M/L ammo)
+NAVY_PREFIXES = (
+    'Imperial Navy ',
+    'Republic Fleet ',
+    'Caldari Navy ',
+    'Federation Navy ',
+)
+
+# Capital (XL) "navy-tier" faction ammo prefixes
+# There is no empire Navy XL ammo, so pirate faction serves as the "navy" tier for capitals
+CAPITAL_NAVY_PREFIXES = (
+    'Sansha ',
+    'Arch Angel ',
+    'Shadow ',
+)
+
+
+# =============================================================================
+# Quality Tier Filtering
+# =============================================================================
+
+def filterChargesByQuality(charges, qualityTier):
+    """
+    Filter charges based on quality tier selection.
+
+    Args:
+        charges: List of charge items
+        qualityTier: 't1', 'navy', or 'all'
+
+    Returns:
+        Filtered list of charges
+
+    Tiers are cumulative (each tier includes everything below it):
+        - 't1': Tech I only (metaGroup 1)
+        - 'navy': t1 + Tech II (metaGroup 2) + Navy faction ammo (Imperial Navy,
+                  Republic Fleet, Caldari Navy, Federation Navy)
+                  For XL (capital) ammo: includes pirate faction (Sansha, Arch Angel, Shadow)
+        - 'all': Everything including high-tier faction (Blood, Dark Blood, True Sansha, etc.)
+
+    Charges with no meta group in the game data (metaGroupID is NULL - e.g. all
+    Baryon Exotic Plasma and every XL Triglavian charge) are treated as Tech I.
+    Otherwise they would be filtered out of every tier despite being basic ammo.
+    """
+    if qualityTier == 'all':
+        return charges
+
+    filtered = []
+    classifiable = False  # Did any charge have a meta group we could rank?
+    for charge in charges:
+        mg = charge.metaGroup
+        mgId = mg.ID if mg else None
+        if mgId is not None:
+            classifiable = True
+
+        # Tech I (metaGroup 1), or unclassified ammo (NULL metaGroup) treated as
+        # Tech I - always included in every tier.
+        if mgId == 1 or mgId is None:
+            filtered.append(charge)
+            continue
+
+        # 'navy' tier additionally includes Tech II and Navy faction ammo.
+        if qualityTier == 'navy':
+            # Tech II (metaGroup 2) - distinct ammo type like Conflagration, Void, etc.
+            if mgId == 2:
+                filtered.append(charge)
+                continue
+
+            # Navy faction ammo (metaGroup 4)
+            if mgId == 4:
+                # Check if it's XL (capital) ammo by name suffix
+                isCapital = charge.name.endswith(' XL')
+
+                if isCapital:
+                    # For capital ammo, use pirate faction prefixes as "navy" tier
+                    if any(charge.name.startswith(prefix) for prefix in CAPITAL_NAVY_PREFIXES):
+                        filtered.append(charge)
+                else:
+                    # For subcap ammo, use empire Navy prefixes
+                    if any(charge.name.startswith(prefix) for prefix in NAVY_PREFIXES):
+                        filtered.append(charge)
+
+    # Honor the user's tier selection even when it excludes every charge (the
+    # weapon simply has no ammo in this tier). Only fall back to the full list
+    # when no charge could be classified by meta group at all - in that case
+    # the tier system does not apply and returning nothing would wrongly hide
+    # the weapon.
+    if filtered or classifiable:
+        return filtered
+    return charges
+
+
+# =============================================================================
+# Charge Stats Extraction
+# =============================================================================
+
+def getChargeStats(charge):
+    """
+    Extract charge stats including damage values and multipliers.
+
+    Args:
+        charge: The charge item
+
+    Returns:
+        Dict with damage values and range/falloff/tracking multipliers
+    """
+    em = charge.getAttribute('emDamage') or 0
+    thermal = charge.getAttribute('thermalDamage') or 0
+    kinetic = charge.getAttribute('kineticDamage') or 0
+    explosive = charge.getAttribute('explosiveDamage') or 0
+
+    return {
+        'emDamage': em,
+        'thermalDamage': thermal,
+        'kineticDamage': kinetic,
+        'explosiveDamage': explosive,
+        'totalDamage': em + thermal + kinetic + explosive,
+        'rangeMultiplier': charge.getAttribute('weaponRangeMultiplier') or 1,
+        'falloffMultiplier': charge.getAttribute('fallofMultiplier') or 1,
+        'trackingMultiplier': charge.getAttribute('trackingSpeedMultiplier') or 1
+    }
+
+
+# =============================================================================
+# Resist Application
+# =============================================================================
+
+def applyResists(chargeStats, tgtResists):
+    """
+    Apply target resists to charge stats.
+
+    Args:
+        chargeStats: Dict from getChargeStats
+        tgtResists: Tuple of (em, therm, kin, explo) resist values (0-1)
+
+    Returns:
+        New dict with resisted damage values
+    """
+    if not tgtResists:
+        return chargeStats
+
+    emRes, thermRes, kinRes, exploRes = tgtResists
+
+    em = chargeStats['emDamage'] * (1 - emRes)
+    thermal = chargeStats['thermalDamage'] * (1 - thermRes)
+    kinetic = chargeStats['kineticDamage'] * (1 - kinRes)
+    explosive = chargeStats['explosiveDamage'] * (1 - exploRes)
+
+    result = chargeStats.copy()
+    result.update({
+        'emDamage': em,
+        'thermalDamage': thermal,
+        'kineticDamage': kinetic,
+        'explosiveDamage': explosive,
+        'totalDamage': em + thermal + kinetic + explosive
+    })
+    return result
+
+
+# =============================================================================
+# Charge Data Precomputation
+# =============================================================================
+
+def precomputeChargeData(turretBase, charges, skillMult=1.0, tgtResists=None):
+    """
+    Pre-compute constant values for each charge.
+
+    This computes effective stats (turret base * charge multipliers) and
+    raw volley for each charge, which can then be used for fast lookups.
+
+    Args:
+        turretBase: Base turret stats dict from getTurretBaseStats
+        charges: List of charge items
+        skillMult: Skill damage multiplier from getSkillMultiplier
+        tgtResists: Target resists tuple or None
+
+    Returns:
+        List of dicts with: name, raw_volley, effective_optimal,
+        effective_falloff, effective_tracking
+
+    Note: We do NOT store raw_dps - it's derived from raw_volley / cycle_time
+    when needed at the mixin level.
+    """
+    chargeData = []
+
+    for charge in charges:
+        stats = getChargeStats(charge)
+
+        # Apply resists early for efficiency
+        if tgtResists:
+            stats = applyResists(stats, tgtResists)
+
+        # Compute effective turret stats with charge modifiers
+        effectiveOptimal = turretBase['optimal'] * stats['rangeMultiplier']
+        effectiveFalloff = turretBase['falloff'] * stats['falloffMultiplier']
+        effectiveTracking = turretBase['tracking'] * stats['trackingMultiplier']
+
+        # Compute raw volley (unmodified by range/tracking)
+        rawVolley = stats['totalDamage'] * skillMult * turretBase['damageMultiplier']
+
+        chargeData.append({
+            'name': charge.name,
+            'raw_volley': rawVolley,
+            'effective_optimal': effectiveOptimal,
+            'effective_falloff': effectiveFalloff,
+            'effective_tracking': effectiveTracking
+        })
+
+    return chargeData
+
+
+def getLongestRangeMultiplier(charges):
+    """
+    Get the maximum range multiplier from a list of charges.
+
+    Used to calculate the max effective range of a turret for cache sizing.
+
+    Args:
+        charges: List of charge items
+
+    Returns:
+        The highest rangeMultiplier value among all charges
+    """
+    if not charges:
+        return 1.0
+
+    maxRangeMult = 1.0
+    for charge in charges:
+        rangeMult = charge.getAttribute('weaponRangeMultiplier') or 1.0
+        if rangeMult > maxRangeMult:
+            maxRangeMult = rangeMult
+
+    return maxRangeMult