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

Exclude more attributes from consideration, and do some overrides to not have incorrect optimizations

Browse Source
This commit is contained in:
DarkPhoenix
2019-02-17 12:26:44 +03:00
parent d507927ba3
commit c8eef489da
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/jsonToSql.py
View File

@@ -189,24 +189,29 @@ def main(db, json_path):
""" """
if len(attrs1) == 0 and len(attrs2) == 0: if len(attrs1) == 0 and len(attrs2) == 0:
return 0 return 0
if set(attrs1) != set(attrs2): if (
set(attrs1) != set(attrs2) or any(
attrs1[aid] != attrs2[aid] and
attrHig[aid] == 2 for aid in attrs1)
):
return 1 return 1
if all(attrs1[aid] == attrs2[aid] for aid in attrs1): if all(attrs1[aid] == attrs2[aid] for aid in attrs1):
return 2 return 2
if all( if all(
(attrs1[aid] >= attrs2[aid] and attrHig[aid]) or (attrs1[aid] >= attrs2[aid] and attrHig[aid] == 1) or
(attrs1[aid] <= attrs2[aid] and not attrHig[aid]) (attrs1[aid] <= attrs2[aid] and attrHig[aid] == 0)
for aid in attrs1 for aid in attrs1
): ):
return 3 return 3
if all( if all(
(attrs2[aid] >= attrs1[aid] and attrHig[aid]) or (attrs2[aid] >= attrs1[aid] and attrHig[aid] == 1) or
(attrs2[aid] <= attrs1[aid] and not attrHig[aid]) (attrs2[aid] <= attrs1[aid] and attrHig[aid] == 0)
for aid in attrs1 for aid in attrs1
): ):
return 4 return 4
return 1 return 1
print('finding replacements')
skillReqAttribs = { skillReqAttribs = {
182: 277, 182: 277,
183: 278, 183: 278,
@@ -216,10 +221,12 @@ def main(db, json_path):
1290: 1288} 1290: 1288}
skillReqAttribsFlat = set(skillReqAttribs.keys()).union(skillReqAttribs.values()) skillReqAttribsFlat = set(skillReqAttribs.keys()).union(skillReqAttribs.values())
# Get data on type groups # Get data on type groups
# Format: {type ID: group ID}
typesGroups = {} typesGroups = {}
for row in tables['evetypes']: for row in tables['evetypes']:
typesGroups[row['typeID']] = row['groupID'] typesGroups[row['typeID']] = row['groupID']
# Get data on type attributes # Get data on type attributes
# Format: {type ID: {attribute ID: attribute value}}
typesNormalAttribs = {} typesNormalAttribs = {}
typesSkillAttribs = {} typesSkillAttribs = {}
for row in tables['dgmtypeattribs']: for row in tables['dgmtypeattribs']:
@@ -229,6 +236,7 @@ def main(db, json_path):
typeSkillAttribs[row['attributeID']] = row['value'] typeSkillAttribs[row['attributeID']] = row['value']
# Ignore these attributes for comparison purposes # Ignore these attributes for comparison purposes
elif attributeID in ( elif attributeID in (
124, # mainColor
422, # techLevel 422, # techLevel
633, # metaLevel 633, # metaLevel
1692 # metaGroupID 1692 # metaGroupID
@@ -238,6 +246,7 @@ def main(db, json_path):
typeNormalAttribs = typesNormalAttribs.setdefault(row['typeID'], {}) typeNormalAttribs = typesNormalAttribs.setdefault(row['typeID'], {})
typeNormalAttribs[row['attributeID']] = row['value'] typeNormalAttribs[row['attributeID']] = row['value']
# Get data on skill requirements # Get data on skill requirements
# Format: {type ID: {skill type ID: skill level}}
typesSkillReqs = {} typesSkillReqs = {}
for typeID, typeAttribs in typesSkillAttribs.items(): for typeID, typeAttribs in typesSkillAttribs.items():
typeSkillAttribs = typesSkillAttribs.get(typeID, {}) typeSkillAttribs = typesSkillAttribs.get(typeID, {})
@@ -252,11 +261,19 @@ def main(db, json_path):
continue continue
typeSkillReqs[skillType] = skillLevel typeSkillReqs[skillType] = skillLevel
# Get data on attribute highIsGood flag # Get data on attribute highIsGood flag
# Format: {type ID: 0 if high is bad, 1 if high is good, 2 if neither}
attrHig = {} attrHig = {}
for row in tables['dgmattribs']: for row in tables['dgmattribs']:
attrHig[row['attributeID']] = bool(row['highIsGood']) attrHig[row['attributeID']] = 1 if row['highIsGood'] else 0
# As CCP data is not really consistent, do some overrides
attrHig[4] = 0 # mass
attrHig[161] = 0 # volume
# Also do some customizations; some attributes are neither good nor bad when they change
attrHig[128] = 2 # chargeSize
attrHig[1547] = 2 # rigSize
# As EVE affects various types mostly depending on their group or skill requirements, # As EVE affects various types mostly depending on their group or skill requirements,
# we're going to group various types up this way # we're going to group various types up this way
# Format: {(group ID, frozenset(skillreq, type, IDs)): [type ID, {attribute ID: attribute value}]}
groupedData = {} groupedData = {}
for row in tables['evetypes']: for row in tables['evetypes']:
typeID = row['typeID'] typeID = row['typeID']
@@ -269,6 +286,7 @@ def main(db, json_path):
typeGroup = typesGroups[typeID] typeGroup = typesGroups[typeID]
groupData = groupedData.setdefault((typeGroup, typeSkillreqs), []) groupData = groupedData.setdefault((typeGroup, typeSkillreqs), [])
groupData.append((typeID, typeAttribs)) groupData.append((typeID, typeAttribs))
# Format: {type ID: set(type IDs)}
same = {} same = {}
better = {} better = {}
# Now, go through composed groups and for every item within it find items which are # Now, go through composed groups and for every item within it find items which are