Skip to content

Commit e2faee3

Browse files
authored
Improve handling of the index columns (#296)
This PR removes generation of all know index columns; selective generation is done instead. Columns without any values are dropped. This allows cutting down on the processing time. This PR also harmonises fi_t and uc_t processing transforms by extracting common parts into separate functions.
1 parent 5cb5c7b commit e2faee3

File tree

5 files changed

+555
-526
lines changed

5 files changed

+555
-526
lines changed

xl2times/__main__.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,23 +131,23 @@ def convert_xl_to_times(
131131
transforms.process_tradelinks,
132132
transforms.include_tables_source,
133133
transforms.process_processes,
134-
transforms.process_topology,
135-
transforms.fill_in_missing_values,
134+
transforms.create_model_topology,
135+
transforms.fill_in_column_defaults,
136136
transforms.generate_uc_properties,
137137
transforms.expand_rows_parallel, # slow
138+
transforms.process_trade_links,
139+
transforms.merge_tables,
138140
transforms.remove_invalid_values,
139-
transforms.internalise_commodities,
140-
transforms.generate_commodity_groups,
141-
transforms.apply_fixups,
141+
transforms.include_cgs_in_topology,
142142
transforms.fill_in_missing_pcgs,
143-
transforms.generate_trade,
144-
transforms.merge_tables,
145143
transforms.complete_processes,
146-
transforms.process_units,
147-
transforms.complete_commodity_groups,
144+
transforms.create_model_units,
148145
transforms.process_wildcards,
149146
transforms.convert_aliases,
150-
transforms.fix_topology,
147+
transforms.enforce_availability,
148+
transforms.complete_model_trade,
149+
transforms.create_model_cgs,
150+
transforms.apply_fixups,
151151
transforms.apply_transform_tables,
152152
transforms.generate_implied_topology,
153153
transforms.verify_uc_topology,

0 commit comments

Comments
 (0)