Regeenrated nml branch

Author: pgleeson

README.md

@@ -86,7 +86,7 @@ For guidelines on contributing to the development of MDF, see [here](https://git
 ## Examples
 
 To get started, follow the simple example in a Jupyter notebook [here](https://github.com/ModECI/MDF/blob/main/examples/SimpleExample.ipynb)
- 
+
 
 Multiple examples of serialized MDF files, the Python scripts used to generate them, as well as mappings to target environments can be found [here](https://github.com/ModECI/MDF/blob/main/examples/README.md).
 

docs/MDF_specification.json

@@ -107,7 +107,7 @@
                     "description": "The unique (for this Node) id of the input port,"
                 },
                 "default_value": {
-                    "type": "Union[EvaluableExpression, List, Dict, ndarray, int, float, str, NoneType]",
+                    "type": "Union",
                     "description": "Value to set at this input port if no edge connected to it."
                 },
                 "shape": {
@@ -119,7 +119,7 @@
                     "description": "The data type of the input received at a port."
                 },
                 "reduce": {
-                    "type": "Union[str, NoneType]",
+                    "type": "Optional",
                     "description": "Specifies how to deal with multiple inputs to one port during a single timestep: add: add up all the values; multiply: multiply the values, overwrite: just use the last value supplied (default)"
                 }
             }

docs/MDF_specification.yaml

@@ -92,8 +92,7 @@ specification:
                 type: str
                 description: The unique (for this Node) id of the input port,
             default_value:
-                type: Union[EvaluableExpression, List, Dict, ndarray, int, float,
-                    str, NoneType]
+                type: Union
                 description: Value to set at this input port if no edge connected
                     to it.
             shape:
@@ -107,7 +106,7 @@ specification:
                 type: Optional
                 description: The data type of the input received at a port.
             reduce:
-                type: Union[str, NoneType]
+                type: Optional
                 description: 'Specifies how to deal with multiple inputs to one port
                     during a single timestep: add: add up all the values; multiply:
                     multiply the values, overwrite: just use the last value supplied

docs/README.md

@@ -181,7 +181,7 @@ The <a href="#inputport">InputPort</a> is an attribute of a Node which allows ex
 
   <tr>
     <td><b>default_value</b></td>
-    <td>Union[EvaluableExpression, List, Dict, ndarray, int, float, str, NoneType]</td>
+    <td>Union</td>
     <td><i>Value to set at this input port if no edge connected to it.</i></td>
  </tr>
 
@@ -203,7 +203,7 @@ The <a href="#inputport">InputPort</a> is an attribute of a Node which allows ex
 
   <tr>
     <td><b>reduce</b></td>
-    <td>Union[str, NoneType]</td>
+    <td>Optional</td>
     <td><i>Specifies how to deal with multiple inputs to one port during a single timestep: add: add up all the values; multiply: multiply the values, overwrite: just use the last value supplied (default)</i></td>
  </tr>
 

docs/sphinx/source/api/Specification.rst

@@ -87,15 +87,17 @@ The `InputPort <#inputport>`__ is an attribute of a Node which allows external i
 
 **Allowed parameters**
 
-===============  ===========  =============================================================================================
-Allowed field    Data Type    Description
-===============  ===========  =============================================================================================
-**metadata**     Optional     Optional metadata field, an arbitrary dictionary of string keys and JSON serializable values.
-**id**           str          The unique (for this Node) id of the input port,
-**shape**        Optional     The shape of the input port. This uses the same syntax as numpy ndarray shapes
-                              (e.g., **numpy.zeros(shape)** would produce an array with the correct shape
-**type**         Optional     The data type of the input received at a port.
-===============  ===========  =============================================================================================
+=================  ===========  =================================================================================================================================================================================================
+Allowed field      Data Type    Description
+=================  ===========  =================================================================================================================================================================================================
+**metadata**       Optional     Optional metadata field, an arbitrary dictionary of string keys and JSON serializable values.
+**id**             str          The unique (for this Node) id of the input port,
+**default_value**  Union        Value to set at this input port if no edge connected to it.
+**shape**          Optional     The shape of the input port. This uses the same syntax as numpy ndarray shapes
+                                (e.g., **numpy.zeros(shape)** would produce an array with the correct shape
+**type**           Optional     The data type of the input received at a port.
+**reduce**         Optional     Specifies how to deal with multiple inputs to one port during a single timestep: add: add up all the values; multiply: multiply the values, overwrite: just use the last value supplied (default)
+=================  ===========  =================================================================================================================================================================================================
 
 ========
 Function

examples/MDF/RNN/IAF_net3.json

@@ -1,7 +1,7 @@
 {
     "IAF_net3": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.12",
+        "generating_application": "Python modeci-mdf v0.4.13",
         "graphs": {
             "iaf_example": {
                 "nodes": {

examples/MDF/RNN/IAF_net3.yaml

@@ -1,6 +1,6 @@
 IAF_net3:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.12
+    generating_application: Python modeci-mdf v0.4.13
     graphs:
         iaf_example:
             nodes:

examples/MDF/RNN/IaF.net3.run.png

@@ -1,7 +1,7 @@
 {
     "Net_acyclical": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.12",
+        "generating_application": "Python modeci-mdf v0.4.13",
         "graphs": {
             "Net_acyclical": {
                 "nodes": {