From cd5a8f35d13a211edb8b46c601477d255451f70a Mon Sep 17 00:00:00 2001
From: Jean Sirmai <jean@a-lec.org>
Date: Thu, 4 Nov 2021 17:04:05 +0000
Subject: [PATCH 1/9] In model xml, space-param.dimension includes as many
 children as there are dimensions

---
 models/dimers random walk.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index c5696fd..c6a063d 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <gem-graph-model version="0.2">
     <!-- Model identity informations -->
     <identity>
@@ -24,8 +24,15 @@
         </simulation>
 
         <space-param>
-            <dimension>1</dimension>
-            <size x="29" y="0" z="0"/>
+            <dimension>
+    <!-- loop_on_zero="true"  anything moved before zero reenters at the end of space-->
+    <!-- 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"/>
+            </dimension>
             <!-- Site_multiplicity = number of  sites in a space unit. -->
             <!-- Each site points towards a neighbouring space unit. -->
             <!-- Several arrows can be stacked in the same site. -->

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 2/9] 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"/>
 

From f62ea44c3f5ef826da66368b36df4fc8f47c1cfd Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Thu, 11 Nov 2021 15:17:38 +0000
Subject: [PATCH 3/9] Apply 1 suggestion(s) to 1 file(s)

---
 models/dimers random walk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index e2ef414..924c7bd 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -29,7 +29,7 @@
     <!-- 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-->
-                <axis name="x" size="29" loop_on_zero="true" loop_on_max="true"/>
+                <axis name="x" size="29"/>
                 <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>

From a5d1b055588d5fc172fd51ae4288ba25603ca5f7 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Thu, 11 Nov 2021 15:18:55 +0000
Subject: [PATCH 4/9] Apply 1 suggestion(s) to 1 file(s)

---
 schemas/models_0.2.xmls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/schemas/models_0.2.xmls b/schemas/models_0.2.xmls
index af1ed02..d66f5fa 100644
--- a/schemas/models_0.2.xmls
+++ b/schemas/models_0.2.xmls
@@ -55,7 +55,6 @@
         </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>

From 92e03a7450a5423fee1f18ef1e3b271a69e41431 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Thu, 11 Nov 2021 15:19:04 +0000
Subject: [PATCH 5/9] Apply 1 suggestion(s) to 1 file(s)

---
 schemas/models_0.2.xmls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/schemas/models_0.2.xmls b/schemas/models_0.2.xmls
index d66f5fa..2c8a0a9 100644
--- a/schemas/models_0.2.xmls
+++ b/schemas/models_0.2.xmls
@@ -55,7 +55,6 @@
         </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_max"  type="xs:string" use="required"/>
     </xs:complexType>
 </xs:element>
 

From 0ad210b930330090ea4c1dd58cd74b0d6c508221 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Thu, 11 Nov 2021 15:19:17 +0000
Subject: [PATCH 6/9] Apply 1 suggestion(s) to 1 file(s)

---
 models/dimers random walk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index 924c7bd..64d48f4 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -30,7 +30,7 @@
     <!-- loop_on_max="true"   anything moved beyond max reenters at the zero of space-->
     <!-- loop_on_max="false"  anything moved beyond max is lost-->
                 <axis name="x" size="29"/>
-                <axis name="y" size="0" loop_on_zero="true" loop_on_max="true"/>
+                <axis name="y" size="0"/>
                 <axis name="z" size="0" loop_on_zero="true" loop_on_max="true"/>
             </dimension>
             <!-- Site_multiplicity = number of  sites in a space unit. -->

From 544a34de7c4eee164f057adada84b81cffafd619 Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@a-lec.org>
Date: Thu, 11 Nov 2021 15:20:17 +0000
Subject: [PATCH 7/9] Apply 1 suggestion(s) to 1 file(s)

---
 models/dimers random walk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index 64d48f4..16439a2 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -31,7 +31,7 @@
     <!-- loop_on_max="false"  anything moved beyond max is lost-->
                 <axis name="x" size="29"/>
                 <axis name="y" size="0"/>
-                <axis name="z" size="0" loop_on_zero="true" loop_on_max="true"/>
+                <axis name="z" size="0"/>
             </dimension>
             <!-- Site_multiplicity = number of  sites in a space unit. -->
             <!-- Each site points towards a neighbouring space unit. -->

