Merge pull request #1942 from optimamodel/develop

Revision 11

Author: kelvinburke

CHANGELOG.md

@@ -4,6 +4,10 @@ Projects before `2.11.4` should be able to be migrated to version `2.11.4` witho
 
 Versions `2.11.4`, `2.12.0` and later all can be run using the branch `main`. A project will automatically update to the earliest supported version (currently `2.11.4`), but updating a project to the latest version can be done using the FE or `op.migrate(P, 'latest')`
 
+## Revision 11
+ - Fix `checkifparsetoverridesscenario()` not working with multiple budget years
+ - Small FE fixes
+
 ## Revision 10
  - Add objective option for minimising number of prevalent undiagnosed HIV infections
 

client/source/js/modules/costfunction/cost-function.html

@@ -148,6 +148,7 @@ <h3>Define cost function
                           ng-model="row[2]"
                           min="0"
                           max="100"
+                          step="any"
                           type="number"
                           style="width: 50px"
                           class="txbox __inline"
@@ -159,6 +160,7 @@ <h3>Define cost function
                           ng-model="row[3]"
                           min="0"
                           max="100"
+                          step="any"
                           type="number"
                           style="width: 50px"
                           class="txbox __inline"

optima/loadtools.py

@@ -147,6 +147,7 @@ def setrevisionmigrations(which='migrations'):
         ('7',   ('8',  '2024-09-27', None,                           'Update definition of "latediag" to be CD4<350 (and add separate output for undiagCD4<350 to align)')),
         ('8',   ('9',  '2024-10-07', None,                           'Update calculation of ICERs')),
         ('9',   ('10', '2024-10-09', None,                           'Add objective option for minimising number of prevalent undiagnosed HIV infections')),
+        ('10',   ('11', '2024-11-01', None,                           'A couple of FE fixes')),
         ])
 
 

optima/results.py

@@ -1066,7 +1066,7 @@ def select_zeroth(possible_list):
             outputstr += sep.join(['Budget', prog]) + sep
             outputstr += sep.join(map(str,prog_budgets))
             outputstr += '\n'
-        total_budgets = {scen_key: select_zeroth(self.budgets[scen_key][:].sum(axis=0)) for scen_key in scen_keys}
+        total_budgets = odict({scen_key: select_zeroth(self.budgets[scen_key][:].sum(axis=0)) for scen_key in scen_keys})
         outputstr += sep.join(['Budget', 'TOTAL']) + sep
         outputstr += sep.join(map(str, total_budgets.values()))
         outputstr += '\n'+'\n'

optima/scenarios.py

@@ -477,7 +477,7 @@ def checkifparsetoverridesscenario(project, parset, scen, progset=None, progendy
                     # warning, parsoverridingparsdict, overridetimes, overridevals, combinedwarningmsg, warningmessages
                     return False, odict(), odict(), odict(), '', []
 
-        progstartyear = scen.t
+        progstartyear = min(promotetoarray(scen.t))
 
         # warning, parsoverridingparsdict, overridetimes, overridevals, combinedwarningmsg, warningmessages = \
         return checkifparsetoverridesprogset(progset=progset, parset=parset, progendyear=progendyear, progstartyear=progstartyear, formatfor=formatfor, createmessages=createmessages)

optima/version.py

@@ -1,6 +1,6 @@
 supported_versions = ['2.11.4','2.12.0','2.12.1','2.12.2']  # (note: ' not " because setup.py)
-revision = '10'
-revisiondate = '2024-10-09'
+revision = '11'
+revisiondate = '2024-11-01'
 versions_different_databook = ['2.10.13']  # Versions where we start using a different databook format
 
 version = supported_versions[-1]