diff --git a/cases.md b/cases.md index cae2aeb..d2da6b7 100644 --- a/cases.md +++ b/cases.md @@ -7,7 +7,7 @@ | [one compartment](cases/one-compartment) | One compartment PK model example. | | [annotation](cases/annotation) | Annotation of components in MM model. | | [time switcher](cases/time-switcher) | Model describes one-reaction model with periodic event. | -| ~~[cond switcher](cases/cond-switcher)~~ | Event with conditional switch | +| ~~[continuous switcher](cases/c-switcher)~~ | Event with continuous switch | | [using units](cases/using-units) | using default units and creating another ones | | [Heta modules](cases/heta-modules) | Combining Heta type modules in one platform | | ~~[namespaces](cases/several)~~ | Using namespaces to write several models in one platforms | diff --git a/changelog.md b/changelog.md index 9ba45dd..4b1cbe5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Change Log +## 0.3.2 + +- use `trigger` property with MathExpr in `CSwitcher` (continuous switcher) instead of condition reffered to Record + ## 0.3.1 - rename `CondSwitcher` to `CSwitcher` (continuous switcher) diff --git a/classes.md b/classes.md index edd24ac..bdcf395 100644 --- a/classes.md +++ b/classes.md @@ -332,7 +332,7 @@ sw2 @TimeSwitcher { ```heta sw2 @DSwitcher { - condition: (x > 1) and (y != x) + trigger: (x > 1) and (y != x) }; ``` @@ -342,18 +342,17 @@ sw2 @DSwitcher { **Parent:** [_Switcher](#_switcher) -`CSwitcher` (continuous switcher) switches based on record reffered in `condition` property. The switcher is triggered when the value of the record hits 0 changing from negative to positive value. +`CSwitcher` (continuous switcher) switches based on expression in `trigger` property. The switcher is triggered when the value of the record hits 0 changing from negative to positive value. | property | type | required | default | ref | description | | ---------|------|----------|---------|-----|-------------| -| condition | ID | true | | `Record` | Reference to identifier of Record to estimate the moment of switching | +| trigger | MathExpr | true | | | Expression to estimate the moment of switching | ### Example ```heta -evt1 @Record .= x * y; sw2 @CSwitcher { - condition: evt1 + trigger: x * y }; ``` @@ -370,7 +369,7 @@ It substites partially usage of `TimeSwitcher` and was included to support expor | start | Number/ID | | 0 | - / `Const` | time to run the first switch | | period | Number/ID | | | - / `Const` | period of repeated switching | | repeatCount | Number/ID | | | - / `Const` | number of dose addition after the first dose | -| target | ID | true | | Species | traget species to add the dose | +| target | ID | true | | Species | target species to add the dose | | amount | Number/ID | true | | - / `Const` | amount which should be added to the reffered species | | units | UnitsExpr *or* [UnitsComponent](#unitscomponent)[] | | | | units of `amount` | diff --git a/heta-cheatsheet.docx b/heta-cheatsheet.docx index a92353b..600e37a 100644 Binary files a/heta-cheatsheet.docx and b/heta-cheatsheet.docx differ diff --git a/heta.uml.graphml b/heta.uml.graphml index 3964f09..ba8d281 100644 --- a/heta.uml.graphml +++ b/heta.uml.graphml @@ -176,12 +176,12 @@ aux: <Dictionary> {use: "optional"} - + - CSwitcher + CSwitcher - condition: <ID> + trigger: <MathExpr>(numeric) diff --git a/heta.uml.png b/heta.uml.png index 1b31a89..d3d4e4b 100644 Binary files a/heta.uml.png and b/heta.uml.png differ