diff --git a/calc2.py b/calc2.py index 1912b5a..1327c8e 100644 --- a/calc2.py +++ b/calc2.py @@ -206,7 +206,7 @@ targets_groups: list[dict[str, float]] = [ {'science-purple': SPM}, {'science-yellow': SPM}, ] -base_resources = { +bus_resources = { 'iron-plate', 'copper-plate', 'stone', @@ -222,10 +222,10 @@ base_resources = { # TODO: science-blue is wrong print(f'{SPM=}') -print(f'{base_resources=}') +print(f'{bus_resources=}') bus_inputs = {} for targets in targets_groups: - results, intermediates = compute_base_resource_flow(targets, base_resources) + results, intermediates = compute_base_resource_flow(targets, bus_resources) print() print(f'{targets=}') print('intermediates') @@ -243,3 +243,13 @@ for resource, count in sorted(bus_inputs.items()): if resource.startswith(('assembler', 'chemical-plant', 'oil-refinery')): continue print(f' {resource:35}: {dot_align(tuple(bus_inputs.values()), count)}') + +# oil processing +oil_resources = { + 'sulfuric-acid', + 'light-oil', + 'heavy-oil', +} + +oil_inputs = {} +# TODO compute