Add all the gate as nodeType

cosyverif/adtree.fml

@@ -2,6 +2,10 @@
 
 <!-- ================================================ -->
 <!-- Attack-Defence Tree definition                   -->
+<!--                                                  -->
+<!-- Notes :                                          -->
+<!--   1) functions ?                                 -->
+<!--   2) conditions ?                                -->
 <!-- ================================================ -->
 
 <formalism name="ADTree" xmlns="http://cosyverif.org/ns/formalism">
@@ -15,7 +19,11 @@
   <nodeType name="AND"/>
   <nodeType name="SAND"/>
   <nodeType name="CAND"/>
+  <nodeType name="SCAND"/>
   <nodeType name="OR"/>
+  <nodeType name="SOR"/>
+  <nodeType name="COR"/>
+  <nodeType name="SCOR"/>
 
   <!-- leaf object attributes -->
   <leafAttribute name="name" refType="leaf" defaultValue=""/>
@@ -31,13 +39,6 @@
     <child refname="attribute" minOccurs="0" />
   </complexAttribute>
 
-  <!-- OR object attributes -->
-  <leafAttribute name="name" refType="OR" defaultValue=""/>
-  <leafAttribute name="role" refType="OR" defaultValue="ATTACK"/>
-  <complexAttribute name="attributes" refType="OR" >
-    <child refname="attribute" minOccurs="0" />
-  </complexAttribute>
-
   <!-- SAND object attributes -->
   <leafAttribute name="name" refType="SAND" defaultValue=""/>
   <leafAttribute name="role" refType="SAND" defaultValue="ATTACK"/>
@@ -52,6 +53,41 @@
     <child refname="attribute" minOccurs="0" />
   </complexAttribute>
 
+  <!-- SCAND object attributes -->
+  <leafAttribute name="name" refType="SCAND" defaultValue=""/>
+  <leafAttribute name="role" refType="SCAND" defaultValue="ATTACK"/>
+  <complexAttribute name="attributes" refType="SCAND" >
+    <child refname="attribute" minOccurs="0" />
+  </complexAttribute>
+
+  <!-- OR object attributes -->
+  <leafAttribute name="name" refType="OR" defaultValue=""/>
+  <leafAttribute name="role" refType="OR" defaultValue="ATTACK"/>
+  <complexAttribute name="attributes" refType="OR" >
+    <child refname="attribute" minOccurs="0" />
+  </complexAttribute>
+
+  <!-- SOR object attributes -->
+  <leafAttribute name="name" refType="SOR" defaultValue=""/>
+  <leafAttribute name="role" refType="SOR" defaultValue="ATTACK"/>
+  <complexAttribute name="attributes" refType="SOR" >
+    <child refname="attribute" minOccurs="0" />
+  </complexAttribute>
+
+  <!-- COR object attributes -->
+  <leafAttribute name="name" refType="COR" defaultValue=""/>
+  <leafAttribute name="role" refType="COR" defaultValue="ATTACK"/>
+  <complexAttribute name="attributes" refType="COR" >
+    <child refname="attribute" minOccurs="0" />
+  </complexAttribute>
+
+  <!-- SCOR object attributes -->
+  <leafAttribute name="name" refType="SCOR" defaultValue=""/>
+  <leafAttribute name="role" refType="SCOR" defaultValue="ATTACK"/>
+  <complexAttribute name="attributes" refType="SCOR" >
+    <child refname="attribute" minOccurs="0" />
+  </complexAttribute>
+
   <!-- gates attributes -->
   <complexAttribute name="attribute">
     <child refname="name" minOccurs="1" maxOccurs="1" />

cosyverif/treasure_hunters.grml

 <?xml version="1.0" encoding="UTF-8"?>
 
-<model formalismUrl="http://formalisms.cosyverif.org/adtree.fml" xmlns="http://cosyverif.org/ns/model">
+<model formalismUrl="http://formalisms.cosyverif.org/adtree.fml"
+       xmlns="http://cosyverif.org/ns/model">
 
   <!-- root gate -->
-  <attribute name="root"></attribute>
+  <attribute name="root">9</attribute>
 
   <!-- ================================================ -->
   <!-- Leaves                                           -->