From 92bd33824bde6b6b21bfc7e30953092a74d3cce5 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 7 May 2020 22:13:33 +0200 Subject: Another overhaul of analytical solutions Still in preparation for analytical solutions of coupled models --- docs/reference/mkinmod.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/reference/mkinmod.html') diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html index d1204e2e..2f2e89d9 100644 --- a/docs/reference/mkinmod.html +++ b/docs/reference/mkinmod.html @@ -75,7 +75,7 @@ list of lists can be given in the speclist argument." /> mkin - 0.9.49.11 + 0.9.50 @@ -152,7 +152,7 @@ list of lists can be given in the speclist argument.

mkinmod(
   ...,
-  use_of_ff = "min",
+  use_of_ff = "max",
   speclist = NULL,
   quiet = FALSE,
   verbose = FALSE
@@ -252,15 +252,15 @@ in the FOCUS and NAFTA guidance documents are used.

 SFO_SFO <- mkinmod(
   parent = mkinsub("SFO", "m1"),
   m1 = mkinsub("SFO"), verbose = TRUE)
#> Compilation argument:
-#>  /usr/lib/R/bin/R CMD SHLIB file66a9718e919b.c 2> file66a9718e919b.c.err.txt 
+#>  /usr/lib/R/bin/R CMD SHLIB fileb6a4eaab60.c 2> fileb6a4eaab60.c.err.txt 
 #> Program source:
 #>   1: #include <R.h>
 #>   2: 
 #>   3: 
 #>   4: static double parms [3];
-#>   5: #define k_parent_sink parms[0]
-#>   6: #define k_parent_m1 parms[1]
-#>   7: #define k_m1_sink parms[2]
+#>   5: #define k_parent parms[0]
+#>   6: #define f_parent_to_m1 parms[1]
+#>   7: #define k_m1 parms[2]
 #>   8: 
 #>   9: void initpar(void (* odeparms)(int *, double *)) {
 #>  10:     int N = 3;
@@ -270,8 +270,8 @@ in the FOCUS and NAFTA guidance documents are used.

 #>  14: 
 #>  15: void func ( int * n, double * t, double * y, double * f, double * rpar, int * ipar ) {
 #>  16: 
-#>  17: f[0] = - k_parent_sink * y[0] - k_parent_m1 * y[0];
-#>  18: f[1] = + k_parent_m1 * y[0] - k_m1_sink * y[1];
+#>  17: f[0] = - k_parent * y[0];
+#>  18: f[1] = + f_parent_to_m1 * k_parent * y[0] - k_m1 * y[1];
 #>  19: }
#> Successfully compiled differential equation model from auto-generated C code.

 # If we have several parallel metabolites
 # (compare tests/testthat/test_synthetic_data_for_UBA_2014.R)
-- 
cgit v1.2.1