From 16eb05fa05f1f1582e7460f1e124a177445b13b6 Mon Sep 17 00:00:00 2001
From: Jean Sirmai <jean@a-lec.org>
Date: Sun, 5 Dec 2021 17:44:05 +0100
Subject: [PATCH 8/9] WIP: XMLS non redondant et renommages

---
 models/dimers random walk.xml | 88 +++++++++++++++++-----------------
 schemas/models_0.2.xmls       | 90 ++++++++++++-----------------------
 2 files changed, 74 insertions(+), 104 deletions(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index 16439a2..dd1e7a1 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gem-graph-model version="0.2">
-    <!-- Model identity informations -->
     <identity>
        <name>Modèle de test</name>
 
-       <owner>Gaston Lagaffe</owner>
+       <owner>Léontine Patinette</owner>
 
        <owner_id>2</owner_id>
 
-       <date>1629830000</date>
+       <date>1630000000</date>
 
        <version>1.0</version>
 
-       <g_ref id="texte" date="1629830000" author="Jean" lang="en">Ref</g_ref>
+       <g_ref id="Cause" date="1630000000" author="toujours" lang="en">Ref</g_ref>
     </identity>
 
-    <!-- Model parameters -->
-    <parameters id="texte" date="0" author="Gaston Lagaffe">
+    <parameters id="texte" date="0" author="Léontine Trottine.">
         <simulation>
             <max_thread>0</max_thread>
             <max_cycles>9</max_cycles>
@@ -24,18 +22,19 @@
         </simulation>
 
         <space-param>
-            <dimension>
     <!-- loop_on_zero="true"  anything moved before zero reenters at the end of space-->
     <!-- 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-->
-                <axis name="x" size="29"/>
-                <axis name="y" size="0"/>
-                <axis name="z" size="0"/>
+    
+            <dimension>
+                <coord axis="x" at="29"/>
             </dimension>
+            
             <!-- Site_multiplicity = number of  sites in a space unit. -->
             <!-- Each site points towards a neighbouring space unit. -->
             <!-- Several arrows can be stacked in the same site. -->
+            
             <site_multiplicity>3</site_multiplicity>
 
         </space-param>
@@ -43,50 +42,50 @@
     </parameters>
 
     <!-- Model objects definition -->
-    <objects id="texte" date="1629830000" author="Jean Sirmai">
-        <object id="dimer 1-1" date="1629830000" author="Jean Sirmai">
-            <arrow x="0" y="0" z="0" site="1" weight="1"/>
-            <arrow x="1" y="0" z="0" site="2" weight="1"/>
-
+    
+    <objects id="only dimers in this model" date="1630000000" author="inanimés,... âme ?">
+        <object id="a dimer" date="1630000000" author="Alphonse">
+            <arrow site="1" weight="1"><coord axis="x" at="0"/></arrow>
+            <arrow site="2" weight="1"><coord axis="x" at="1"/></arrow>
         </object>
 
     </objects>
 
+    
     <!-- Saved space description (initial space is sequence 0) -->
-    <savestates id="texte" date="1629830000" author="THE MATRIX">
-      <space id="initial" date="1629830000" author="Jean Sirmai" sequence="0">
-          <arrow x="0"  y="0" z="0" site="1" weight="1"/>
-          <arrow x="1"  y="0" z="0" site="2" weight="1"/>
-
-          <arrow x="10" y="0" z="0" site="1" weight="1"/>
-          <arrow x="11" y="0" z="0" site="2" weight="1"/>
-
-          <arrow x="20" y="0" z="0" site="1" weight="1"/>
-          <arrow x="21" y="0" z="0" site="2" weight="1"/>
-
+    
+    <savedstates id="texte" date="1630000000" author="Qui courrait dans l'herbe'">
+        <state id="initial" date="1630000000" author="Une souris verte">
+            <arrow site="1" weight="1"><coord axis="x" at="0"/></arrow>
+            <arrow site="2" weight="1"><coord axis="x" at="1"/></arrow>
+            <arrow site="1" weight="1"><coord axis="x" at="10"/></arrow>
+            <arrow site="2" weight="1"><coord axis="x" at="11"/></arrow>
+            <arrow site="1" weight="1"><coord axis="x" at="20"/></arrow>
+            <arrow site="2" weight="1"><coord axis="x" at="21"/></arrow>
+            
           <!-- Three dimers 1-1 are drawn in the global space
                at locations (0,1) (10,11) and (20,21) -->
 
-      </space>
+      </state>
 
-    </savestates>
+    </savedstates>
 
     <!-- Model transitions definition (rules) -->
     <!-- In this version : <xs:sequence minOccurs="0" maxOccurs="unbounded">-->
     <!-- Transitions should be edited by hand and written in a 'human-readable' format -->
 
-    <conditions id="random walk of dimers" date="1629822222" author="Jean">
+    <conditions id="random walk of dimers" date="1630000000" author="Zazard le lézard !">
 
-        <condition x= "0" y="0" z="0" site="1" weight="1" node_id="1" parent="0"/>
-        <condition x= "1" y="0" z="0" site="2" weight="1" node_id="2" parent="1"/>
-        <!-- as soon as conditions 1 and 2 are satisfied, a dimer is identified at location (0,1). -->
+        <condition site="1" weight="1" node_id="1" parent="0"><coord axis="x" at="0"/></condition>
+        <condition site="2" weight="1" node_id="2" parent="1"><coord axis="x" at="1"/></condition>
+        <!-- as soon as conditions 1 and 2 are satisfied, a dimer is identified at atation (0,1). -->
 
-        <condition x= "2" y="0" z="0" site="1" weight="0" node_id="3" parent="2"/>
+        <condition site="1" weight="0" node_id="3" parent="2"><coord axis="x" at="2"/></condition>
         <!-- as soon as condition 3 is satisfied,
              the neighbouring space unit to East of the dimer is empty
              and the dimer identified by conditions (1,2)  can be moved to East. -->
 
-        <condition x="-1" y="0" z="0" site="2" weight="0" node_id="4" parent="2"/>
+        <condition site="2" weight="0" node_id="4" parent="2"><coord axis="x" at="-1"/></condition>
         <!-- as soon as condition 4 is satisfied,
              the neighbouring space unit to West of the dimer is empty
              and  the dimer identified by conditions (1,2) can be moved to West. -->
@@ -95,27 +94,26 @@
 
     <transitions>
 
-      <transition id="move_a_dimer_to_east" date="1629811111" author="Jean"
+        <transition id="move_a_dimer_to_east" date="1630000000" author="Pas moi..."
                   parent="3" probability="1">
 
-          <arrow x="0" y="0" z="0" site="1" weight="0"/>
-          <arrow x="1" y="0" z="0" site="2" weight="0"/>
-          <arrow x="1" y="0" z="0" site="1" weight="1"/>
-          <arrow x="2" y="0" z="0" site="2" weight="1"/>
+            <arrow site="1" weight="0"><coord axis="x" at="0"/></arrow>
+            <arrow site="2" weight="0"><coord axis="x" at="1"/></arrow>
+            <arrow site="1" weight="1"><coord axis="x" at="1"/></arrow>
+            <arrow site="2" weight="1"><coord axis="x" at="2"/></arrow>
 
       </transition>
 
-      <transition id="move_a_dimer_to_west" date="1629811112" author="Jean"
+      <transition id="move_a_dimer_to_west" date="1630000000" author="Ni moi !"
                   parent="4" probability="1">
 
-          <arrow x= "0" y="0" z="0" site="1" weight="0"/>
-          <arrow x= "1" y="0" z="0" site="2" weight="0"/>
-          <arrow x= "0" y="0" z="0" site="2" weight="1"/>
-          <arrow x="-1" y="0" z="0" site="1" weight="1"/>
+            <arrow site="1" weight="0"><coord axis="x" at="0"/></arrow>
+            <arrow site="2" weight="0"><coord axis="x" at="1"/></arrow>
+            <arrow site="2" weight="1"><coord axis="x" at="0"/></arrow>
+            <arrow site="1" weight="1"><coord axis="x" at="1"/></arrow>
 
       </transition>
 
     </transitions>
 
 </gem-graph-model>
-
diff --git a/schemas/models_0.2.xmls b/schemas/models_0.2.xmls
index 2c8a0a9..f106f88 100644
--- a/schemas/models_0.2.xmls
+++ b/schemas/models_0.2.xmls
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 <!-- https://www.freeformatter.com/xml-validator-xsd.html -->
-<!-- https://www.w3schools.com/xml/el_attribute.asp  -->
 <xs:attribute name="id" type="xs:string"/>
 <xs:attribute name="node_id" type="xs:integer"/>
+<xs:attribute name="parent" type="xs:integer"/>
 <xs:attribute name="date" type="xs:integer"/>
 <xs:attribute name="name" type="xs:string"/>
 <xs:attribute name="lang" type="xs:string"/>
@@ -11,12 +11,7 @@
 <xs:attribute name="owner_id" type="xs:integer"/>
 <xs:attribute name="author" type="xs:string"/>
 <xs:attribute name="version" type="xs:float"/>
-<xs:attribute name="sequence" type="xs:integer"/>
 <xs:attribute name="probability" type="xs:integer"/>
-<xs:attribute name="parent" type="xs:integer"/>
-<xs:attribute name="x" type="xs:integer" default="0"/>
-<xs:attribute name="y" type="xs:integer" default="0"/>
-<xs:attribute name="z" type="xs:integer" default="0"/>
 <xs:attribute name="site" type="xs:integer" default="0"/>
 <xs:attribute name="weight" type="xs:integer" default="0"/>
 
@@ -27,14 +22,6 @@
       <xs:attribute ref="author"/>
 </xs:attributeGroup>
 
-<xs:attributeGroup name="xyz_site_nb">
-      <xs:attribute ref="x"/>
-      <xs:attribute ref="y"/>
-      <xs:attribute ref="z"/>
-      <xs:attribute ref="site"/>
-      <xs:attribute ref="weight"/>
-</xs:attributeGroup>
-
 <xs:element name="g_ref">
     <xs:complexType>
         <xs:simpleContent>
@@ -48,31 +35,38 @@
 
 <xs:element name="quote" substitutionGroup="g_ref"/>
 
-<xs:element name="axis">
+<xs:element name="coord">
     <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="axis" type="xs:string" use="required"/>
+        <xs:attribute name="at" type="xs:integer" use="required"/>
+    </xs:complexType>
+</xs:element>
+
+<xs:element name="dimension">
+    <xs:complexType>
+    <xs:sequence minOccurs="1" maxOccurs="unbounded">
+        <xs:element ref="coord"/>
+    </xs:sequence>
     </xs:complexType>
 </xs:element>
 
 <xs:element name="arrow">
     <xs:complexType>
-        <xs:sequence>
-            <xs:element minOccurs="0" ref="quote"/>
+        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+            <xs:element ref="coord"/>
         </xs:sequence>
-        <xs:attributeGroup ref="xyz_site_nb"/>
+        <xs:attribute name="site" use="required"/>
+        <xs:attribute name="weight" use="required"/>
     </xs:complexType>
 </xs:element>
 
 <xs:element name="condition">
     <xs:complexType>
-        <xs:sequence>
-            <xs:element minOccurs="0" ref="quote"/>
+        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+            <xs:element ref="coord" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
-        <xs:attributeGroup ref="xyz_site_nb"/>
+        <xs:attribute name="site" use="required"/>
+        <xs:attribute name="weight" use="required"/>
         <xs:attribute ref="node_id" use="required"/>
         <xs:attribute ref="parent" use="required"/>
     </xs:complexType>
@@ -89,16 +83,6 @@
 
 <xs:element name="object" substitutionGroup="state"/>
 
-<xs:element name="space">
-    <xs:complexType>
-    <xs:sequence minOccurs="1" maxOccurs="unbounded">
-        <xs:element ref="arrow"/>
-    </xs:sequence>
-    <xs:attributeGroup ref="id_date_author"/>
-    <xs:attribute ref="sequence" use="required"/>
-    </xs:complexType>
-</xs:element>
-
 <xs:element name="transition">
     <xs:complexType>
         <xs:sequence minOccurs="1" maxOccurs="unbounded">
@@ -113,50 +97,38 @@
 
 <xs:element name="gem-graph-model">
 <xs:complexType>
-<xs:sequence>
+<xs:sequence minOccurs="1" maxOccurs="1">
     <xs:element name="identity">
         <xs:complexType>
-          <xs:sequence>
+          <xs:sequence minOccurs="1" maxOccurs="1">
               <xs:element name="name" type="xs:string"/>
               <xs:element name="owner" type="xs:string"/>
               <xs:element name="owner_id" type="xs:integer"/>
               <xs:element name="date" type="xs:integer"/>
               <xs:element name="version" type="xs:float"/>
-              <xs:element minOccurs="0" ref="g_ref"/>
+              <xs:element ref="g_ref" minOccurs="1" maxOccurs="1"/>
           </xs:sequence>
         </xs:complexType>
     </xs:element>
 
-        <xs:element name="parameters">
+    <xs:element name="parameters">
         <xs:complexType>
-        <xs:sequence>
+        <xs:sequence minOccurs="1" maxOccurs="1">
 
             <xs:element name="simulation">
                 <xs:complexType>
-                <xs:sequence>
-
+                <xs:sequence minOccurs="1" maxOccurs="1">
                     <xs:element name="max_thread" type="xs:integer"/>
-
                     <xs:element name="max_cycles" type="xs:integer"/>
-
                 </xs:sequence>
                 </xs:complexType>
             </xs:element>
 
             <xs:element name="space-param">
                 <xs:complexType>
-                <xs:sequence>
-
-                    <xs:element name="dimension">
-                          <xs:complexType>
-                          <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="axis"/>
-                        </xs:sequence>
-                        </xs:complexType>
-                  </xs:element>
-
+                <xs:sequence minOccurs="1" maxOccurs="1">
+                    <xs:element ref="dimension"/>
                     <xs:element name="site_multiplicity" type="xs:integer"/>
-
               </xs:sequence>
               </xs:complexType>
           </xs:element>
@@ -169,16 +141,16 @@
       <xs:element name="objects">
           <xs:complexType>
           <xs:sequence minOccurs="1" maxOccurs="unbounded">
-              <xs:element ref="state"/>
+              <xs:element ref="object"/>
           </xs:sequence>
           <xs:attributeGroup ref="id_date_author"/>
           </xs:complexType>
       </xs:element>
 
-      <xs:element name="savestates">
+      <xs:element name="savedstates">
           <xs:complexType>
           <xs:sequence minOccurs="0" maxOccurs="unbounded">
-              <xs:element ref="space"/>
+              <xs:element ref="state"/>
           </xs:sequence>
           <xs:attributeGroup ref="id_date_author"/>
           </xs:complexType>

From 86eac95046204868a869fcb81a4eff55016a509b Mon Sep 17 00:00:00 2001
From: Jean Sirmai <jean@a-lec.org>
Date: Tue, 7 Dec 2021 19:38:42 +0100
Subject: [PATCH 9/9] =?UTF-8?q?version=200.2.1=20(fl=C3=A8ches=20encod?=
 =?UTF-8?q?=C3=A9es=20sans=20redondance)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/dimers random walk.xml                 | 60 +++++++-------
 models/testing.xml                            | 83 +++++++++++++++++++
 .../{models_0.2.xmls => models_0.2.1.xmls}    | 52 +++++++-----
 3 files changed, 144 insertions(+), 51 deletions(-)
 create mode 100644 models/testing.xml
 rename schemas/{models_0.2.xmls => models_0.2.1.xmls} (77%)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index dd1e7a1..7111d1c 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gem-graph-model version="0.2">
+<gem-graph-model version="0.2.1">
     <identity>
        <name>Modèle de test</name>
 
@@ -26,15 +26,13 @@
     <!-- 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-->
-    
-            <dimension>
-                <coord axis="x" at="29"/>
-            </dimension>
-            
+
+            <dimension x="29"/>
+
             <!-- Site_multiplicity = number of  sites in a space unit. -->
             <!-- Each site points towards a neighbouring space unit. -->
             <!-- Several arrows can be stacked in the same site. -->
-            
+
             <site_multiplicity>3</site_multiplicity>
 
         </space-param>
@@ -42,27 +40,27 @@
     </parameters>
 
     <!-- Model objects definition -->
-    
+
     <objects id="only dimers in this model" date="1630000000" author="inanimés,... âme ?">
         <object id="a dimer" date="1630000000" author="Alphonse">
-            <arrow site="1" weight="1"><coord axis="x" at="0"/></arrow>
-            <arrow site="2" weight="1"><coord axis="x" at="1"/></arrow>
+            <arrow site="1" weight="1" x="0"/>
+            <arrow site="2" weight="1" x="1"/>
         </object>
 
     </objects>
 
-    
+
     <!-- Saved space description (initial space is sequence 0) -->
-    
+
     <savedstates id="texte" date="1630000000" author="Qui courrait dans l'herbe'">
         <state id="initial" date="1630000000" author="Une souris verte">
-            <arrow site="1" weight="1"><coord axis="x" at="0"/></arrow>
-            <arrow site="2" weight="1"><coord axis="x" at="1"/></arrow>
-            <arrow site="1" weight="1"><coord axis="x" at="10"/></arrow>
-            <arrow site="2" weight="1"><coord axis="x" at="11"/></arrow>
-            <arrow site="1" weight="1"><coord axis="x" at="20"/></arrow>
-            <arrow site="2" weight="1"><coord axis="x" at="21"/></arrow>
-            
+            <arrow site="1" weight="1" x="0"/>
+            <arrow site="2" weight="1" x="1"/>
+            <arrow site="1" weight="1" x="10"/>
+            <arrow site="2" weight="1" x="11"/>
+            <arrow site="1" weight="1" x="20"/>
+            <arrow site="2" weight="1" x="21"/>
+
           <!-- Three dimers 1-1 are drawn in the global space
                at locations (0,1) (10,11) and (20,21) -->
 
@@ -76,16 +74,16 @@
 
     <conditions id="random walk of dimers" date="1630000000" author="Zazard le lézard !">
 
-        <condition site="1" weight="1" node_id="1" parent="0"><coord axis="x" at="0"/></condition>
-        <condition site="2" weight="1" node_id="2" parent="1"><coord axis="x" at="1"/></condition>
+        <condition site="1" weight="1" node_id="1" parent="0" x="0"/>
+        <condition site="2" weight="1" node_id="2" parent="1" x="1"/>
         <!-- as soon as conditions 1 and 2 are satisfied, a dimer is identified at atation (0,1). -->
 
-        <condition site="1" weight="0" node_id="3" parent="2"><coord axis="x" at="2"/></condition>
+        <condition site="1" weight="0" node_id="3" parent="2" x="2"/>
         <!-- as soon as condition 3 is satisfied,
              the neighbouring space unit to East of the dimer is empty
              and the dimer identified by conditions (1,2)  can be moved to East. -->
 
-        <condition site="2" weight="0" node_id="4" parent="2"><coord axis="x" at="-1"/></condition>
+        <condition site="2" weight="0" node_id="4" parent="2" x="-1"/>
         <!-- as soon as condition 4 is satisfied,
              the neighbouring space unit to West of the dimer is empty
              and  the dimer identified by conditions (1,2) can be moved to West. -->
@@ -97,20 +95,20 @@
         <transition id="move_a_dimer_to_east" date="1630000000" author="Pas moi..."
                   parent="3" probability="1">
 
-            <arrow site="1" weight="0"><coord axis="x" at="0"/></arrow>
-            <arrow site="2" weight="0"><coord axis="x" at="1"/></arrow>
-            <arrow site="1" weight="1"><coord axis="x" at="1"/></arrow>
-            <arrow site="2" weight="1"><coord axis="x" at="2"/></arrow>
+            <arrow site="1" weight="0" x="0"/>
+            <arrow site="2" weight="0" x="1"/>
+            <arrow site="1" weight="1" x="1"/>
+            <arrow site="2" weight="1" x="2"/>
 
       </transition>
 
       <transition id="move_a_dimer_to_west" date="1630000000" author="Ni moi !"
                   parent="4" probability="1">
 
-            <arrow site="1" weight="0"><coord axis="x" at="0"/></arrow>
-            <arrow site="2" weight="0"><coord axis="x" at="1"/></arrow>
-            <arrow site="2" weight="1"><coord axis="x" at="0"/></arrow>
-            <arrow site="1" weight="1"><coord axis="x" at="1"/></arrow>
+            <arrow site="1" weight="0" x="0"/>
+            <arrow site="2" weight="0" x="1"/>
+            <arrow site="2" weight="1" x="0"/>
+            <arrow site="1" weight="1" x="1"/>
 
       </transition>
 
diff --git a/models/testing.xml b/models/testing.xml
new file mode 100644
index 0000000..2a30294
--- /dev/null
+++ b/models/testing.xml
@@ -0,0 +1,83 @@
+<gem-graph-model version="0.2">
+	<!-- Model identity informations -->
+	<identity>
+		<name>Modèle de test</name>
+		<owner>Gaston Lagaffe</owner>
+		<owner_id>2</owner_id>
+		<date>1629830000</date>
+		<version>1.0</version>
+		<g_ref id="texte" date="1629830000" author="Jean" lang="en">Ref</g_ref>
+	</identity>
+	<!-- Model parameters -->
+	<parameters id="texte" date="0" author="Gaston Lagaffe">
+		<simulation>
+			<max_thread>0</max_thread>
+			<max_cycles>9</max_cycles>
+		</simulation>
+		<space-param>
+			<dimension>
+				<!-- loop_on_zero="true"  anything moved before zero reenters at the end of space-->
+				<!-- 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-->
+				<axis name="x" size="29"/>
+				<axis name="y" size="0"/>
+				<axis name="z" size="0"/>
+			</dimension>
+			<!-- Site_multiplicity = number of  sites in a space unit. -->
+			<!-- Each site points towards a neighbouring space unit. -->
+			<!-- Several arrows can be stacked in the same site. -->
+			<site_multiplicity>3</site_multiplicity>
+		</space-param>
+	</parameters>
+	<!-- Model objects definition -->
+	<objects id="texte" date="1629830000" author="Jean Sirmai">
+		<object id="dimer 1-1" date="1629830000" author="Jean Sirmai">
+			<arrow x="0" y="0" z="0" site="1" weight="1"/>
+			<arrow x="1" y="0" z="0" site="2" weight="1"/>
+		</object>
+	</objects>
+	<!-- Saved space description (initial space is sequence 0) -->
+	<savestates id="texte" date="1629830000" author="THE MATRIX">
+		<space id="initial" date="1629830000" author="Jean Sirmai" sequence="0">
+			<arrow x="0" y="0" z="0" site="1" weight="1"/>
+			<arrow x="1" y="0" z="0" site="2" weight="1"/>
+			<arrow x="10" y="0" z="0" site="1" weight="1"/>
+			<arrow x="11" y="0" z="0" site="2" weight="1"/>
+			<arrow x="20" y="0" z="0" site="1" weight="1"/>
+			<arrow x="21" y="0" z="0" site="2" weight="1"/>
+			<!-- Three dimers 1-1 are drawn in the global space
+               at locations (0,1) (10,11) and (20,21) -->
+		</space>
+	</savestates>
+	<!-- Model transitions definition (rules) -->
+	<!-- In this version : <xs:sequence minOccurs="0" maxOccurs="unbounded">-->
+	<!-- Transitions should be edited by hand and written in a 'human-readable' format -->
+	<conditions id="random walk of dimers" date="1629822222" author="Jean">
+		<condition x="0" y="0" z="0" site="1" weight="1" node_id="1" parent="0"/>
+		<condition x="1" y="0" z="0" site="2" weight="1" node_id="2" parent="1"/>
+		<!-- as soon as conditions 1 and 2 are satisfied, a dimer is identified at location (0,1). -->
+		<condition x="2" y="0" z="0" site="1" weight="0" node_id="3" parent="2"/>
+		<!-- as soon as condition 3 is satisfied,
+             the neighbouring space unit to East of the dimer is empty
+             and the dimer identified by conditions (1,2)  can be moved to East. -->
+		<condition x="-1" y="0" z="0" site="2" weight="0" node_id="4" parent="2"/>
+		<!-- as soon as condition 4 is satisfied,
+             the neighbouring space unit to West of the dimer is empty
+             and  the dimer identified by conditions (1,2) can be moved to West. -->
+	</conditions>
+	<transitions>
+		<transition id="move_a_dimer_to_east" date="1629811111" author="Jean" parent="3" probability="1">
+			<arrow x="0" y="0" z="0" site="1" weight="0"/>
+			<arrow x="1" y="0" z="0" site="2" weight="0"/>
+			<arrow x="1" y="0" z="0" site="1" weight="1"/>
+			<arrow x="2" y="0" z="0" site="2" weight="1"/>
+		</transition>
+		<transition id="move_a_dimer_to_west" date="1629811112" author="Jean" parent="4" probability="1">
+			<arrow x="0" y="0" z="0" site="1" weight="0"/>
+			<arrow x="1" y="0" z="0" site="2" weight="0"/>
+			<arrow x="0" y="0" z="0" site="2" weight="1"/>
+			<arrow x="-1" y="0" z="0" site="1" weight="1"/>
+		</transition>
+	</transitions>
+</gem-graph-model>
\ No newline at end of file
diff --git a/schemas/models_0.2.xmls b/schemas/models_0.2.1.xmls
similarity index 77%
rename from schemas/models_0.2.xmls
rename to schemas/models_0.2.1.xmls
index f106f88..b58a130 100644
--- a/schemas/models_0.2.xmls
+++ b/schemas/models_0.2.1.xmls
@@ -14,6 +14,13 @@
 <xs:attribute name="probability" type="xs:integer"/>
 <xs:attribute name="site" type="xs:integer" default="0"/>
 <xs:attribute name="weight" type="xs:integer" default="0"/>
+<xs:attribute name="u" type="xs:integer"/>
+<xs:attribute name="v" type="xs:integer"/>
+<xs:attribute name="w" type="xs:integer"/>
+<xs:attribute name="x" type="xs:integer"/>
+<xs:attribute name="y" type="xs:integer"/>
+<xs:attribute name="z" type="xs:integer"/>
+<xs:attribute name="t" type="xs:integer"/>
 
 
 <xs:attributeGroup name="id_date_author">
@@ -35,40 +42,45 @@
 
 <xs:element name="quote" substitutionGroup="g_ref"/>
 
-<xs:element name="coord">
-    <xs:complexType>
-        <xs:attribute name="axis" type="xs:string" use="required"/>
-        <xs:attribute name="at" type="xs:integer" use="required"/>
-    </xs:complexType>
-</xs:element>
-
 <xs:element name="dimension">
     <xs:complexType>
-    <xs:sequence minOccurs="1" maxOccurs="unbounded">
-        <xs:element ref="coord"/>
-    </xs:sequence>
+        <xs:attribute ref="u" use="optional"/>
+        <xs:attribute ref="v" use="optional"/>
+        <xs:attribute ref="w" use="optional"/>
+        <xs:attribute ref="x" use="optional"/>
+        <xs:attribute ref="y" use="optional"/>
+        <xs:attribute ref="z" use="optional"/>
+        <xs:attribute ref="t" use="optional"/>
     </xs:complexType>
 </xs:element>
 
 <xs:element name="arrow">
     <xs:complexType>
-        <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element ref="coord"/>
-        </xs:sequence>
-        <xs:attribute name="site" use="required"/>
-        <xs:attribute name="weight" use="required"/>
+        <xs:attribute ref="site" use="required"/>
+        <xs:attribute ref="weight" use="required"/>
+        <xs:attribute ref="u" use="optional"/>
+        <xs:attribute ref="v" use="optional"/>
+        <xs:attribute ref="w" use="optional"/>
+        <xs:attribute ref="x" use="optional"/>
+        <xs:attribute ref="y" use="optional"/>
+        <xs:attribute ref="z" use="optional"/>
+        <xs:attribute ref="t" use="optional"/>
     </xs:complexType>
 </xs:element>
 
 <xs:element name="condition">
     <xs:complexType>
-        <xs:sequence minOccurs="1" maxOccurs="unbounded">
-            <xs:element ref="coord" minOccurs="1" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="site" use="required"/>
-        <xs:attribute name="weight" use="required"/>
+        <xs:attribute ref="site" use="required"/>
+        <xs:attribute ref="weight" use="required"/>
         <xs:attribute ref="node_id" use="required"/>
         <xs:attribute ref="parent" use="required"/>
+        <xs:attribute ref="u" use="optional"/>
+        <xs:attribute ref="v" use="optional"/>
+        <xs:attribute ref="w" use="optional"/>
+        <xs:attribute ref="x" use="optional"/>
+        <xs:attribute ref="y" use="optional"/>
+        <xs:attribute ref="z" use="optional"/>
+        <xs:attribute ref="t" use="optional"/>
     </xs:complexType>
 </xs:element>