Merge pull request #212 from SwissTPH/ver39

Update schema version to 39
SwissTPH · Oct 24, 2018 · 36d35ec · 36d35ec
2 parents b1c7b2e + 8f74896
commit 36d35ec
Show file tree

Hide file tree

Showing 47 changed files with 5,951 additions and 54 deletions.
diff --git a/model/util/DocumentLoader.h b/model/util/DocumentLoader.h
@@ -35,7 +35,7 @@ namespace OM { namespace util {
 class DocumentLoader {
 public:
     /// Current schema version.
-    static const int SCHEMA_VERSION = 38;
+    static const int SCHEMA_VERSION = 39;
 
     DocumentLoader () : documentChanged(false) {}
 

diff --git a/schema/CMakeLists.txt b/schema/CMakeLists.txt
@@ -28,7 +28,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_38=scnXml
+        --namespace-map http://openmalaria.org/schema/scenario_39=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_38"
-           xmlns:om="http://openmalaria.org/schema/scenario_38"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_39"
+           xmlns:om="http://openmalaria.org/schema/scenario_39"
            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_38"
-           xmlns:om="http://openmalaria.org/schema/scenario_38"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_39"
+           xmlns:om="http://openmalaria.org/schema/scenario_39"
            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_38"
-           xmlns:om="http://openmalaria.org/schema/scenario_38"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_39"
+           xmlns:om="http://openmalaria.org/schema/scenario_39"
            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_38"
-           xmlns:om="http://openmalaria.org/schema/scenario_38"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_39"
+           xmlns:om="http://openmalaria.org/schema/scenario_39"
            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_38"
-           xmlns:om="http://openmalaria.org/schema/scenario_38"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_39"
+           xmlns:om="http://openmalaria.org/schema/scenario_39"
            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_38"
-           xmlns:om="http://openmalaria.org/schema/scenario_38"
+<xs:schema targetNamespace="http://openmalaria.org/schema/scenario_39"
+           xmlns:om="http://openmalaria.org/schema/scenario_39"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation="util.xsd"/>
   <xs:complexType name="Pharmacology">

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