Bump version to 46 (#378)

* bump version to 46 * bump schema version of all test scenarios * add scenario_46.xsd
SwissTPH · Jan 17, 2024 · a8f70fb · a8f70fb
1 parent bc31773
commit a8f70fb
Show file tree

Hide file tree

Showing 58 changed files with 6,536 additions and 64 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 = 45;
+        static const int SCHEMA_VERSION = 46;
 
         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_45=scnXml
+        --namespace-map http://openmalaria.org/schema/scenario_46=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_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">

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_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">

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_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">

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_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"/>

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_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">

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_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>

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_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"/>