nismod / smif

Simulation Modelling Integration Framework
http://www.itrc.org.uk
MIT License
22 stars 6 forks source link

Decision module may access available interventions #339

Closed willu47 closed 5 years ago

willu47 commented 5 years ago

Added two layers of set operations in the DecisionManager and DecisionModule and addresses issue #333. DecisionManager now updates pre-decision state (from the previous iteration) with new decisions and writes this to the store for current timestep and iteration.

This is a requirement of nismod/nismod2#82

Consider set of all interventions Set of planned interventions Available interventions Decisions at time t

Todo:

This PR now also removes the pre-specified planning decision module, instead treating initial conditions and pre-specified planning as state which is all dealt with in the get_and_save_decisions method in the decision manager.

codecov[bot] commented 5 years ago

Codecov Report

Merging #339 into develop will increase coverage by 0.13%. The diff coverage is 90%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #339      +/-   ##
===========================================
+ Coverage    70.43%   70.57%   +0.13%     
===========================================
  Files           59       59              
  Lines         5135     5179      +44     
  Branches       608      615       +7     
===========================================
+ Hits          3617     3655      +38     
- Misses        1426     1431       +5     
- Partials        92       93       +1
Flag Coverage Δ
#javascript 70.57% <90%> (+0.13%) :arrow_up:
#python 78.47% <90%> (+0.08%) :arrow_up:
Impacted Files Coverage Δ
src/smif/data_layer/abstract_data_store.py 100% <100%> (ø) :arrow_up:
src/smif/data_layer/store.py 94.84% <100%> (ø) :arrow_up:
src/smif/decision/decision.py 93.27% <89.68%> (-0.06%) :arrow_down:
src/smif/data_layer/data_handle.py 82.8% <0%> (-1.21%) :arrow_down:

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 841615b...1f0d0f2. Read the comment docs.