Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version to 46 #378

Merged
merged 3 commits into from
Jan 17, 2024
Merged

Bump version to 46 #378

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abec5c8
bump version to 46
acavelan Dec 14, 2023
00d36ec
bump schema version of all test scenarios
acavelan Dec 14, 2023
ba7b9e0
add scenario_46.xsd
acavelan Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion model/util/DocumentLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace OM
{
namespace util
{
static const int SCHEMA_VERSION = 45;
static const int SCHEMA_VERSION = 46;

unique_ptr<scnXml::Scenario> loadScenario(std::string lXmlFile);
}
Expand Down
2 changes: 1 addition & 1 deletion schema/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ foreach (XSD_NAME ${SCHEMA_NAMES})
COMMAND ${XSD_EXECUTABLE} cxx-tree
--std c++11
--type-naming ucc --function-naming java
--namespace-map http://openmalaria.org/schema/scenario_45=scnXml
--namespace-map http://openmalaria.org/schema/scenario_46=scnXml
# --generate-serialization
--generate-doxygen
--generate-intellisense
Expand Down
4 changes: 2 additions & 2 deletions schema/demography.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Schema for OpenMalaria input documents
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45"
xmlns:om="http://openmalaria.org/schema/scenario_45"
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46"
xmlns:om="http://openmalaria.org/schema/scenario_46"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!---HumanPopulationStructure-->
<xs:complexType name="Demography">
Expand Down
4 changes: 2 additions & 2 deletions schema/entomology.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Schema for OpenMalaria input documents
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45"
xmlns:om="http://openmalaria.org/schema/scenario_45"
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46"
xmlns:om="http://openmalaria.org/schema/scenario_46"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="util.xsd"/>
<xs:complexType name="Entomology">
Expand Down
2 changes: 1 addition & 1 deletion schema/healthSystem.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<!-- HealthSystem & Clinical data -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45" xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="util.xsd"/>
<!-- root element for clinical data outside the healthSystem element -->
<xs:complexType name="Clinical">
Expand Down
2 changes: 1 addition & 1 deletion schema/interventions.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Schema for OpenMalaria input documents
Copyright © 2005-2012 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45" xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="healthSystem.xsd"/>
<xs:include schemaLocation="entomology.xsd"/>
<xs:include schemaLocation="util.xsd"/>
Expand Down
4 changes: 2 additions & 2 deletions schema/monitoring.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Schema for OpenMalaria input documents
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45"
xmlns:om="http://openmalaria.org/schema/scenario_45"
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46"
xmlns:om="http://openmalaria.org/schema/scenario_46"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="util.xsd"/>
<xs:complexType name="Monitoring">
Expand Down
2 changes: 1 addition & 1 deletion schema/pharmacology.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<!-- Drug parameters — PK, PD and resistance -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45" xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="util.xsd"/>
<xs:complexType name="Pharmacology">
<xs:annotation>
Expand Down
4 changes: 2 additions & 2 deletions schema/scenario.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Schema for OpenMalaria input documents
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45"
xmlns:om="http://openmalaria.org/schema/scenario_45"
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46"
xmlns:om="http://openmalaria.org/schema/scenario_46"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="demography.xsd"/>
<xs:include schemaLocation="monitoring.xsd"/>
Expand Down
2 changes: 1 addition & 1 deletion schema/util.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright © 2005-2011 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<!-- standard types used -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45" xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- Component and TriggeredDeployments would be in interventions.xsd, except
that they are needed from healthSystem.xsd -->
<xs:complexType name="Component">
Expand Down
4 changes: 2 additions & 2 deletions schema/vivax.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Copyright © 2005-2019 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
Licence: GNU General Public Licence version 2 or later (see COPYING) -->
<!-- standard types used -->
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_45"
xmlns:om="http://openmalaria.org/schema/scenario_45"
<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_46"
xmlns:om="http://openmalaria.org/schema/scenario_46"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="util.xsd"/>
<xs:complexType name="Vivax">
Expand Down
2 changes: 1 addition & 1 deletion test/scenario1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="test D94" schemaVersion="45" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="test D94" schemaVersion="46" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="80" name="test" popSize="100">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario10.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="49" name="Idete Incidence" schemaVersion="45" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="49" name="Idete Incidence" schemaVersion="46" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="6.0" name="Ifakara" popSize="300">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario11.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="90" name="triple correlated heterogeneity" schemaVersion="45" wuID="0" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="90" name="triple correlated heterogeneity" schemaVersion="46" wuID="0" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Ifakara" popSize="200">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario12.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="30" name="Matsari Intervention" schemaVersion="45" wuID="12345" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="30" name="Matsari Intervention" schemaVersion="46" wuID="12345" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="80.389041096" name="Ifakara" popSize="500">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario12a.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="30" name="Matsari Intervention" schemaVersion="45" wuID="12345" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="30" name="Matsari Intervention" schemaVersion="46" wuID="12345" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="80.389041096" name="Ifakara" popSize="500">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario2ITNs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="0" name="test usage of multiple independent ITN descriptions alongside other vector interventions" schemaVersion="45" wuID="0" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="0" name="test usage of multiple independent ITN descriptions alongside other vector interventions" schemaVersion="46" wuID="0" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Rachuonyo" popSize="979">
<ageGroup lowerbound="0">
<group poppercent="2.6" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="45" wuID="5630539" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="46" wuID="5630539" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="test" popSize="500">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="99" name="Vacc with EIRDaily factor=1.0 with halfLifeYrs value=0.5" schemaVersion="45" wuID="53630539" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="99" name="Vacc with EIRDaily factor=1.0 with halfLifeYrs value=0.5" schemaVersion="46" wuID="53630539" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Ifakara" popSize="100">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Vacc with EIRDaily factor=1.0 with halfLifeYrs value=0.5" schemaVersion="45" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Vacc with EIRDaily factor=1.0 with halfLifeYrs value=0.5" schemaVersion="46" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Ifakara" popSize="100">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenario9.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="49" name="Idete Incidence" schemaVersion="45" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="49" name="Idete Incidence" schemaVersion="46" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="6.0" name="Ifakara" popSize="300">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioAvailabilityHeterogeneity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="example" schemaVersion="45" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="example" schemaVersion="46" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<!-- This is an example scenario.
More information is available in the official documentation: https://swisstph.github.io/openmalaria/schema-latest.html
And in the wiki: https://github.com/SwissTPH/openmalaria/wiki
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioBSV.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Full set of interventions" schemaVersion="45" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Full set of interventions" schemaVersion="46" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Zambia 2010 census_Southern province " popSize="600">
<ageGroup lowerbound="0">
<group poppercent="3.6" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioCohort.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="Do" schemaVersion="45" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="Do" schemaVersion="46" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Ifakara" popSize="100">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioDecisionTree5DayDielmo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Dielmo Calibration" schemaVersion="45" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Dielmo Calibration" schemaVersion="46" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="Ifakara" popSize="400">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1" />
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioESTS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="cut down version of VC's treatment seeking test scenario" schemaVersion="45" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="cut down version of VC's treatment seeking test scenario" schemaVersion="46" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="test" popSize="100">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioEffectiveDrug.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="45" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="46" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="test" popSize="250">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
2 changes: 1 addition & 1 deletion test/scenarioEmpirical.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_45" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="45" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_45 scenario_current.xsd">
<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="46" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_46 scenario_current.xsd">
<demography maximumAgeYrs="90" name="test" popSize="200">
<ageGroup lowerbound="0.0">
<group poppercent="3.474714994" upperbound="1"/>
Expand Down
Loading
Loading