nismod / smif / 598

91%

push

travis-ci

Merge pull request #119 from tomalrussell/feature/model_data_interface

Feature/model data interface

Implement a DataHandle to read/write from models straight to a DataInterface which implements a backing store for inputs, parameters and results.

Removes responsibility for data- and parameter-juggling from SosModel and ModelSet.

Intends to expose a friendly interface to anyone implementing a SectorModel, particularly within simulate(), hiding details of modelrun id and dependency-converging or decision-resolving iterations.

Extends DataInterface to read/write scenario data and results. Also provides a MemoryInterface implementation for convenience and testing.

ScenarioModel is no longer pre-loaded with data. A SectorModel requesting data will transparently read directly from the backing store if the data is provided by a scenario. This also means the get_scenario_data method can be (and has been) removed from SectorModel.

For discussion, but not necessarily blocking: this version is currently raising NotImplementedError for any dependency which would require any conversion. This could be implemented implicitly, but if we prefer explicit to implicit, we might design small data-conversion modules to sit in the dependency graph alongside SectorModel and ScenarioModel, maybe pulling from a smif library of handy default conversion functions.

734 of 820 branches covered (89.51%)

535 of 535 new or added lines in 17 files covered. (100.0%)

2442 of 2704 relevant lines covered (90.31%)

1.81 hits per line