From d3017b4eb8abf23fbe38f59db17df5c2525df3b2 Mon Sep 17 00:00:00 2001 From: Evgeny Metelkin Date: Thu, 23 Jul 2020 18:53:16 +0300 Subject: [PATCH] update version --- CHANGELOG.md | 1 + package-lock.json | 2 +- package.json | 2 +- src/templates/model.jl.njk | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8ab8e57..d552ad54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - fix bug with "not a deep clone in Expression" - fix bug with empty period in Matlab - include correct description of TimeSwitcher in Julia +- update structure of Julia format ## 0.5.7 diff --git a/package-lock.json b/package-lock.json index 4ec6e114..7b1de414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "heta-compiler", - "version": "0.5.7", + "version": "0.5.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 162b6e64..49993870 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "heta-compiler", - "version": "0.5.7", + "version": "0.5.8", "description": "Programming platform for Quantitative Systems Pharmacology modeling in NodeJS", "main": "src/index.js", "scripts": { diff --git a/src/templates/model.jl.njk b/src/templates/model.jl.njk index 83bd93b6..26b5b114 100644 --- a/src/templates/model.jl.njk +++ b/src/templates/model.jl.njk @@ -155,7 +155,7 @@ function {{ event.switcher.id }}_times_(cons, times = [0.0, 100.0]) end {%- endfor %} -### event assignments +### discrete events {% for event in events | filter2('switcher.className', 'DSwitcher') -%} function {{ event.switcher.id }}_trigger_(u, t, integrator) cons = integrator.p.constants @@ -181,6 +181,7 @@ function {{ event.switcher.id }}_trigger_(u, t, integrator) end {%- endfor %} +### continous events {% for event in events | filter2('switcher.className', 'CSwitcher') -%} function {{ event.switcher.id }}_condition_(u, t, integrator) cons = integrator.p.constants @@ -206,6 +207,7 @@ function {{ event.switcher.id }}_condition_(u, t, integrator) end {%- endfor %} +### event assignments {% for event in events -%} function {{event.switcher.id}}_assignment_(integrator) cons = integrator.p.constants