Merge remote-tracking branch 'TheOneTrue/master' into Beta3Systems

Conflicts:
	data/Station.csv

buildcache.py

@@ -355,6 +355,7 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
     processedStations = {}
     processedItems = {}
     itemPrefix = ""
+    DELETED = corrections.DELETED
 
     for line in priceFile:
         lineNo += 1
@@ -382,6 +383,11 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
             except KeyError:
                 systemName = corrections.correctSystem(systemName)
                 stationName = corrections.correctStation(stationName)
+                if systemName == DELETED or stationName == DELETED:
+                    if debug > 1:
+                        print("- DELETED: {}".format(facility))
+                    stationID = DELETED
+                    continue
                 facility = systemName.upper() + '/' + stationName
                 try:
                     stationID = systemByName[facility]
@@ -405,6 +411,9 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
             # Need a station to process any other type of line.
             raise SyntaxError(priceFile, lineNo,
                                 "Expecting '@ SYSTEM / Station' line", text)
+        if stationID == DELETED:
+            # Ignore all values from a deleted station/system.
+            continue
 
         ########################################
         ### "+ Category" lines.
@@ -419,6 +428,9 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
                 categoryID = categoriesByName[categoryName]
             except KeyError:
                 categoryName = corrections.correctCategory(categoryName)
+                if categoryName == DELETED:
+                    ### TODO: Determine correct way to handle this.
+                    raise SyntaxError("Category has been deleted.")
                 try:
                     categoryID = categoriesByName[categoryName]
                     if debug > 1:
@@ -464,6 +476,10 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
         except KeyError:
             oldName = itemName
             itemName = corrections.correctItem(itemName)
+            if itemName == DELETED:
+                if debug > 1:
+                    print("- DELETED {}".format(oldName))
+                continue
             try:
                 itemID = itemByName[itemPrefix + itemName]
                 if debug > 1:

data/corrections.py

@@ -1,13 +1,17 @@
 # Provides an interface for correcting star/station names that
 # have changed in recent versions.
 
+# Arbitrary, negative value to denote something that's been removed.
+DELETED = -111
+
 systems = {
 }
 
 stations = {
     'LOUIS DE LACAILLE PROSPECT': 'Lacaille Prospect',
     'HOPKINS HANGAR': 'Cori Terminal',
     'HOPKINS HANGER': 'Cori Terminal',
+    'EJETA STATION': DELETED,
 }
 
 categories = {
@@ -28,10 +32,10 @@ def correctSystem(oldName):
         return oldName
 
 def correctStation(oldName):
-	try:
-		return stations[oldName.upper()]
-	except KeyError:
-		return oldName
+    try:
+        return stations[oldName.upper()]
+    except KeyError:
+        return oldName
 
 def correctCategory(oldName):
     try:
@@ -44,3 +48,4 @@ def correctItem(oldName):
         return items[oldName.upper()]
     except KeyError:
         return oldName
+

tradecalc.py

@@ -244,8 +244,11 @@ def _fitCombos(offset, cr, cap):
                         # 1 unit per 15 minutes for medium
                         units = level - 1
                         interval = (30 / level) * 60
-                        adjustment = units * math.floor(item.srcAge / interval)
-                        maxQty = min(maxQty, item.stock + adjustment)
+                        speculativeRecovery = units * math.floor(item.srcAge / interval)
+                    else:
+                        # Low / Unknown - don't try to guess
+                        speculativeRecovery = 0
+                    maxQty = min(maxQty, item.stock + speculativeRecovery)
 
                 if maxQty > 0:
                     loadItems = [[item, maxQty]]