From 71ddf7dd3d2bcbc6a0d07cd5c8bd8f77a893e655 Mon Sep 17 00:00:00 2001
From: Jean Sirmai <jean@a-lec.org>
Date: Thu, 9 Dec 2021 15:59:38 +0100
Subject: [PATCH] WIP : working on space data structures coherence.

---
 models/dimers random walk.xml        |  13 ++++++-------
 src/__pycache__/model.cpython-39.pyc | Bin 16531 -> 16531 bytes
 src/glimpse.py                       |   6 ++++++
 src/model.py                         |   2 ++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index 962989b..89bb2eb 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -34,7 +34,7 @@
             <!-- Each site points towards a neighbouring space unit. -->
             <!-- Several arrows can be stacked in the same site. -->
 
-            <site_multiplicity>6</site_multiplicity>
+            <site_multiplicity>5</site_multiplicity>
 
         </space-param>
 
@@ -60,13 +60,12 @@
             <arrow site="2" weight="7" x="1"/>
             <arrow site="1" weight="1" x="6"/>
             <arrow site="2" weight="1" x="7"/>
-            <arrow site="1" weight="8" x="15"/>
+            <arrow site="1" weight="1" x="15"/>
+            <arrow site="0" weight="8" x="15"/>
             <arrow site="2" weight="1" x="16"/>
-            <arrow site="1" weight="9" x="28"/>
-            <arrow site="5" weight="9" x="29"/>
-
-          <!-- Three dimers 1-1 are drawn in the global space
-               at locations (0,1) (6,7) and (15,16) -->
+            <arrow site="1" weight="1" x="28"/>
+            <arrow site="2" weight="1" x="29"/>
+            <arrow site="4" weight="9" x="29"/>
 
         </space>
 
diff --git a/src/__pycache__/model.cpython-39.pyc b/src/__pycache__/model.cpython-39.pyc
index 9faf52415622d061c5346f9a38755ca0117c64f1..d04e8cba041364abccf9da8e87ec8da020537f4f 100644
GIT binary patch
delta 24
ecmbQ-$T+!?kvEZ-mx}=iR3$ehuHDGn<^TXn4hBB}

delta 24
ecmbQ-$T+!?kvEZ-mx}=i*4){cIBO$sn*#t;e+P8{

diff --git a/src/glimpse.py b/src/glimpse.py
index 27b2053..e3b8b64 100644
--- a/src/glimpse.py
+++ b/src/glimpse.py
@@ -7,6 +7,12 @@ nb_sites = int (model.testmodel.get_parameters().spaceparam.get_site_multiplicit
 nb_arrows = int (model.testmodel.get_states().get_space(0).get_nb_arrows())
 weight = int (model.testmodel.get_states().get_space(0).get_arrow(0).get_weight())
 
+# TODO  Contrôles cohérence des données  (module à prévoir)
+    # pour condition et arrow : weight < weight_max (à définir)
+    # pour condition et arrow : arrow.site < site_multiplicity
+    # pour condition et arrow : arrow.x < space-param.dimension.x (idem autres axes)
+    # condition.parent <= condition.node_id max value  (donc deux lectures)
+
 space = []
 cells = []
 sites = []
diff --git a/src/model.py b/src/model.py
index ebb365c..411b5d1 100644
--- a/src/model.py
+++ b/src/model.py
@@ -414,3 +414,5 @@ modelPath = "../models/dimers random walk.xml"
 schemaPath = "../schemas/models_0.2.1.xmls"
 
 testmodel = Model(modelPath, schemaPath)
+
+# TODO weight_max