From ee24c4700a183d009c9ad1da0b5b6854e119a938 Mon Sep 17 00:00:00 2001
From: Jean Sirmai <jean@a-lec.org>
Date: Fri, 5 Nov 2021 19:38:24 +0100
Subject: [PATCH] new space-param dimension format

---
 models/dimers random walk.xml |  7 ++++---
 schemas/models_0.2.xmls       | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index c6a063d..e2ef414 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -29,9 +29,9 @@
     <!-- loop_on_zero="false" anything moved before zero is lost-->
     <!-- loop_on_max="true"   anything moved beyond max reenters at the zero of space-->
     <!-- loop_on_max="false"  anything moved beyond max is lost-->
-                <size x="29" loop_on_zero="true" loop_on_max="true"/>
-                <size y="0" loop_on_zero="true" loop_on_max="true"/>
-                <size z="0" loop_on_zero="true" loop_on_max="true"/>
+                <axis name="x" size="29" loop_on_zero="true" loop_on_max="true"/>
+                <axis name="y" size="0" loop_on_zero="true" loop_on_max="true"/>
+                <axis name="z" size="0" loop_on_zero="true" loop_on_max="true"/>
             </dimension>
             <!-- Site_multiplicity = number of  sites in a space unit. -->
             <!-- Each site points towards a neighbouring space unit. -->
@@ -118,3 +118,4 @@
     </transitions>
 
 </gem-graph-model>
+
diff --git a/schemas/models_0.2.xmls b/schemas/models_0.2.xmls
index a4f255d..af1ed02 100644
--- a/schemas/models_0.2.xmls
+++ b/schemas/models_0.2.xmls
@@ -48,6 +48,18 @@
 
 <xs:element name="quote" substitutionGroup="g_ref"/>
 
+<xs:element name="axis">
+    <xs:complexType>
+        <xs:sequence>
+            <xs:element minOccurs="0" ref="quote"/>
+        </xs:sequence>
+        <xs:attribute name="name"  type="xs:string" use="required"/>
+        <xs:attribute name="size"  type="xs:integer" use="required"/>
+        <xs:attribute name="loop_on_zero"  type="xs:string" use="required"/>
+        <xs:attribute name="loop_on_max"  type="xs:string" use="required"/>
+    </xs:complexType>
+</xs:element>
+
 <xs:element name="arrow">
     <xs:complexType>
         <xs:sequence>
@@ -137,13 +149,13 @@
                 <xs:complexType>
                 <xs:sequence>
 
-                    <xs:element name="dimension" type="xs:integer"/>
-
-                    <xs:element name="size">
-                        <xs:complexType>
-                            <xs:attributeGroup ref="xyz_site_nb"/>
+                    <xs:element name="dimension">
+                          <xs:complexType>
+                          <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="axis"/>
+                        </xs:sequence>
                         </xs:complexType>
-                    </xs:element>
+                  </xs:element>
 
                     <xs:element name="site_multiplicity" type="xs:integer"/>