Merge pull request #250 from dhardy/master

Update schema version number to 41
SwissTPH · Sep 5, 2019 · 6e5207c · 6e5207c
2 parents 2a574a8 + bc062bc
commit 6e5207c
Show file tree

Hide file tree

Showing 52 changed files with 6,029 additions and 62 deletions.
diff --git a/model/util/DocumentLoader.h b/model/util/DocumentLoader.h
@@ -34,7 +34,7 @@ namespace OM { namespace util {
 class DocumentLoader {
 public:
     /// Current schema version.
-    static const int SCHEMA_VERSION = 40;
+    static const int SCHEMA_VERSION = 41;
 
     DocumentLoader () : documentChanged(false) {}
 

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_40=scnXml
+        --namespace-map http://openmalaria.org/schema/scenario_41=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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            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,8 +3,8 @@
 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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="util.xsd"/>
 

diff --git a/schema/interventions.xsd b/schema/interventions.xsd
@@ -2,8 +2,8 @@
 <!-- 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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="healthSystem.xsd"/>
   <xs:include schemaLocation="entomology.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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            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,8 +3,8 @@
 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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="util.xsd"/>
   <xs:complexType name="Pharmacology">

diff --git a/schema/policy.md b/schema/policy.md
@@ -10,6 +10,7 @@ Update policy:
 *   update the schema translator [translateXML.py](https://github.com/vecnet/openmalaria.tools/blob/master/openmalaria/tools/translateXML.py) with a function translating the last release version to the next (translate_X_to_Y where X is current version, Y=X+1), doing necessary translations and writing a comment explaining the change
 *   update test scenarios when necessary (at least those run by ctest)
 *   in DocumentLoader.h, update SCHEMA_VERSION to the next version number (otherwise it'll refuse to run updated scenarios)
+*   update `version.txt`
 
 Release policy (new schema versions):
 *   copy build/schema/scenario_current.xsd to scenario_VER.xsd

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_40"
-           xmlns:om="http://openmalaria.org/schema/scenario_40"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_41"
+           xmlns:om="http://openmalaria.org/schema/scenario_41"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="demography.xsd"/>
   <xs:include schemaLocation="monitoring.xsd"/>