Max min to dev

ci/run-apitest.sh

@@ -6,9 +6,14 @@
 #
 # Run api tests on GitHub actions
 
-python examples/apitest.py
-python examples/apitest2.py
-python examples/loadtest.py
+cd examples
+python apitest.py
+python apitest2.py
+python apitest3.py
+python loadtest.py
+python apitest_maxmin.py
+cd ..
+
 
 # Update NeuroML2 path for CI
 if [ "$CI" = "true" ]; then

examples/apitest_maxmin.py

@@ -0,0 +1,35 @@
+#! /usr/bin/python
+
+import lems.api as lems
+
+model = lems.Model()
+
+#model.add(lems.Include("maxmin.xml"))
+
+model.add(lems.Dimension("voltage", m=1, l=3, t=-3, i=-1))
+model.add(lems.Dimension("time", t=1))
+model.add(lems.Dimension("capacitance", m=-1, l=-2, t=4, i=2))
+
+model.add(lems.Unit("milliVolt", "mV", "voltage", -3))
+model.add(lems.Unit("milliSecond", "ms", "time", -3))
+model.add(lems.Unit("microFarad", "uF", "capacitance", -12))
+
+iaf1 = lems.ComponentType("iaf1")
+model.add(iaf1)
+
+iaf1.add(lems.Parameter("threshold", "voltage", minval=-44, maxval=55))
+iaf1.add(lems.Parameter("reset", "voltage"))
+
+
+fn = "maxmin.xml"
+model.export_to_file(fn)
+
+print("----------------------------------------------")
+print(open(fn, "r").read())
+print("----------------------------------------------")
+
+print("Written generated LEMS to %s" % fn)
+
+from lems.base.util import validate_lems
+
+validate_lems(fn)

examples/maxmin.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<Lems xmlns="http://www.neuroml.org/lems/0.7.6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/lems/0.7.6 https://raw.githubusercontent.com/LEMS/LEMS/development/Schemas/LEMS/LEMS_v0.7.6.xsd">
+  <Dimension name="voltage" m="1" l="3" t="-3" i="-1"/>
+  <Dimension name="time" t="1"/>
+  <Dimension name="capacitance" m="-1" l="-2" t="4" i="2"/>
+  <Unit symbol="mV" dimension="voltage" power="-3" scale="1.0"/>
+  <Unit symbol="ms" dimension="time" power="-3" scale="1.0"/>
+  <Unit symbol="uF" dimension="capacitance" power="-12" scale="1.0"/>
+  <ComponentType name="iaf1" description="">
+    <Parameter name="threshold" dimension="voltage"/>
+    <Parameter name="reset" dimension="voltage"/>
+  </ComponentType>
+</Lems>

lems/model/component.py

@@ -21,7 +21,7 @@ class Parameter(LEMSBase):
     Stores a parameter declaration.
     """
 
-    def __init__(self, name, dimension, description=""):
+    def __init__(self, name, dimension, minval=None, maxval=None, description=""):
         """
         Constructor.
 
@@ -63,6 +63,14 @@ def __init__(self, name, dimension, description=""):
 
         :type: str """
 
+        self.minval = minval
+        """ Minimum value of this parameter.
+        :type: str """
+
+        self.maxval = maxval
+        """ Maximum value of this parameter.
+        :type: str """
+
     def toxml(self):
         """
         Exports this object into a LEMS XML object
@@ -332,7 +340,7 @@ class Exposure(LEMSBase):
     Stores a exposure specification.
     """
 
-    def __init__(self, name, dimension, description=""):
+    def __init__(self, name, dimension, minval=None, maxval=None, description=""):
         """
         Constructor.
 
@@ -344,6 +352,14 @@ def __init__(self, name, dimension, description=""):
 
         :type: str """
 
+        self.minval = minval
+        """ Minimum value of this parameter.
+        :type: str """
+
+        self.maxval = maxval
+        """ Maximum value of this parameter.
+        :type: str """
+
         self.dimension = dimension
         """ Physical dimension of the exposure.
 

lems/model/dynamics.py

@@ -16,7 +16,7 @@ class StateVariable(LEMSBase):
     Store the specification of a state variable.
     """
 
-    def __init__(self, name, dimension, exposure=None):
+    def __init__(self, name, dimension, minval=None, maxval=None, exposure=None):
         """
         Constructor.
 
@@ -28,6 +28,14 @@ def __init__(self, name, dimension, exposure=None):
 
         :type: str """
 
+        self.minval = minval
+        """ Minimum value of this parameter.
+        :type: str """
+
+        self.maxval = maxval
+        """ Maximum value of this parameter.
+        :type: str """
+
         self.dimension = dimension
         """ Dimension of the state variable.
 
@@ -185,9 +193,9 @@ def toxml(self):
         """
         Exports this object into a LEMS XML object
         """
-
+        cond = ' condition="{0}"'.format(self.condition) if self.condition is not None else ''
         return (
-            '<Case condition="{0}" value="{1}"'.format(self.condition, self.value)
+            '<Case{0} value="{1}"'.format(cond, self.value)
             + "/>"
         )
 

lems/parser/LEMS.py

@@ -998,14 +998,24 @@ def parse_exposure(self, node):
         except:
             self.raise_error("<Exposure> must specify a name")
 
+        if "minval" in node.lattrib:
+            minval = node.lattrib["minval"]
+        else:
+            minval = 0.0
+
+        if "maxval" in node.lattrib:
+            maxval = node.lattrib["maxval"]
+        else:
+            maxval = 0.0
+
         try:
             dimension = node.lattrib["dimension"]
         except:
             self.raise_error("Exposure '{0}' must specify a dimension", name)
 
         description = node.lattrib.get("description", "")
 
-        self.current_component_type.add_exposure(Exposure(name, dimension, description))
+        self.current_component_type.add_exposure(Exposure(name, dimension, minval, maxval, description))
 
     def parse_fixed(self, node):
         """
@@ -1298,13 +1308,23 @@ def parse_parameter(self, node):
         except:
             self.raise_error("<Parameter> must specify a name")
 
+        if "minval" in node.lattrib:
+            minval = node.lattrib["minval"]
+        else:
+            minval = 0.0
+
+        if "maxval" in node.lattrib:
+            maxval = node.lattrib["maxval"]
+        else:
+            maxval = 0.0
+
         try:
             dimension = node.lattrib["dimension"]
         except:
             self.raise_error("Parameter '{0}' has no dimension", name)
 
         description = node.lattrib.get("description", "")
-        parameter = Parameter(name, dimension, description)
+        parameter = Parameter(name, dimension, minval, maxval, description)
 
         self.current_component_type.add_parameter(parameter)
 
@@ -1650,6 +1670,16 @@ def parse_state_variable(self, node):
         else:
             self.raise_error("<StateVariable> must specify a name")
 
+        if "minval" in node.lattrib:
+            minval = node.lattrib["minval"]
+        else:
+            minval = 0.0
+
+        if "maxval" in node.lattrib:
+            maxval = node.lattrib["maxval"]
+        else:
+            maxval = 0.0
+
         if "dimension" in node.lattrib:
             dimension = node.lattrib["dimension"]
         else:
@@ -1660,7 +1690,7 @@ def parse_state_variable(self, node):
         else:
             exposure = None
 
-        self.current_regime.add_state_variable(StateVariable(name, dimension, exposure))
+        self.current_regime.add_state_variable(StateVariable(name, dimension, minval, maxval, exposure))
 
     def parse_structure(self, node):
         """