From 5b1e27d670bb4d32cf2d96c0532fe7ded57b18e1 Mon Sep 17 00:00:00 2001
From: Jean Sirmai <jean@a-lec.org>
Date: Tue, 14 Dec 2021 19:45:09 +0100
Subject: [PATCH] WIP: Struggling to slide through pipeline (I)

---
 models/dimers random walk.xml        |  11 +++--
 schemas/models_0.2.1.xmls            |   4 +-
 src/__pycache__/model.cpython-39.pyc | Bin 17885 -> 18666 bytes
 src/glimpse.py                       |  69 ++++++++++++++-------------
 src/model.py                         |  29 +++++++++--
 5 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml
index 1753767..299346b 100644
--- a/models/dimers random walk.xml	
+++ b/models/dimers random walk.xml	
@@ -55,31 +55,32 @@
 
     <states id="texte" date="1630000000" author="Here, states are spaces.">
         <space id="initial" date="1630000000" author="Une souris verte,">
-            <arrow site="0" weight="8" x="0"/>
+            <arrow site="0" weight="6" x="0"/>
             <arrow site="1" weight="1" x="0"/>
             <arrow site="2" weight="7" x="1"/>
-            <arrow site="1" weight="1" x="6"/>
+            <arrow site="1" weight="3" x="6"/>
             <arrow site="2" weight="1" x="7"/>
             <arrow site="1" weight="4" x="14"/>
             <arrow site="0" weight="8" x="14"/>
             <arrow site="2" weight="5" x="15"/>
             <arrow site="1" weight="2" x="17"/>
             <arrow site="2" weight="7" x="18"/>
-            <arrow site="2" weight="4" x="20"/>
+            <arrow site="2" weight="9" x="20"/>
+            <arrow site="0" weight="4" x="20"/>
 
         </space>
 
     </states>
 
     <!-- Model transitions definition (rules) -->
-    <!-- In this version : <xs:sequence minOccurs="0" maxOccurs="unbounded">-->
+    <!-- In this version : <xs:sequence minOccurs="1" maxOccurs="unbounded">-->
     <!-- Transitions should be edited by hand and written in a 'human-readable' format -->
 
     <conditions id="random walk of dimers" date="1630000000" author="Zazard le lézard !">
 
         <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). -->
+        <!-- as soon as conditions 1 and 2 are satisfied, a dimer is identified at location (0,1). -->
 
         <condition site="1" weight="0" node_id="3" parent="2" x="2"/>
         <!-- as soon as condition 3 is satisfied,
diff --git a/schemas/models_0.2.1.xmls b/schemas/models_0.2.1.xmls
index edbd775..07f69b0 100644
--- a/schemas/models_0.2.1.xmls
+++ b/schemas/models_0.2.1.xmls
@@ -170,7 +170,7 @@
 
       <xs:element name="conditions">
           <xs:complexType>
-          <xs:sequence minOccurs="0" maxOccurs="unbounded">
+          <xs:sequence minOccurs="1" maxOccurs="unbounded">
               <xs:element minOccurs="0" ref="quote"/>
               <xs:element ref="condition"/>
           </xs:sequence>
@@ -180,7 +180,7 @@
 
       <xs:element name="transitions">
           <xs:complexType>
-          <xs:sequence minOccurs="0" maxOccurs="unbounded">
+          <xs:sequence minOccurs="1" maxOccurs="unbounded">
               <xs:element ref="transition"/>
           </xs:sequence>
           </xs:complexType>
