ModECI · pgleeson · Nov 21, 2022 · Nov 22, 2022 · Nov 23, 2022 · Dec 5, 2022
diff --git a/.gitignore b/.gitignore
@@ -274,6 +274,9 @@ Thumbs.db #thumbnail cache on Windows
 /examples/PyTorch/simple_pytorch_to_mdf.1
 /examples/MDF/NLP/TestNLP_3
 /examples/MDF/NLP/TestNLP
+/examples/MDF/networks/Net_acyclical
+/examples/MDF/net/Net_acyclical
+/examples/MDF/net/weight.py
 /examples/MDF/conditions/composite_example
 /examples/NeuroML/arm64
 /examples/MDF/RNN/iaf.net

diff --git a/docs/MDF_specification.json b/docs/MDF_specification.json
@@ -106,13 +106,21 @@
                     "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]",
+                    "description": "Value to set at this input port if no edge connected to it."
+                },
                 "shape": {
                     "type": "Union[Tuple[int, ...], NoneType]",
                     "description": "The shape of the input port. This uses the same syntax as numpy ndarray shapes\n(e.g., :code:`numpy.zeros(shape)` would produce an array with the correct shape"
                 },
                 "type": {
                     "type": "Union[str, NoneType]",
                     "description": "The data type of the input received at a port."
+                },
+                "reduce": {
+                    "type": "Union[str, NoneType]",
+                    "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)"
                 }
             }
         },

diff --git a/docs/MDF_specification.yaml b/docs/MDF_specification.yaml
@@ -91,6 +91,11 @@ specification:
             id:
                 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]
+                description: Value to set at this input port if no edge connected
+                    to it.
             shape:
                 type: Union[Tuple[int, ...], NoneType]
                 description: 'The shape of the input port. This uses the same syntax
@@ -101,6 +106,12 @@ specification:
             type:
                 type: Union[str, NoneType]
                 description: The data type of the input received at a port.
+            reduce:
+                type: Union[str, NoneType]
+                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)'
     Function:
         definition: A single value which is evaluated as a function of values on :class:`InputPort`(s)
             and other Functions

diff --git a/docs/README.md b/docs/README.md
@@ -179,6 +179,13 @@ The <a href="#inputport">InputPort</a> is an attribute of a Node which allows ex
  </tr>
 
 
+  <tr>
+    <td><b>default_value</b></td>
+    <td>Union[EvaluableExpression, List, Dict, ndarray, int, float, str, NoneType]</td>
+    <td><i>Value to set at this input port if no edge connected to it.</i></td>
+ </tr>
+
+
   <tr>
     <td><b>shape</b></td>
     <td>Union[Tuple[int, ...], NoneType]</td>
@@ -194,6 +201,13 @@ The <a href="#inputport">InputPort</a> is an attribute of a Node which allows ex
  </tr>
 
 
+  <tr>
+    <td><b>reduce</b></td>
+    <td>Union[str, NoneType]</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>
+
+
 </table>
 
 ## Function

diff --git a/docs/sphinx/source/api/Specification.rst b/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**     Union[Any, NoneType]              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**        Union[Tuple[int, ...], NoneType]  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**         Union[str, NoneType]              The data type of the input received at a port.
-===============  ================================  =============================================================================================
+=================  ==========================================================================  =================================================================================================================================================================================================
+Allowed field      Data Type                                                                   Description
+=================  ==========================================================================  =================================================================================================================================================================================================
+**metadata**       Union[Any, NoneType]                                                        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[EvaluableExpression, List, Dict, ndarray, int, float, str, NoneType]  Value to set at this input port if no edge connected to it.
+**shape**          Union[Tuple[int, ...], NoneType]                                            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**           Union[str, NoneType]                                                        The data type of the input received at a port.
+**reduce**         Union[str, NoneType]                                                        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

diff --git a/docs/sphinx/source/api/export_format/NeuroML/Izh.png b/docs/sphinx/source/api/export_format/NeuroML/Izh.png
diff --git a/docs/sphinx/source/api/export_format/NeuroML/IzhikevichTest.gv.png b/docs/sphinx/source/api/export_format/NeuroML/IzhikevichTest.gv.png
diff --git a/docs/sphinx/source/api/export_format/ONNX/abc.png b/docs/sphinx/source/api/export_format/ONNX/abc.png
diff --git a/examples/MDF/RNN/IAF_net.json b/examples/MDF/RNN/IAF_net.json
@@ -56,7 +56,8 @@
                             "current_input": {
                                 "shape": [
                                     8
-                                ]
+                                ],
+                                "reduce": "add"
                             }
                         },
                         "parameters": {
@@ -140,7 +141,8 @@
                             "current_input": {
                                 "shape": [
                                     8
-                                ]
+                                ],
+                                "reduce": "add"
                             }
                         },
                         "parameters": {
@@ -224,7 +226,8 @@
                             "spike_input": {
                                 "shape": [
                                     8
-                                ]
+                                ],
+                                "reduce": "add"
                             }
                         },
                         "parameters": {

diff --git a/examples/MDF/RNN/IAF_net.yaml b/examples/MDF/RNN/IAF_net.yaml
@@ -40,6 +40,7 @@ IAF_net:
                         current_input:
                             shape:
                             - 8
+                            reduce: add
                     parameters:
                         v0:
                             value:
@@ -99,6 +100,7 @@ IAF_net:
                         current_input:
                             shape:
                             - 8
+                            reduce: add
                     parameters:
                         v0:
                             value:
@@ -158,6 +160,7 @@ IAF_net:
                         spike_input:
                             shape:
                             - 8
+                            reduce: add
                     parameters:
                         syn_tau:
                             value: 10

diff --git a/examples/MDF/RNN/IAF_net2.json b/examples/MDF/RNN/IAF_net2.json
@@ -65,7 +65,8 @@
                             "current_input": {
                                 "shape": [
                                     8
-                                ]
+                                ],
+                                "reduce": "add"
                             }
                         },
                         "parameters": {
@@ -149,7 +150,8 @@
                             "current_input": {
                                 "shape": [
                                     8
-                                ]
+                                ],
+                                "reduce": "add"
                             }
                         },
                         "parameters": {
@@ -233,7 +235,8 @@
                             "spike_input": {
                                 "shape": [
                                     8
-                                ]
+                                ],
+                                "reduce": "add"
                             }
                         },
                         "parameters": {

diff --git a/examples/MDF/RNN/IAF_net2.yaml b/examples/MDF/RNN/IAF_net2.yaml
@@ -48,6 +48,7 @@ IAF_net2:
                         current_input:
                             shape:
                             - 8
+                            reduce: add
                     parameters:
                         v0:
                             value:
@@ -107,6 +108,7 @@ IAF_net2:
                         current_input:
                             shape:
                             - 8
+                            reduce: add
                     parameters:
                         v0:
                             value:
@@ -166,6 +168,7 @@ IAF_net2:
                         spike_input:
                             shape:
                             - 8
+                            reduce: add
                     parameters:
                         syn_tau:
                             value: 10