Skip to content

Commit cda5a09

Browse files
pgleesonpgleeson
committed
Merge branch 'development' into cyclic_graphs
2 parents d4a12b9 + eb81f4f commit cda5a09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+114
-173
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
python-version: [ "3.9", "3.10", "3.11"]
30+
python-version: [ "3.9", "3.11", "3.12"]
3131
runs-on: [ubuntu-latest, macos-latest, windows-latest]
3232
exclude:
3333
- runs-on: macos-latest

‎examples/ACT-R/addition.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"addition": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"addition_graph": {
77
"nodes": {

‎examples/ACT-R/addition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addition:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
addition_graph:
66
nodes:

‎examples/ACT-R/count.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"count": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"count_graph": {
77
"nodes": {

‎examples/ACT-R/count.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
count:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
count_graph:
66
nodes:

‎examples/MDF/ABCD.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ABCD": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"abcd_example": {
77
"nodes": {

‎examples/MDF/ABCD.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ABCD:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
abcd_example:
66
nodes:

‎examples/MDF/Arrays.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Arrays": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"array_example": {
77
"nodes": {

‎examples/MDF/Arrays.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Arrays:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
array_example:
66
nodes:

‎examples/MDF/NewtonCoolingModel.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"NewtonCoolingModel": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"cooling_process": {
77
"nodes": {

‎examples/MDF/NewtonCoolingModel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NewtonCoolingModel:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
cooling_process:
66
nodes:

‎examples/MDF/ParametersFunctions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ParametersFunctions": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"params_funcs_example": {
77
"nodes": {

‎examples/MDF/ParametersFunctions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ParametersFunctions:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
params_funcs_example:
66
nodes:

‎examples/MDF/RNN/IAF_net.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"IAF_net": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"iaf_example": {
77
"nodes": {

‎examples/MDF/RNN/IAF_net.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IAF_net:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
iaf_example:
66
nodes:

‎examples/MDF/RNN/IAF_net2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"IAF_net2": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"iaf_example": {
77
"nodes": {

‎examples/MDF/RNN/IAF_net2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IAF_net2:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
iaf_example:
66
nodes:

‎examples/MDF/RNN/IAFs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"IAFs": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"iaf_example": {
77
"nodes": {

‎examples/MDF/RNN/IAFs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IAFs:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
iaf_example:
66
nodes:

‎examples/MDF/RNN/RNNs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"RNNs": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"rnn_example": {
77
"nodes": {

‎examples/MDF/RNN/RNNs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RNNs:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
rnn_example:
66
nodes:

‎examples/MDF/Simple.bson

0 Bytes
Binary file not shown.

‎examples/MDF/Simple.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Simple": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"simple_example": {
77
"nodes": {

‎examples/MDF/Simple.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Simple:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
simple_example:
66
nodes:

‎examples/MDF/States.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"States": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"state_example": {
77
"nodes": {

‎examples/MDF/States.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
States:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
state_example:
66
nodes:

‎examples/MDF/SwitchedRLC_Circuit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"SwitchedRLC_Circuit": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"metadata": {
66
"preferred_duration": 2,
77
"preferred_dt": 0.001

‎examples/MDF/SwitchedRLC_Circuit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SwitchedRLC_Circuit:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
metadata:
55
preferred_duration: 2
66
preferred_dt: 0.001

‎examples/MDF/abc_conditions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"abc_conditions": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"abc_conditions_example": {
77
"nodes": {

‎examples/MDF/abc_conditions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
abc_conditions:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
abc_conditions_example:
66
nodes:

‎examples/MDF/conditions/Composite_mdf_condition.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Composite_mdf_condition": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"Composite_mdf_condition_example": {
77
"nodes": {

‎examples/MDF/conditions/Composite_mdf_condition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Composite_mdf_condition:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
Composite_mdf_condition_example:
66
nodes:

‎examples/MDF/conditions/everyncalls_condition.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"everyncalls_condition": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"everyncalls_example": {
77
"nodes": {

‎examples/MDF/conditions/everyncalls_condition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
everyncalls_condition:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
everyncalls_example:
66
nodes:

‎examples/MDF/conditions/threshold_condition.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"threshold_condition": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"threshold_example": {
77
"nodes": {

‎examples/MDF/conditions/threshold_condition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
threshold_condition:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
threshold_example:
66
nodes:

‎examples/MDF/conditions/timeinterval_condition.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"timeinterval_condition": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"timeinterval_example": {
77
"nodes": {

‎examples/MDF/conditions/timeinterval_condition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
timeinterval_condition:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
timeinterval_example:
66
nodes:

‎examples/ONNX/ab.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ONNX Model": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"main_graph": {
77
"nodes": {

‎examples/ONNX/ab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ONNX Model:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
main_graph:
66
nodes:

‎examples/ONNX/abc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ONNX Model": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"main_graph": {
77
"nodes": {

‎examples/ONNX/abc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ONNX Model:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
main_graph:
66
nodes:

‎examples/ONNX/abc_basic-mdf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ONNX Model": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"main_graph": {
77
"nodes": {

‎examples/ONNX/abc_basic-mdf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ONNX Model:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
main_graph:
66
nodes:

‎examples/ONNX/abcd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ONNX Model": {
33
"format": "ModECI MDF v0.4",
4-
"generating_application": "Python modeci-mdf v0.4.11",
4+
"generating_application": "Python modeci-mdf v0.4.12",
55
"graphs": {
66
"main_graph": {
77
"nodes": {

‎examples/ONNX/abcd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ONNX Model:
22
format: ModECI MDF v0.4
3-
generating_application: Python modeci-mdf v0.4.11
3+
generating_application: Python modeci-mdf v0.4.12
44
graphs:
55
main_graph:
66
nodes:

‎examples/PyTorch/MDF_PyTorch/ABCD_pytorch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
This script has been generated by modeci_mdf v0.4.11.
2+
This script has been generated by modeci_mdf v0.4.12.
33
It is an export of a MDF model (mdf.s - MDF stateful, i.e. full MDF allowing stateful parameters) to PyTorch
44
55
"""

‎examples/PyTorch/MDF_PyTorch/Arrays_pytorch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
This script has been generated by modeci_mdf v0.4.11.
2+
This script has been generated by modeci_mdf v0.4.12.
33
It is an export of a MDF model (mdf.s - MDF stateful, i.e. full MDF allowing stateful parameters) to PyTorch
44
55
"""

0 commit comments

Comments
 (0)