skip events without assignments in SBML

Author: metelkin

cases/11-time-switcher/master/sbml/nameless.xml

@@ -120,18 +120,6 @@
     </listOfReactions>
 
     <listOfEvents>
-      <event
-        id="sw0"
-        >
-        <trigger>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-              
-              
-              
-            
-          </math>
-        </trigger>
-      </event>
       <event
         id="sw1"
         >

cases/16-d-switcher/master/sbml/nameless.xml

@@ -147,15 +147,6 @@
 
         </listOfEventAssignments>
       </event>
-      <event
-        id="sw2"
-        >
-        <trigger>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <apply><and/><apply><lt/><ci>S1</ci><cn>10</cn></apply><apply><gt/><csymbol definitionURL="http://www.sbml.org/sbml/symbols/time">t</csymbol><cn>400000</cn></apply></apply>
-          </math>
-        </trigger>
-      </event>
     </listOfEvents>
 
 

cases/20-syntax/master/sbml/nameless.xml

@@ -187,57 +187,6 @@
 
         </listOfEventAssignments>
       </event>
-      <event
-        id="ts2"
-        >
-        <trigger>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-              
-              <apply><geq/>
-                  <apply><minus/>
-                    <apply><divide/>
-                      <apply><minus/>
-                        <csymbol definitionURL="http://www.sbml.org/sbml/symbols/time">t</csymbol>
-                        <cn>0</cn>
-                      </apply>
-                      <ci>period2</ci>
-                    </apply>
-                    <apply><floor/>
-                      <apply><plus/>
-                        <apply><divide/>
-                          <apply><minus/>
-                            <csymbol definitionURL="http://www.sbml.org/sbml/symbols/time">t</csymbol>
-                            <cn>0</cn>
-                          </apply>
-                          <ci>period2</ci>
-                        </apply>
-                        <cn>0.5</cn>
-                      </apply>
-                    </apply>
-                  </apply>
-                  <cn>0</cn>
-                </apply>
-              
-              
-            
-          </math>
-        </trigger>
-      </event>
-      <event
-        id="cs1"
-        >
-        <trigger>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            
-            <apply>
-              <geq/>
-              <apply><minus/><ci>k1</ci><cn>1</cn></apply>
-              <cn>0</cn>
-            </apply>
-            
-          </math>
-        </trigger>
-      </event>
     </listOfEvents>
 
 

src/templates/sbml.xml.njk

@@ -378,6 +378,8 @@
     <listOfEvents>
       {%- for event in listOfTimeEvents -%}
       {%- set startMathML = '<ci>' + event.start + '</ci>' if event.start is defined else '<cn>'+ event.startObj.num + '</cn>' %}
+      {%- set eventAssignments = population.selectRecordsByContext(event.id) -%}
+      {%- if eventAssignments|length > 0 %}{# skip events with no assignments #}
       <event
         id="{{event.id}}"
         {#- metaid="{{event.index}}" #}
@@ -422,8 +424,6 @@
             {% if not event.active %}</apply>{% endif %}
           </math>
         </trigger>
-        {%- set eventAssignments = population.selectRecordsByContext(event.id) -%}
-        {%- if eventAssignments|length > 0 %}
         <listOfEventAssignments>
           {% for record in eventAssignments %}
           <eventAssignment
@@ -434,10 +434,12 @@
           </eventAssignment>
           {% endfor %}
         </listOfEventAssignments>
-        {%- endif %}
       </event>
+      {%- endif %}
       {%- endfor %}
       {%- for event in listOfCEvents %}
+      {%- set eventAssignments = population.selectRecordsByContext(event.id) -%}
+      {%- if eventAssignments|length > 0 %}
       <event
         id="{{event.id}}" 
         {#- metaid="{{event.index}}" #}
@@ -453,8 +455,6 @@
             {% if not event.active %}</apply>{% endif %}
           </math>
         </trigger>
-        {%- set eventAssignments = population.selectRecordsByContext(event.id) -%}
-        {%- if eventAssignments|length > 0 %}
         <listOfEventAssignments>
           {% for record in eventAssignments %}
           <eventAssignment
@@ -465,10 +465,12 @@
           </eventAssignment>
           {% endfor %}
         </listOfEventAssignments>
-        {%- endif %}
       </event>
+      {%- endif %}
       {%- endfor %}
       {%- for event in listOfDEvents %}
+      {%- set eventAssignments = population.selectRecordsByContext(event.id) -%}
+      {%- if eventAssignments|length > 0 %}
       <event
         id="{{ event.id }}" 
         {#- metaid="{{ event.index }}" #}
@@ -480,8 +482,6 @@
             {%- if not event.active %}</apply>{% endif %}
           </math>
         </trigger>
-        {%- set eventAssignments = population.selectRecordsByContext(event.id) -%}
-        {%- if eventAssignments|length > 0 %}
         <listOfEventAssignments>
           {% for record in eventAssignments %}
           <eventAssignment
@@ -492,8 +492,8 @@
           </eventAssignment>
           {% endfor %}
         </listOfEventAssignments>
-        {%- endif %}
       </event>
+      {%- endif %}
       {%- endfor %}
     </listOfEvents>
   {% endif %}