diff options
Diffstat (limited to 'docs/reference')
65 files changed, 56 insertions, 55 deletions
diff --git a/docs/reference/D24_2014.html b/docs/reference/D24_2014.html index e2d47f1b..c59bfad6 100644 --- a/docs/reference/D24_2014.html +++ b/docs/reference/D24_2014.html @@ -77,7 +77,7 @@ constrained by data protection regulations." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/Extract.mmkin.html b/docs/reference/Extract.mmkin.html index 5a99cf1b..b1c73ba5 100644 --- a/docs/reference/Extract.mmkin.html +++ b/docs/reference/Extract.mmkin.html @@ -72,7 +72,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png Binary files differindex 1cbcb153..49fb9af1 100644 --- a/docs/reference/Rplot001.png +++ b/docs/reference/Rplot001.png diff --git a/docs/reference/Rplot003.png b/docs/reference/Rplot003.png Binary files differindex 19198739..eba202e9 100644 --- a/docs/reference/Rplot003.png +++ b/docs/reference/Rplot003.png diff --git a/docs/reference/Rplot004.png b/docs/reference/Rplot004.png Binary files differindex 1028a9c4..a4f878c8 100644 --- a/docs/reference/Rplot004.png +++ b/docs/reference/Rplot004.png diff --git a/docs/reference/Rplot005.png b/docs/reference/Rplot005.png Binary files differindex aa844051..a4f878c8 100644 --- a/docs/reference/Rplot005.png +++ b/docs/reference/Rplot005.png diff --git a/docs/reference/Rplot006.png b/docs/reference/Rplot006.png Binary files differindex 81525882..ff8a5d83 100644 --- a/docs/reference/Rplot006.png +++ b/docs/reference/Rplot006.png diff --git a/docs/reference/Rplot007.png b/docs/reference/Rplot007.png Binary files differindex 10b7455a..3405a171 100644 --- a/docs/reference/Rplot007.png +++ b/docs/reference/Rplot007.png diff --git a/docs/reference/add_err-1.png b/docs/reference/add_err-1.png Binary files differindex 9ba106db..70118923 100644 --- a/docs/reference/add_err-1.png +++ b/docs/reference/add_err-1.png diff --git a/docs/reference/add_err-2.png b/docs/reference/add_err-2.png Binary files differindex 3088c40e..69b820c2 100644 --- a/docs/reference/add_err-2.png +++ b/docs/reference/add_err-2.png diff --git a/docs/reference/add_err-3.png b/docs/reference/add_err-3.png Binary files differindex 493a761a..1de78fa7 100644 --- a/docs/reference/add_err-3.png +++ b/docs/reference/add_err-3.png diff --git a/docs/reference/add_err.html b/docs/reference/add_err.html index 6fbecd14..18ca517e 100644 --- a/docs/reference/add_err.html +++ b/docs/reference/add_err.html @@ -74,7 +74,7 @@ may depend on the predicted value and is specified as a standard deviation." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/confint.mkinfit.html b/docs/reference/confint.mkinfit.html index 06e78459..e81e0c7b 100644 --- a/docs/reference/confint.mkinfit.html +++ b/docs/reference/confint.mkinfit.html @@ -79,7 +79,7 @@ method of Venzon and Moolgavkar (1988)." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> @@ -285,13 +285,13 @@ Profile-Likelihood Based Confidence Intervals, Applied Statistics, 37, <span class='va'>f_d_1</span> <span class='op'><-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span><span class='op'>(</span><span class='va'>SFO_SFO</span>, <span class='fu'><a href='https://rdrr.io/r/base/subset.html'>subset</a></span><span class='op'>(</span><span class='va'>FOCUS_2006_D</span>, <span class='va'>value</span> <span class='op'>!=</span> <span class='fl'>0</span><span class='op'>)</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> <span class='fu'><a href='https://rdrr.io/r/base/system.time.html'>system.time</a></span><span class='op'>(</span><span class='va'>ci_profile</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/r/stats/confint.html'>confint</a></span><span class='op'>(</span><span class='va'>f_d_1</span>, method <span class='op'>=</span> <span class='st'>"profile"</span>, cores <span class='op'>=</span> <span class='fl'>1</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span><span class='op'>)</span> </div><div class='output co'>#> user system elapsed -#> 4.255 1.029 3.937 </div><div class='input'><span class='co'># Using more cores does not save much time here, as parent_0 takes up most of the time</span> +#> 3.871 0.000 3.871 </div><div class='input'><span class='co'># Using more cores does not save much time here, as parent_0 takes up most of the time</span> <span class='co'># If we additionally exclude parent_0 (the confidence of which is often of</span> <span class='co'># minor interest), we get a nice performance improvement if we use at least 4 cores</span> <span class='fu'><a href='https://rdrr.io/r/base/system.time.html'>system.time</a></span><span class='op'>(</span><span class='va'>ci_profile_no_parent_0</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/r/stats/confint.html'>confint</a></span><span class='op'>(</span><span class='va'>f_d_1</span>, method <span class='op'>=</span> <span class='st'>"profile"</span>, <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"k_parent_sink"</span>, <span class='st'>"k_parent_m1"</span>, <span class='st'>"k_m1_sink"</span>, <span class='st'>"sigma"</span><span class='op'>)</span>, cores <span class='op'>=</span> <span class='va'>n_cores</span><span class='op'>)</span><span class='op'>)</span> </div><div class='output co'>#> <span class='message'>Profiling the likelihood</span></div><div class='output co'>#> user system elapsed -#> 1.469 0.092 0.911 </div><div class='input'><span class='va'>ci_profile</span> +#> 1.484 0.116 0.923 </div><div class='input'><span class='va'>ci_profile</span> </div><div class='output co'>#> 2.5% 97.5% #> parent_0 96.456003640 1.027703e+02 #> k_parent_sink 0.040762501 5.549764e-02 diff --git a/docs/reference/dimethenamid_2018.html b/docs/reference/dimethenamid_2018.html index 6845f74f..3b6ae721 100644 --- a/docs/reference/dimethenamid_2018.html +++ b/docs/reference/dimethenamid_2018.html @@ -77,7 +77,7 @@ constrained by data protection regulations." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/experimental_data_for_UBA-1.png b/docs/reference/experimental_data_for_UBA-1.png Binary files differindex 33946ded..5527c07f 100644 --- a/docs/reference/experimental_data_for_UBA-1.png +++ b/docs/reference/experimental_data_for_UBA-1.png diff --git a/docs/reference/experimental_data_for_UBA.html b/docs/reference/experimental_data_for_UBA.html index 77f75678..4da8d6c3 100644 --- a/docs/reference/experimental_data_for_UBA.html +++ b/docs/reference/experimental_data_for_UBA.html @@ -100,7 +100,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/f_time_norm_focus.html b/docs/reference/f_time_norm_focus.html index aa494b27..a0899ac8 100644 --- a/docs/reference/f_time_norm_focus.html +++ b/docs/reference/f_time_norm_focus.html @@ -73,7 +73,7 @@ in Appendix 8 to the FOCUS kinetics guidance (FOCUS 2014, p. 369)." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/focus_soil_moisture.html b/docs/reference/focus_soil_moisture.html index 61f235db..bbacc554 100644 --- a/docs/reference/focus_soil_moisture.html +++ b/docs/reference/focus_soil_moisture.html @@ -73,7 +73,7 @@ corresponds to pF2, MWHC to pF 1 and 1/3 bar to pF 2.5." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/logLik.mkinfit.html b/docs/reference/logLik.mkinfit.html index 9e5b4069..83fb4e48 100644 --- a/docs/reference/logLik.mkinfit.html +++ b/docs/reference/logLik.mkinfit.html @@ -76,7 +76,7 @@ the error model." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/mccall81_245T-1.png b/docs/reference/mccall81_245T-1.png Binary files differindex 91fe060e..478462ae 100644 --- a/docs/reference/mccall81_245T-1.png +++ b/docs/reference/mccall81_245T-1.png diff --git a/docs/reference/mccall81_245T.html b/docs/reference/mccall81_245T.html index b7dca4a7..4f8d3fa0 100644 --- a/docs/reference/mccall81_245T.html +++ b/docs/reference/mccall81_245T.html @@ -74,7 +74,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/mixed-1.png b/docs/reference/mixed-1.png Binary files differindex 28a376f4..b9454c86 100644 --- a/docs/reference/mixed-1.png +++ b/docs/reference/mixed-1.png diff --git a/docs/reference/mixed.html b/docs/reference/mixed.html index 23d955e3..b4f8db16 100644 --- a/docs/reference/mixed.html +++ b/docs/reference/mixed.html @@ -72,7 +72,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/mkinds.html b/docs/reference/mkinds.html index 5111a9e0..fe89012c 100644 --- a/docs/reference/mkinds.html +++ b/docs/reference/mkinds.html @@ -75,7 +75,7 @@ provided by this package come as mkinds objects nevertheless." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/mkindsg.html b/docs/reference/mkindsg.html index 003e5e8f..a9686e4c 100644 --- a/docs/reference/mkindsg.html +++ b/docs/reference/mkindsg.html @@ -75,7 +75,7 @@ dataset if no data are supplied." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/mkinfit-1.png b/docs/reference/mkinfit-1.png Binary files differindex de2a90a9..e1d0f2f4 100644 --- a/docs/reference/mkinfit-1.png +++ b/docs/reference/mkinfit-1.png diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index 180f2ee7..2c162e49 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -80,7 +80,7 @@ likelihood function." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> @@ -431,10 +431,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 <span class='co'># Use shorthand notation for parent only degradation</span> <span class='va'>fit</span> <span class='op'><-</span> <span class='fu'>mkinfit</span><span class='op'>(</span><span class='st'>"FOMC"</span>, <span class='va'>FOCUS_2006_C</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> <span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>fit</span><span class='op'>)</span> -</div><div class='output co'>#> mkin version used for fitting: 1.0.3 -#> R version used for fitting: 4.0.3 -#> Date of fit: Mon Feb 15 13:43:26 2021 -#> Date of summary: Mon Feb 15 13:43:26 2021 +</div><div class='output co'>#> mkin version used for fitting: 1.0.4 +#> R version used for fitting: 4.0.4 +#> Date of fit: Wed Mar 31 19:15:41 2021 +#> Date of summary: Wed Mar 31 19:15:41 2021 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent @@ -574,10 +574,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 analytical <span class='op'>=</span> <span class='fu'>mkinfit</span><span class='op'>(</span><span class='va'>SFO_SFO</span>, <span class='va'>FOCUS_D</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span>, error_model <span class='op'>=</span> <span class='st'>"tc"</span>, solution_type <span class='op'>=</span> <span class='st'>"analytical"</span><span class='op'>)</span><span class='op'>)</span> <span class='op'>}</span> -</div><div class='output co'>#> test relative elapsed -#> 3 analytical 1.000 0.550 -#> 1 deSolve_compiled 1.731 0.952 -#> 2 eigen 2.662 1.464</div><div class='input'><span class='co'># }</span> +</div><div class='output co'>#> <span class='message'>Loading required package: rbenchmark</span></div><div class='output co'>#> test relative elapsed +#> 3 analytical 1.000 0.547 +#> 1 deSolve_compiled 1.717 0.939 +#> 2 eigen 2.644 1.446</div><div class='input'><span class='co'># }</span> <span class='co'># Use stepwise fitting, using optimised parameters from parent only fit, FOMC-SFO</span> <span class='co'># \dontrun{</span> @@ -598,10 +598,10 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 #> 2 6 -64.983 -1 0.3075 0.5792</div><div class='input'><span class='co'># Also, the missing standard error for log_beta and the t-tests for alpha</span> <span class='co'># and beta indicate overparameterisation</span> <span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>fit.FOMC_SFO.tc</span>, data <span class='op'>=</span> <span class='cn'>FALSE</span><span class='op'>)</span> -</div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: diag(.) had 0 or NA entries; non-finite result is doubtful</span></div><div class='output co'>#> mkin version used for fitting: 1.0.3 -#> R version used for fitting: 4.0.3 -#> Date of fit: Mon Feb 15 13:43:38 2021 -#> Date of summary: Mon Feb 15 13:43:38 2021 +</div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: NaNs produced</span></div><div class='output co'>#> <span class='warning'>Warning: diag(.) had 0 or NA entries; non-finite result is doubtful</span></div><div class='output co'>#> mkin version used for fitting: 1.0.4 +#> R version used for fitting: 4.0.4 +#> Date of fit: Wed Mar 31 19:15:53 2021 +#> Date of summary: Wed Mar 31 19:15:53 2021 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent @@ -610,7 +610,7 @@ doi: <a href='https://doi.org/10.3390/environments6120124'>10.3390/environments6 #> #> Model predictions using solution type deSolve #> -#> Fitted using 3729 model solutions performed in 2.802 s +#> Fitted using 3729 model solutions performed in 2.798 s #> #> Error model: Two-component variance function #> diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html index 4ce9468a..1e8ad60d 100644 --- a/docs/reference/mkinmod.html +++ b/docs/reference/mkinmod.html @@ -78,7 +78,7 @@ mkinmod." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> @@ -348,7 +348,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media</p> parent <span class='op'>=</span> <span class='fu'>mkinsub</span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"m1"</span>, full_name <span class='op'>=</span> <span class='st'>"Test compound"</span><span class='op'>)</span>, m1 <span class='op'>=</span> <span class='fu'>mkinsub</span><span class='op'>(</span><span class='st'>"SFO"</span>, full_name <span class='op'>=</span> <span class='st'>"Metabolite M1"</span><span class='op'>)</span>, name <span class='op'>=</span> <span class='st'>"SFO_SFO"</span>, dll_dir <span class='op'>=</span> <span class='va'>DLL_dir</span>, unload <span class='op'>=</span> <span class='cn'>TRUE</span>, overwrite <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> -</div><div class='output co'>#> <span class='message'>Copied DLL from /tmp/RtmpiJ2M4Z/filee097a4a94a921.so to /home/jranke/.local/share/mkin/SFO_SFO.so</span></div><div class='input'><span class='co'># Now we can save the model and restore it in a new session</span> +</div><div class='output co'>#> <span class='message'>Copied DLL from /tmp/Rtmp17EVw2/file269cfd5cc541a9.so to /home/jranke/.local/share/mkin/SFO_SFO.so</span></div><div class='input'><span class='co'># Now we can save the model and restore it in a new session</span> <span class='fu'><a href='https://rdrr.io/r/base/readRDS.html'>saveRDS</a></span><span class='op'>(</span><span class='va'>SFO_SFO.2</span>, file <span class='op'>=</span> <span class='st'>"~/SFO_SFO.rds"</span><span class='op'>)</span> <span class='co'># Terminate the R session here if you would like to check, and then do</span> <span class='kw'><a href='https://rdrr.io/r/base/library.html'>library</a></span><span class='op'>(</span><span class='va'><a href='https://pkgdown.jrwb.de/mkin/'>mkin</a></span><span class='op'>)</span> @@ -397,7 +397,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media</p> #> }) #> return(predicted) #> } -#> <environment: 0x55555b0c2760></div><div class='input'> +#> <environment: 0x55555c17ae90></div><div class='input'> <span class='co'># If we have several parallel metabolites</span> <span class='co'># (compare tests/testthat/test_synthetic_data_for_UBA_2014.R)</span> <span class='va'>m_synth_DFOP_par</span> <span class='op'><-</span> <span class='fu'>mkinmod</span><span class='op'>(</span> diff --git a/docs/reference/mkinpredict.html b/docs/reference/mkinpredict.html index 25e26419..5775ba62 100644 --- a/docs/reference/mkinpredict.html +++ b/docs/reference/mkinpredict.html @@ -74,7 +74,7 @@ kinetic parameters and initial values for the state variables." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> @@ -410,8 +410,8 @@ as these always return mapped output.</p></td> </div><div class='output co'>#> test relative elapsed #> 2 deSolve_compiled 1.0 0.005 #> 4 analytical 1.0 0.005 -#> 1 eigen 4.4 0.022 -#> 3 deSolve 47.0 0.235</div><div class='input'> +#> 1 eigen 4.0 0.020 +#> 3 deSolve 46.2 0.231</div><div class='input'> <span class='co'># \dontrun{</span> <span class='co'># Predict from a fitted model</span> <span class='va'>f</span> <span class='op'><-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span><span class='op'>(</span><span class='va'>SFO_SFO</span>, <span class='va'>FOCUS_2006_C</span>, quiet <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> diff --git a/docs/reference/mkinresplot-1.png b/docs/reference/mkinresplot-1.png Binary files differindex ffd34f6f..963aa5b7 100644 --- a/docs/reference/mkinresplot-1.png +++ b/docs/reference/mkinresplot-1.png diff --git a/docs/reference/mkinresplot.html b/docs/reference/mkinresplot.html index 04ff15b8..fe3150e7 100644 --- a/docs/reference/mkinresplot.html +++ b/docs/reference/mkinresplot.html @@ -75,7 +75,7 @@ argument show_residuals = TRUE." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/mmkin-1.png b/docs/reference/mmkin-1.png Binary files differindex 0db3379f..f6bb2131 100644 --- a/docs/reference/mmkin-1.png +++ b/docs/reference/mmkin-1.png diff --git a/docs/reference/mmkin-2.png b/docs/reference/mmkin-2.png Binary files differindex 024a9892..50102a3d 100644 --- a/docs/reference/mmkin-2.png +++ b/docs/reference/mmkin-2.png diff --git a/docs/reference/mmkin-3.png b/docs/reference/mmkin-3.png Binary files differindex a23d7cb9..9aa7f0db 100644 --- a/docs/reference/mmkin-3.png +++ b/docs/reference/mmkin-3.png diff --git a/docs/reference/mmkin-4.png b/docs/reference/mmkin-4.png Binary files differindex 89975db5..f4f413d1 100644 --- a/docs/reference/mmkin-4.png +++ b/docs/reference/mmkin-4.png diff --git a/docs/reference/mmkin-5.png b/docs/reference/mmkin-5.png Binary files differindex a2f34983..48ab2c50 100644 --- a/docs/reference/mmkin-5.png +++ b/docs/reference/mmkin-5.png diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html index c9800fe7..caba300e 100644 --- a/docs/reference/mmkin.html +++ b/docs/reference/mmkin.html @@ -75,7 +75,7 @@ datasets specified in its first two arguments." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> @@ -155,7 +155,7 @@ datasets specified in its first two arguments.</p> <pre class="usage"><span class='fu'>mmkin</span><span class='op'>(</span> models <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"FOMC"</span>, <span class='st'>"DFOP"</span><span class='op'>)</span>, <span class='va'>datasets</span>, - cores <span class='op'>=</span> <span class='fu'>parallel</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/r/parallel/detectCores.html'>detectCores</a></span><span class='op'>(</span><span class='op'>)</span>, + cores <span class='op'>=</span> <span class='kw'>if</span> <span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/Sys.info.html'>Sys.info</a></span><span class='op'>(</span><span class='op'>)</span><span class='op'>[</span><span class='st'>"sysname"</span><span class='op'>]</span> <span class='op'>==</span> <span class='st'>"Windows"</span><span class='op'>)</span> <span class='fl'>1</span> <span class='kw'>else</span> <span class='fu'>parallel</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/r/parallel/detectCores.html'>detectCores</a></span><span class='op'>(</span><span class='op'>)</span>, cluster <span class='op'>=</span> <span class='cn'>NULL</span>, <span class='va'>...</span> <span class='op'>)</span> @@ -183,7 +183,8 @@ data for <code><a href='mkinfit.html'>mkinfit</a></code>.</p></td> is only used when the <code>cluster</code> argument is <code>NULL</code>. On Windows machines, cores > 1 is not supported, you need to use the <code>cluster</code> argument to use multiple logical processors. Per default, all cores -detected by <code><a href='https://rdrr.io/r/parallel/detectCores.html'>parallel::detectCores()</a></code> are used.</p></td> +detected by <code><a href='https://rdrr.io/r/parallel/detectCores.html'>parallel::detectCores()</a></code> are used, except on Windows where +the default is 1.</p></td> </tr> <tr> <th>cluster</th> @@ -234,9 +235,9 @@ plotting.</p></div> <span class='va'>time_default</span> </div><div class='output co'>#> user system elapsed -#> 4.630 0.415 1.717 </div><div class='input'><span class='va'>time_1</span> +#> 4.656 0.403 1.734 </div><div class='input'><span class='va'>time_1</span> </div><div class='output co'>#> user system elapsed -#> 5.694 0.000 5.694 </div><div class='input'> +#> 5.627 0.004 5.631 </div><div class='input'> <span class='fu'><a href='endpoints.html'>endpoints</a></span><span class='op'>(</span><span class='va'>fits.0</span><span class='op'>[[</span><span class='st'>"SFO_lin"</span>, <span class='fl'>2</span><span class='op'>]</span><span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> $ff #> parent_M1 parent_sink M1_M2 M1_sink diff --git a/docs/reference/nlme-1.png b/docs/reference/nlme-1.png Binary files differindex 728cc557..c41adc27 100644 --- a/docs/reference/nlme-1.png +++ b/docs/reference/nlme-1.png diff --git a/docs/reference/nlme-2.png b/docs/reference/nlme-2.png Binary files differindex e8167455..c0d8e857 100644 --- a/docs/reference/nlme-2.png +++ b/docs/reference/nlme-2.png diff --git a/docs/reference/nlme.html b/docs/reference/nlme.html index 7b0c6a97..c6b43aab 100644 --- a/docs/reference/nlme.html +++ b/docs/reference/nlme.html @@ -75,7 +75,7 @@ datasets. They are used internally by the nlme.mmkin() method." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/nlme.mmkin-1.png b/docs/reference/nlme.mmkin-1.png Binary files differindex 9186c135..90ede880 100644 --- a/docs/reference/nlme.mmkin-1.png +++ b/docs/reference/nlme.mmkin-1.png diff --git a/docs/reference/nlme.mmkin-2.png b/docs/reference/nlme.mmkin-2.png Binary files differindex d395fe02..0d140fd1 100644 --- a/docs/reference/nlme.mmkin-2.png +++ b/docs/reference/nlme.mmkin-2.png diff --git a/docs/reference/nlme.mmkin-3.png b/docs/reference/nlme.mmkin-3.png Binary files differindex 40518a59..8a60b52b 100644 --- a/docs/reference/nlme.mmkin-3.png +++ b/docs/reference/nlme.mmkin-3.png diff --git a/docs/reference/nlme.mmkin.html b/docs/reference/nlme.mmkin.html index 189e34ef..03448606 100644 --- a/docs/reference/nlme.mmkin.html +++ b/docs/reference/nlme.mmkin.html @@ -74,7 +74,7 @@ have been obtained by fitting the same model to a list of datasets." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/parms.html b/docs/reference/parms.html index e45d6a5c..b4346b13 100644 --- a/docs/reference/parms.html +++ b/docs/reference/parms.html @@ -74,7 +74,7 @@ considering the error structure that was assumed for the fit." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/plot.mixed.mmkin-1.png b/docs/reference/plot.mixed.mmkin-1.png Binary files differindex 2224d96e..65660abe 100644 --- a/docs/reference/plot.mixed.mmkin-1.png +++ b/docs/reference/plot.mixed.mmkin-1.png diff --git a/docs/reference/plot.mkinfit-1.png b/docs/reference/plot.mkinfit-1.png Binary files differindex e5da9f1c..54e5c46f 100644 --- a/docs/reference/plot.mkinfit-1.png +++ b/docs/reference/plot.mkinfit-1.png diff --git a/docs/reference/plot.mkinfit-2.png b/docs/reference/plot.mkinfit-2.png Binary files differindex a11d1680..ff8418a3 100644 --- a/docs/reference/plot.mkinfit-2.png +++ b/docs/reference/plot.mkinfit-2.png diff --git a/docs/reference/plot.mkinfit-3.png b/docs/reference/plot.mkinfit-3.png Binary files differindex c976d4b1..54f2b981 100644 --- a/docs/reference/plot.mkinfit-3.png +++ b/docs/reference/plot.mkinfit-3.png diff --git a/docs/reference/plot.mkinfit-4.png b/docs/reference/plot.mkinfit-4.png Binary files differindex c8bc00fe..7a7bfc6c 100644 --- a/docs/reference/plot.mkinfit-4.png +++ b/docs/reference/plot.mkinfit-4.png diff --git a/docs/reference/plot.mkinfit-5.png b/docs/reference/plot.mkinfit-5.png Binary files differindex 6631aa68..6a6741e7 100644 --- a/docs/reference/plot.mkinfit-5.png +++ b/docs/reference/plot.mkinfit-5.png diff --git a/docs/reference/plot.mkinfit-6.png b/docs/reference/plot.mkinfit-6.png Binary files differindex 946b20c5..c4d0b9c7 100644 --- a/docs/reference/plot.mkinfit-6.png +++ b/docs/reference/plot.mkinfit-6.png diff --git a/docs/reference/plot.mkinfit-7.png b/docs/reference/plot.mkinfit-7.png Binary files differindex 10807ea8..802b00ef 100644 --- a/docs/reference/plot.mkinfit-7.png +++ b/docs/reference/plot.mkinfit-7.png diff --git a/docs/reference/plot.mkinfit.html b/docs/reference/plot.mkinfit.html index b80c672d..ff6da93e 100644 --- a/docs/reference/plot.mkinfit.html +++ b/docs/reference/plot.mkinfit.html @@ -74,7 +74,7 @@ observed data together with the solution of the fitted model." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/plot.mmkin-1.png b/docs/reference/plot.mmkin-1.png Binary files differindex 647dfb8a..d06d683c 100644 --- a/docs/reference/plot.mmkin-1.png +++ b/docs/reference/plot.mmkin-1.png diff --git a/docs/reference/plot.mmkin-2.png b/docs/reference/plot.mmkin-2.png Binary files differindex 1bc1c9db..d3678aca 100644 --- a/docs/reference/plot.mmkin-2.png +++ b/docs/reference/plot.mmkin-2.png diff --git a/docs/reference/plot.mmkin-3.png b/docs/reference/plot.mmkin-3.png Binary files differindex 50d6ffac..f84d5782 100644 --- a/docs/reference/plot.mmkin-3.png +++ b/docs/reference/plot.mmkin-3.png diff --git a/docs/reference/plot.mmkin-4.png b/docs/reference/plot.mmkin-4.png Binary files differindex e049fa16..9919dacb 100644 --- a/docs/reference/plot.mmkin-4.png +++ b/docs/reference/plot.mmkin-4.png diff --git a/docs/reference/plot.mmkin-5.png b/docs/reference/plot.mmkin-5.png Binary files differindex 2421995b..945b863f 100644 --- a/docs/reference/plot.mmkin-5.png +++ b/docs/reference/plot.mmkin-5.png diff --git a/docs/reference/plot.mmkin.html b/docs/reference/plot.mmkin.html index 20f9033d..3348e050 100644 --- a/docs/reference/plot.mmkin.html +++ b/docs/reference/plot.mmkin.html @@ -76,7 +76,7 @@ the fit of at least one model to the same dataset is shown." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/reexports.html b/docs/reference/reexports.html index 864c4ff9..c6d716a1 100644 --- a/docs/reference/reexports.html +++ b/docs/reference/reexports.html @@ -79,7 +79,7 @@ below to see their documentation. </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/sigma_twocomp-1.png b/docs/reference/sigma_twocomp-1.png Binary files differindex 6e61684e..fddb86a7 100644 --- a/docs/reference/sigma_twocomp-1.png +++ b/docs/reference/sigma_twocomp-1.png diff --git a/docs/reference/sigma_twocomp.html b/docs/reference/sigma_twocomp.html index 397582f0..1b4e45e4 100644 --- a/docs/reference/sigma_twocomp.html +++ b/docs/reference/sigma_twocomp.html @@ -73,7 +73,7 @@ dependence of the measured value \(y\):" /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> diff --git a/docs/reference/summary.nlme.mmkin.html b/docs/reference/summary.nlme.mmkin.html index d6840425..8df9011d 100644 --- a/docs/reference/summary.nlme.mmkin.html +++ b/docs/reference/summary.nlme.mmkin.html @@ -76,7 +76,7 @@ endpoints such as formation fractions and DT50 values. Optionally </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> @@ -265,10 +265,10 @@ José Pinheiro and Douglas Bates for the components inherited from nlme</p> #> <span class='warning'>iteration limit reached without convergence (10)</span></div><div class='input'><span class='va'>f_nlme</span> <span class='op'><-</span> <span class='fu'><a href='https://rdrr.io/pkg/nlme/man/nlme.html'>nlme</a></span><span class='op'>(</span><span class='va'>f_mmkin</span><span class='op'>)</span> </div><div class='output co'>#> <span class='warning'>Warning: Iteration 4, LME step: nlminb() did not converge (code = 1). PORT message: false convergence (8)</span></div><div class='input'><span class='fu'><a href='https://rdrr.io/r/base/summary.html'>summary</a></span><span class='op'>(</span><span class='va'>f_nlme</span>, data <span class='op'>=</span> <span class='cn'>TRUE</span><span class='op'>)</span> </div><div class='output co'>#> nlme version used for fitting: 3.1.152 -#> mkin version used for pre-fitting: 1.0.3 -#> R version used for fitting: 4.0.3 -#> Date of fit: Mon Feb 15 13:46:13 2021 -#> Date of summary: Mon Feb 15 13:46:13 2021 +#> mkin version used for pre-fitting: 1.0.4 +#> R version used for fitting: 4.0.4 +#> Date of fit: Wed Mar 31 19:18:24 2021 +#> Date of summary: Wed Mar 31 19:18:24 2021 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -278,7 +278,7 @@ José Pinheiro and Douglas Bates for the components inherited from nlme</p> #> #> Model predictions using solution type analytical #> -#> Fitted in 0.553 s using 4 iterations +#> Fitted in 0.537 s using 4 iterations #> #> Variance model: Two-component variance function #> diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html index c3c756f6..bbaad91e 100644 --- a/docs/reference/transform_odeparms.html +++ b/docs/reference/transform_odeparms.html @@ -77,7 +77,7 @@ the ilr transformation is used." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span> </span> </div> |