diff --git a/src/__pycache__/model.cpython-39.pyc b/src/__pycache__/model.cpython-39.pyc
index 56fcbb6284a5e2aec2c0f71731ad3eca49fe8403..838b6bd97902d88d231fd6f2146f5a361c293aa9 100644
GIT binary patch
delta 1967
zcmZ`(eNa?Y6n|$w9t$kXvV1HeE2yX}$N~z2g34zWGa!cK#8kNLd%_yHdiOahv*}FW
zXPM$L&7{QAK@&`6CM(n^v#F`c>7V{sr>UlYs=xY}W}0SdI_CmAj@8?FzdgVE&OP^>
z-?{gG{XG0M2!;Nnqy&W?y!VcO*<wZcp2_`>g-8v(;rzkEi9LF9zq!M?M$u+#*#nA}
z-EZnhA?DHM5Sv5HMJz|lC6-GpmDpTu9<h1E(umF1@`&XTODDEKTS#mnu?%fdhg-|<
z$ka1*x1LEOvouqi;`RQ>$#@}Z)eWJKx5GnT=)j?ZlhBWU<-4)duHw4F^2C1f5{V20
zI9S*Oc{uD`u!jQJqPF!y*IPoG9#A>f^uxA^-g<h&`2-P&D4j~gL<n69p($b}G)F9i
zmWY+mswr)XU`4#DNTR=}y45fAEk@K7=oU}&fF&F>^r*T+4|a7M9&)qMsPq;4*kUJf
zfZ-s*+*EAMw&dghrC_Hq1=OjZNrk?YnY8h0LKfPS;!}8GBbEV(B>d9io+X3lQ;6R<
zLSN#{G#_p&O~pCZ_&vEa9#J+c!w`Y90E$61ZdMGl28X#?g{$(KT1aH`Gx{#CMeL^u
zVk<#Z4TprGYjO>*Nfr~e2D&?gnuup73A}-#@qSI~40H#3v;r=Nb5+0&eXjMz)AIXb
z9xbGckEa(ilrYHFv83Wf>R)F1UNSu#i2GzS+2U;`u@}F~^x(b1Nhrmk#m_<+W)+3h
zL7ub@Yt5;N@nPNQ41_{LtHiOQ*0?F519&wn$86|TxX8E8b%NcI;Nny{;s8&@N!4oQ
z)~&)3-`Y5Fki7z=Zzc{ew8l-fvljD;+gz_a7~r4`u-Y=?)_@m^_re<Vl|1fxZN_<8
zJaI-kkCvoB6W%J>5I40erdFybO@(IsrZfZnrH!uFADp^RPW_CWTFI%#cZ?lgVmQfg
zis3ZFs|>>oXBpmLILE45kC0h{o0sIk5vgVJ{9^oS$x&iwDzae%4lHel5qYley48e0
zXp0s!f}t%>B9yhj1t~{&SvqXQ-DRtsBOF)u?IK%m;^4CE)b-pm-t#uFm~5)eEY2eo
zG~nv;Vc3M<mbb$w#m|NwY+JT8aWocUyX^WU;(=J#Wdw04mT5x8akwNi4dac9$KbNe
zw4l-nyRfRV72c8wo~z7&2u@ViI4{SdUt#MiFX0{|bL+p79FvPo%xS{2%UfXpe_h^&
zSe0gFjrZeIE80}vGU7O&Su1OP2=A_FQsrji=DAhbgu_@})tngHV&Y}#&z(7nqg9Wn
za_>z0bE^<DtJfyRc9a;B{@lM4c&NH8>;GHKwcyXy7I+SSuP%ot=(;P%jVp8QTH1ip
zVb{{>NN0=>tn@(gIECwo-`U#}4s`3ieyqt(gVW=8R*ix6I(-_!9W?^pW$hgHE;>L#
zjc&A{vFkcIYun&GDQcuPnXDIT+hIcTKWpu96XWV0g&UIdAqg9PLk~~l?z$oza?ggh
z>5C_aZf*TG>&=&~0)38Vx`}&yybyoFUvjeWi<%7eJbe{6Ww0OWlHp_gqpnruW{F#J
za8tb#KE)mN`zY?;^*;C<iyCIHPWsP#gv%1|GfXmk!0;i%ZHA8+?l649D&}7!^Au;8
zMh0CqcAL{?zW*oKqc0yP8$3(>+l^4K-|&%~eR)1#@sy_F;$E&Q+*#sV;w$yt=M?s4
z9cygP+sVuEohJAQ3Rx^~b|EX=#@03LYJ3<L<CR8_%bDuPb0j;G94?33QDLEj@DHC#
B_TvBm

delta 1392
zcmZ`(ZA@Eb6z=KA-Q7w{DNq`0`347Mw-j2&V0=l(kc6#RnS;e(<zBbOLAUodPHUEE
zK(@I}EoXBMKQ>HYUra~Xmojxr{OOPR%Y?+}^pEkMztkU#o^yv}&Ul;q<UIF1=RM~=
z&w2Z62EIQEwQ+}Ior#{_k?V1-#$@`L$-|F@NC&;TH&eUx{J422d#g!(O!ZBeR39-H
zF~3?wtcX|+v0}A^SP3yVu~M~+SQ)WgV&!TDu?k{&YUNPAS~cX+^0a)-LthG1bIerz
z_~K58Rl_pQ*PMb0{Isb6lUWkRYs2;lszTTq-oTmKUfiYJh9dL@4niqT2a?iZUh2nw
zORjybuBC=Yl1ZUf;)c4YylmAIDNT&vox);EN?VU}b^Y$+?Efag1+$RZev4!Au4J>Z
zcP&;0x36244rqzpdr}m8&+5f1Rkk$`J}7uL7;{fOx(DLx!90vwtt)Opa`RwweG)==
zv3}5f>Ysq>m89<(N!K^zz(#Ctc!m=0iwkXRHDN<8G~?F|yWH<T8u<YRLsig<J3}4H
z5nepT@HRt+;RM6G45t~U89rqAh}!3^oFvl^B&>%F8DxuWrT1SyF^Ru<{a6zI3MTQ#
zun!`5KRf_4hAcl6NVu<YE%ai#aT|PWwC7%9KJ?-5jcw8lC$i(MP+7qlGCMgDH(3U&
zS(aprID<Jg5xlwaEW~iIX#nPEQy&cCH%$#NH?^rOf0n$X944)XiP@EU0yw_u1k4&W
zJ%{1u9dMp&%2{^qCgD>eK1K>Al4CF6)#fN%FlzI+cp!nHmJZi>+VH_3U1aMLx1-=3
zna}>G%5z4-yDihOA79)YgF~28nrq{3r|`SYF^R`V95p_2_YYuCYcCwfWSif{LZtCp
zYoC2}(8N22C#!Q1E8CugDZ`V6dJQve+wH64Bu*Nhtll_U+Czo^FEIAE`yh#9?O}Kt
zziruqf66W^-K4xlTZbRuGM0Ci!I8!8&dXq1p#4tbA5REa<eoUQxLpaA#x0S0Wfn7C
zF}P|p>wZ@@wbT(AfNKVSHIfCF@NncQxNdO12YM==()3U8ugC_x-Bm2H&f*3yy9^md
zl4Gi&g1&%1ZHY?UVR6$4k9NB#QM`K+uHY}-%8nb{cr&e=AnoW&s@h&fkH4f1$MtR1
zSwi8!07D&v@fW}+5uY)9&alLAi{T4~FB$Hzu2u779^&oYWXNVYOLjdx<bv1JCAhHF
zU;gsw-n36q0{X}vZ8WY2M!67uxK628f(k9_)n0_2zCyk^!Z<C@s4&j8pRIWmJv~r^
WOFe#<v%;C}bU58kuQOz&q5m5q%X8lV

diff --git a/src/glimpse.py b/src/glimpse.py
index 7ba9908..8760062 100644
--- a/src/glimpse.py
+++ b/src/glimpse.py
@@ -1,9 +1,9 @@
 import model
-from anytree import Node, AnyNode, NodeMixin, RenderTree, find_by_attr
-from anytree.exporter import DotExporter
-from ete3 import Tree
+# from anytree import Node, AnyNode, NodeMixin, RenderTree, find_by_attr
+# from anytree.exporter import DotExporter         from ete3 import Tree
 
-# https://stackoverflow.com/questions/51902250/read-data-from-a-file-and-create-a-tree-using-anytree-in-python
+# https://stackoverflow.com/questions/51902250/
+#                read-data-from-a-file-and-create-a-tree-using-anytree-in-python
 # https://www.delftstack.com/howto/python/trees-in-python/
 # https://python-gtk-3-tutorial.readthedocs.io/en/latest/treeview.html
 # https://anytree.readthedocs.io/en/latest/
@@ -14,48 +14,50 @@ from ete3 import Tree
 
 conditions_set = set()
 
-for i in range (0, len(model.testmodel.get_conditions().get_conditions_array())):
+# TODO                  cnd.get_coord("y"),...
+for i in range(0, len(model.testmodel.get_conditions().get_conditions_array())):
     cnd = model.testmodel.get_conditions().get_condition(i)
     conditions_set.add((cnd.get_node_self_id(),
                         cnd.get_node_parent_id(),
                         cnd.get_coord("x"),
-# TODO                  cnd.get_coord("y"),...
                         cnd.get_site(),
                         cnd.get_weight()))
 
+
 class TreeNode(object):
 
+# TODO  self.y = y,...
     def __init__(self, id, parent, x, site, weight):
         self.id = id
         self.parent = parent
         self.ch = []
         self.x = x
-# TODO  self.y = y,...
         self.site = site
         self.weight = weight
 
-    def id(self): return id
+    def id(self):
+        return id
 
-    def add_child(self,ch_id):
+    def add_child(self, ch_id):
         self.ch.append(ch_id)
         self.ch = sorted(self.ch, key=id)
 
-l = []
+lll = []
 
 for i in conditions_set: # sorted(conditions_set, key=id):
     cndt = TreeNode(i[0], i[1], i[2], i[3], i[4])   # TODO y,z,...
-    l.append(cndt)
+    lll.append(cndt)
 
-for i in l:
-    for j in l:
+for i in lll:
+    for j in lll:
         if (i.id == j.parent):
             i.add_child(j)
 
-print('\n',"Liste des conditions (node_id, parent_id, nb d'enfants, +/- liste des enfants)",'\n')
+print('\n', "Liste des conditions (node_id, parent_id, nb d'enfants, +/- liste des enfants)", '\n')
 
 affichage = ''
 
-for i in l:
+for i in lll:
     affichage = str(i.id) + '   ' + str(i.parent) + '    n=' + str(len(i.ch)) + '    '
     if len(i.ch) > 0:
         for c in range (0, len(i.ch)):
@@ -63,10 +65,8 @@ for i in l:
     print(affichage)
 
 
-
-
 ##
-
+"""
 A = Node("A")
 A1 = Node("A1", parent=A)
 A2 = Node("A2", parent=A)
@@ -74,7 +74,7 @@ A21 = Node("A21", parent=A2)
 
 root = Node([0])
 
-"""
+
 
 https://python-gtk-3-tutorial.readthedocs.io/en/latest/treeview.html
 
@@ -95,8 +95,6 @@ with open('input.txt', 'r') as f:
     for pre, _, node in RenderTree(root):
         print("%s%s" % (pre, node.name))
 """
-
-
 ##
 
 
@@ -105,13 +103,19 @@ with open('input.txt', 'r') as f:
 
 ##
 
+print("\n*** Conditions tree ***")
+print(type(model.testmodel.get_conditions()))
+print("\n")
+print(model.testmodel.get_conditions().get_condition(0).get_coord('x'))
+print("\n")
+print()
+
 
 sp = model.testmodel.get_states().get_space(0)
 size = model.testmodel.get_parameters().spaceparam.get_dimension().get_x()
-nb_sites = int (model.testmodel.get_parameters().spaceparam.get_site_multiplicity())
-nb_arrows = int (model.testmodel.get_states().get_space(0).get_nb_arrows())
+nb_sites = int(model.testmodel.get_parameters().spaceparam.get_site_multiplicity())
+nb_arrows = int(model.testmodel.get_states().get_space(0).get_nb_arrows())
 
-print()
 print("space size = ", size, "   nb de sites par cellule = ", nb_sites,
         "   nb total de flèches dans l'espace = ", nb_arrows)
 print('  | ',end=' ')
@@ -126,19 +130,20 @@ print('  | ',end=' ')
 #       2) pas de node sans un node_parent_id
 
 
-for n in range (0, size + 1):
-    for s in range (0, nb_sites):
+for n in range(0, size + 1):
+    for s in range(0, nb_sites):
         arr = 0
-        for a in range (0, nb_arrows):
-            if (sp.get_arrow(a).get_coord("x") == n and sp.get_arrow(a).get_site() == s):
+        for a in range(0, nb_arrows):
+            if (sp.get_arrow(a).get_coord("x") == n
+            and sp.get_arrow(a).get_site() == s):
                 arr = sp.get_arrow(a).get_weight()
         if arr > 0:
             print(str(arr),end=' ')
         else:
             print('.',end=' ')
     print(' | ',end=' ')
-print('\n      ',end=' ')
+print('\n ' + ' ' * nb_sites * 2,end='')
 
-for k in range (0, size + 1):
-    if k < 9: print(k+1,end='         ')
-    else:     print(k+1,end='        ')
+for k in range(0, size + 1):
+    if k < 9: print(k+1,end='   '+ ' ' * nb_sites * 2)
+    else:     print(k+1,end='  '+ ' ' * nb_sites * 2)
diff --git a/src/model.py b/src/model.py
index 705fd70..c1989e1 100644
--- a/src/model.py
+++ b/src/model.py
@@ -279,8 +279,27 @@ class States:
     def get_space(self, i):
         return self.__space[i]
 
-## Conditions
 
+##  Conditions Tree
+
+class TreeNode(object):
+
+    def __init__(self, id, parent, x, site, weight):
+        self.id = id
+        self.parent = parent
+        self.ch = []
+        self.x = x
+# TODO  self.y = y,...
+        self.site = site
+        self.weight = weight
+
+    def id(self): return id
+
+    def add_child(self,ch_id):
+        self.ch.append(ch_id)
+        self.ch = sorted(self.ch, key=id)
+
+## Conditions
 
 class Condition:
     def __init__(self, node):
@@ -387,7 +406,6 @@ class Arrow:
     def set_weight(self, weight):
         self.node.attrib["weight"] = str(weight)
 
-
 class Model:
 
     def __init__(self, modelpath, schemapath):
@@ -430,6 +448,9 @@ class Model:
     def get_states(self):
         return States(self.__states)
 
+    def get_tree(self):
+        return self.tree
+
     def get_conditions(self):
         return Conditions(self.__conditions)
 
@@ -440,8 +461,8 @@ class Model:
         self.tree.write("../models/" + name + ".xml", encoding="utf-8")
 
 
-modelPath = "../models/dimers random walk.xml"
-schemaPath = "../schemas/models_0.2.1.xmls"
+modelPath = "../models/dimers random walk.automat.xml"
+schemaPath = "../schemas/models_0.2.1.automat.xmls"
 
 testmodel = Model(modelPath, schemaPath)