bump schema version to 47.0

SwissTPH · Jul 12, 2024 · 3aab60b · 3aab60b
1 parent 017ab1d
commit 3aab60b
Show file tree

Hide file tree

Showing 58 changed files with 65 additions and 65 deletions.
diff --git a/model/util/DocumentLoader.h b/model/util/DocumentLoader.h
@@ -34,7 +34,7 @@ namespace OM
 { 
     namespace util
     {
-        static const int SCHEMA_VERSION = 46;
+        static const int SCHEMA_VERSION = 47;
 
         unique_ptr<scnXml::Scenario> loadScenario(std::string lXmlFile);
     }

diff --git a/schema/CMakeLists.txt b/schema/CMakeLists.txt
@@ -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_46=scnXml
+        --namespace-map http://openmalaria.org/schema/scenario_47=scnXml
 #         --generate-serialization
         --generate-doxygen
         --generate-intellisense

diff --git a/schema/demography.xsd b/schema/demography.xsd
@@ -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_46"
-           xmlns:om="http://openmalaria.org/schema/scenario_46"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47"
+           xmlns:om="http://openmalaria.org/schema/scenario_47"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <!---HumanPopulationStructure-->
   <xs:complexType name="Demography">

diff --git a/schema/entomology.xsd b/schema/entomology.xsd
@@ -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_46"
-           xmlns:om="http://openmalaria.org/schema/scenario_46"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47"
+           xmlns:om="http://openmalaria.org/schema/scenario_47"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="util.xsd"/>
   <xs:complexType name="Entomology">

diff --git a/schema/healthSystem.xsd b/schema/healthSystem.xsd
@@ -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_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47" xmlns:om="http://openmalaria.org/schema/scenario_47" 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">

diff --git a/schema/interventions.xsd b/schema/interventions.xsd
@@ -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_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47" xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:include schemaLocation="healthSystem.xsd"/>
  <xs:include schemaLocation="entomology.xsd"/>
  <xs:include schemaLocation="util.xsd"/>

diff --git a/schema/monitoring.xsd b/schema/monitoring.xsd
@@ -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_46"
-           xmlns:om="http://openmalaria.org/schema/scenario_46"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47"
+           xmlns:om="http://openmalaria.org/schema/scenario_47"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="util.xsd"/>
   <xs:complexType name="Monitoring">

diff --git a/schema/pharmacology.xsd b/schema/pharmacology.xsd
@@ -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_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47" xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:include schemaLocation="util.xsd"/>
  <xs:complexType name="Pharmacology">
   <xs:annotation>

diff --git a/schema/scenario.xsd b/schema/scenario.xsd
@@ -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_46"
-           xmlns:om="http://openmalaria.org/schema/scenario_46"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47"
+           xmlns:om="http://openmalaria.org/schema/scenario_47"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="demography.xsd"/>
   <xs:include schemaLocation="monitoring.xsd"/>

diff --git a/schema/scenario_46.xsd b/schema/scenario_46.xsd
@@ -1,4 +1,4 @@
-<xs:schema xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openmalaria.org/schema/scenario_46">
+<xs:schema xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openmalaria.org/schema/scenario_47">
 
 
 

diff --git a/schema/util.xsd b/schema/util.xsd
@@ -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_46" xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47" xmlns:om="http://openmalaria.org/schema/scenario_47" 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">

diff --git a/schema/vivax.xsd b/schema/vivax.xsd
@@ -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_46"
-           xmlns:om="http://openmalaria.org/schema/scenario_46"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_47"
+           xmlns:om="http://openmalaria.org/schema/scenario_47"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="util.xsd"/>
   <xs:complexType name="Vivax">

diff --git a/test/scenario1.xml b/test/scenario1.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="test D94" schemaVersion="47" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="80" name="test" popSize="100">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario10.xml b/test/scenario10.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="49" name="Idete Incidence" schemaVersion="47" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="6.0" name="Ifakara" popSize="300">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario11.xml b/test/scenario11.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="90" name="triple correlated heterogeneity" schemaVersion="47" wuID="0" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="Ifakara" popSize="200">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario12.xml b/test/scenario12.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="30" name="Matsari Intervention" schemaVersion="47" wuID="12345" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="80.389041096" name="Ifakara" popSize="500">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario12a.xml b/test/scenario12a.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="30" name="Matsari Intervention" schemaVersion="47" wuID="12345" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="80.389041096" name="Ifakara" popSize="500">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario2ITNs.xml b/test/scenario2ITNs.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="0" name="test usage of multiple independent ITN descriptions alongside other vector interventions" schemaVersion="47" wuID="0" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="Rachuonyo" popSize="979">
     <ageGroup lowerbound="0">
       <group poppercent="2.6" upperbound="1"/>

diff --git a/test/scenario4.xml b/test/scenario4.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="47" wuID="5630539" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="test" popSize="500">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario5.xml b/test/scenario5.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="99" name="Vacc with EIRDaily factor=1.0 with halfLifeYrs value=0.5" schemaVersion="47" wuID="53630539" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="Ifakara" popSize="100">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario6.xml b/test/scenario6.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Vacc with EIRDaily factor=1.0 with halfLifeYrs value=0.5" schemaVersion="47" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="Ifakara" popSize="100">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenario9.xml b/test/scenario9.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="49" name="Idete Incidence" schemaVersion="47" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="6.0" name="Ifakara" popSize="300">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenarioAvailabilityHeterogeneity.xml b/test/scenarioAvailabilityHeterogeneity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="example" schemaVersion="47" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 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 

diff --git a/test/scenarioBSV.xml b/test/scenarioBSV.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Full set of interventions" schemaVersion="47" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
     <demography maximumAgeYrs="90" name="Zambia 2010 census_Southern province " popSize="600">
         <ageGroup lowerbound="0">
             <group poppercent="3.6" upperbound="1"/> 

diff --git a/test/scenarioCohort.xml b/test/scenarioCohort.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="Do" schemaVersion="47" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="Ifakara" popSize="100">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenarioDecisionTree5DayDielmo.xml b/test/scenarioDecisionTree5DayDielmo.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Dielmo Calibration" schemaVersion="47" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="Ifakara" popSize="400">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1" />

diff --git a/test/scenarioESTS.xml b/test/scenarioESTS.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="cut down version of VC's treatment seeking test scenario" schemaVersion="47" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="test" popSize="100">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenarioEffectiveDrug.xml b/test/scenarioEffectiveDrug.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="47" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="test" popSize="250">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>

diff --git a/test/scenarioEmpirical.xml b/test/scenarioEmpirical.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<om:scenario xmlns:om="http://openmalaria.org/schema/scenario_47" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" analysisNo="233" name="test D94" schemaVersion="47" wuID="536305339" xsi:schemaLocation="http://openmalaria.org/schema/scenario_47 scenario_current.xsd">
   <demography maximumAgeYrs="90" name="test" popSize="200">
     <ageGroup lowerbound="0.0">
       <group poppercent="3.474714994" upperbound="1"/>
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		<xs:schema xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openmalaria.org/schema/scenario_46">
		<xs:schema xmlns:om="http://openmalaria.org/schema/scenario_46" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openmalaria.org/schema/scenario_47">



Expand Down