Bugfixes
This commit is contained in:
parent
6b40f8f7aa
commit
671f53843c
@ -382,7 +382,7 @@ class MyCompanies:
|
|||||||
return raw_factories.pop(-1)
|
return raw_factories.pop(-1)
|
||||||
else:
|
else:
|
||||||
if raw:
|
if raw:
|
||||||
raw += inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", 0.0)
|
raw += inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", Decimal("0.0"))
|
||||||
if raw > 0:
|
if raw > 0:
|
||||||
to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage))
|
to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage))
|
||||||
if to_remove:
|
if to_remove:
|
||||||
@ -392,8 +392,8 @@ class MyCompanies:
|
|||||||
if to_remove:
|
if to_remove:
|
||||||
return final_factories.remove(to_remove[0])
|
return final_factories.remove(to_remove[0])
|
||||||
|
|
||||||
def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[float, float, float, float]:
|
|
||||||
frm = wrm = hrm = arm = Decimal("0.00")
|
frm = wrm = hrm = arm = Decimal("0.00")
|
||||||
|
def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[Decimal, Decimal, Decimal, Decimal]:
|
||||||
for company in companies:
|
for company in companies:
|
||||||
if company.industry in self._frm_fab_ids:
|
if company.industry in self._frm_fab_ids:
|
||||||
frm += company.raw_usage
|
frm += company.raw_usage
|
||||||
|
Loading…
x
Reference in New Issue
Block a user