From 6308e7d7898d4f064d321d97d162c6752c22b362 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 11 May 2020 15:00:25 +0200 Subject: Add analytical solution for DFOP-SFO This is about twice as fast as deSolve compiled in the case of FOCUS D --- docs/404.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 3 ++- docs/pkgdown.yml | 2 +- docs/reference/create_deg_func.html | 16 +++++++++++++--- docs/reference/index.html | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/404.html b/docs/404.html index c6da911d..afb82b3f 100644 --- a/docs/404.html +++ b/docs/404.html @@ -71,7 +71,7 @@ mkin - 0.9.50 + 0.9.50.1 diff --git a/docs/articles/index.html b/docs/articles/index.html index 7091d4c9..5179c1bc 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -71,7 +71,7 @@ mkin - 0.9.50 + 0.9.50.1 diff --git a/docs/authors.html b/docs/authors.html index bc170e49..5ec134d6 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -71,7 +71,7 @@ mkin - 0.9.50 + 0.9.50.1 diff --git a/docs/index.html b/docs/index.html index 5c4a0a9b..37ed972a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -37,7 +37,7 @@ mkin - 0.9.50 + 0.9.50.1 diff --git a/docs/news/index.html b/docs/news/index.html index 1e13041d..3965df70 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -71,7 +71,7 @@ mkin - 0.9.50 + 0.9.50.1 @@ -145,6 +145,7 @@
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index b3cd3d30..aa796e47 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: NAFTA_examples: web_only/NAFTA_examples.html benchmarks: web_only/benchmarks.html compiled_models: web_only/compiled_models.html -last_built: 2020-05-11T03:18Z +last_built: 2020-05-11T13:20Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/docs/reference/create_deg_func.html b/docs/reference/create_deg_func.html index 67016be0..6d05e811 100644 --- a/docs/reference/create_deg_func.html +++ b/docs/reference/create_deg_func.html @@ -175,9 +175,19 @@ benchmark( analytical = mkinfit(SFO_SFO, FOCUS_D, solution_type = "analytical", quiet = TRUE), deSolve = mkinfit(SFO_SFO, FOCUS_D, solution_type = "deSolve", quiet = TRUE), - replications = 1)
#> Lade nötiges Paket: rbenchmark
#> test replications elapsed relative user.self sys.self user.child -#> 1 analytical 1 0.198 1.000 0.198 0.000 0 -#> 2 deSolve 1 0.350 1.768 0.348 0.001 0 + replications = 2)
#> Lade nötiges Paket: rbenchmark
#> test replications elapsed relative user.self sys.self user.child +#> 1 analytical 2 0.395 1.000 0.393 0.002 0 +#> 2 deSolve 2 0.693 1.754 0.692 0.000 0 +#> sys.child +#> 1 0 +#> 2 0
DFOP_SFO <- mkinmod( + parent = mkinsub("DFOP", "m1"), + m1 = mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
benchmark( + analytical = mkinfit(DFOP_SFO, FOCUS_D, solution_type = "analytical", quiet = TRUE), + deSolve = mkinfit(DFOP_SFO, FOCUS_D, solution_type = "deSolve", quiet = TRUE), + replications = 2)
#> test replications elapsed relative user.self sys.self user.child +#> 1 analytical 2 0.870 1.000 0.870 0 0 +#> 2 deSolve 2 1.678 1.929 1.677 0 0 #> sys.child #> 1 0 #> 2 0
# } diff --git a/docs/reference/index.html b/docs/reference/index.html index 7e7fff29..ed6debdd 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -71,7 +71,7 @@ mkin - 0.9.50 + 0.9.50.1
-- cgit v1.2.1