From ddeabe64203595db743ddfbabccd05bcee478b95 Mon Sep 17 00:00:00 2001 From: Evgeny Metelkin Date: Wed, 25 Sep 2024 12:34:09 +0300 Subject: [PATCH] update heta version 0.9.0 --- .github/workflows/build-and-share.yml | 2 +- .github/workflows/build.yml | 2 +- R/run-mrgsolve.R | 10 ++++++---- platform.json | 12 ------------ platform.yml | 25 +++++++++++++++++++++++++ src/index.heta | 12 ------------ 6 files changed, 33 insertions(+), 30 deletions(-) delete mode 100644 platform.json create mode 100644 platform.yml diff --git a/.github/workflows/build-and-share.yml b/.github/workflows/build-and-share.yml index b5535a4..473b39f 100644 --- a/.github/workflows/build-and-share.yml +++ b/.github/workflows/build-and-share.yml @@ -23,7 +23,7 @@ jobs: persist-credentials: false - name: Install and build run: | - npm i -g heta-compiler@0.8.4 + npm i -g heta-compiler heta build - name: Run R code run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c448b7c..9308c61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: build: strategy: matrix: - node-version: [ 16.x, 18.x, 20.x ] + node-version: [ 16.x, 18.x, 20.x, 22.x ] heta-version: [ latest ] platform: [ ubuntu-latest, windows-latest, macos-latest ] diff --git a/R/run-mrgsolve.R b/R/run-mrgsolve.R index 5bb8b2f..e506a43 100644 --- a/R/run-mrgsolve.R +++ b/R/run-mrgsolve.R @@ -2,6 +2,7 @@ model_path <- './dist/mrgsolve/nameless.cpp' fig_path <- './dist/mrg.png' library(mrgsolve) +library(lattice) ### main code message('Reading model... ', appendLF = FALSE) @@ -22,9 +23,10 @@ message('OK') message('Plot results and save to file ${fig_path}... ', appendLF = FALSE) plot <- sim %>% - plot(A + B + r1 + comp1 ~ time, type='l') + plot(A + B + r1 + comp1 ~ time, type='l') + +lattice::trellis.device(device = png, file = fig_path) +print(plot) +dev.off() - lattice::trellis.device(device = png, file = fig_path ) - print(plot) - dev.off() message('OK') diff --git a/platform.json b/platform.json deleted file mode 100644 index 01c82bd..0000000 --- a/platform.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "id": "mini", - "license": "MIT", - "builderVersion": "^0.8.0", - "options": { - "logLevel": "info" - }, - "importModule": { - "type": "heta", - "source": "src/index.heta" - } -} diff --git a/platform.yml b/platform.yml new file mode 100644 index 0000000..13a58a6 --- /dev/null +++ b/platform.yml @@ -0,0 +1,25 @@ +{ + "id": "mini", + "license": "MIT", + "builderVersion": "^0.9.0", + "options": { + "logLevel": "info" + }, + "importModule": { + "type": "heta", + "source": "src/index.heta" + }, + "export": [ + { "format": "SBML" }, + { "format": "Mrgsolve" }, + { "format": "DBSolve" }, + { "format": "Simbio" }, + { "format": "JSON" }, + { "format": "YAML" }, + { "format": "JSON" }, + { "format": "Matlab" }, + { "format": "XLSX" }, + { "format": "Julia" }, + { "format": "Summary" } + ] +} \ No newline at end of file diff --git a/src/index.heta b/src/index.heta index e6c471d..8fa77c8 100644 --- a/src/index.heta +++ b/src/index.heta @@ -13,15 +13,3 @@ B .= 0; r1 := k1 * A * comp1; k1 @Const = 1.2e-1; - -#export { format: SBML }; -#export { format: Mrgsolve }; -#export { format: DBSolve }; -#export { format: Simbio }; -#export { format: JSON }; -#export { format: YAML }; -#export { format: JSON }; -#export { format: Matlab }; -#export { format: XLSX }; -#export { format: Julia }; -#export { format: Summary };