diff options
Diffstat (limited to 'docs/reference/mkinfit.html')
| -rw-r--r-- | docs/reference/mkinfit.html | 17 | 
1 files changed, 9 insertions, 8 deletions
| diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index f9c6c117..b1c42168 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -71,7 +71,7 @@        </button>        <span class="navbar-brand">          <a class="navbar-link" href="../index.html">mkin</a> -        <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.2</span> +        <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="Released package">0.9.47.3</span>        </span>      </div> @@ -161,7 +161,7 @@    <span class='kw'>transform_rates</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,    <span class='kw'>transform_fractions</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,    <span class='kw'>plot</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>, <span class='kw'>err</span> <span class='kw'>=</span> <span class='kw'>NULL</span>, -  <span class='kw'>weight</span> <span class='kw'>=</span> <span class='fu'>c</span>(<span class='st'>"none"</span>, <span class='st'>"std"</span>, <span class='st'>"mean"</span>, <span class='st'>"tc"</span>), +  <span class='kw'>weight</span> <span class='kw'>=</span> <span class='fu'>c</span>(<span class='st'>"none"</span>, <span class='st'>"manual"</span>, <span class='st'>"std"</span>, <span class='st'>"mean"</span>, <span class='st'>"tc"</span>),    <span class='kw'>tc</span> <span class='kw'>=</span> <span class='fu'>c</span>(<span class='kw'>sigma_low</span> <span class='kw'>=</span> <span class='fl'>0.5</span>, <span class='kw'>rsd_high</span> <span class='kw'>=</span> <span class='fl'>0.07</span>),    <span class='kw'>scaleVar</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,    <span class='kw'>atol</span> <span class='kw'>=</span> <span class='fl'>1e-8</span>, <span class='kw'>rtol</span> <span class='kw'>=</span> <span class='fl'>1e-10</span>, <span class='kw'>n.outtimes</span> <span class='kw'>=</span> <span class='fl'>100</span>, @@ -326,7 +326,8 @@        <th>weight</th>        <td><p>only if <code>err</code>=<code>NULL</code>: how to weight the residuals, one of "none",      "std", "mean", see details of <code>modCost</code>, or "tc" for the -    two component error model.</p></td> +    two component error model. The option "manual" is available for  +    the case that <code>err</code>!=<code>NULL</code>, but it is not necessary to specify it.</p></td>      </tr>      <tr>        <th>tc</th> @@ -431,17 +432,17 @@      <h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2>      <pre class="examples"><div class='input'><span class='co'># Use shorthand notation for parent only degradation</span>  <span class='no'>fit</span> <span class='kw'><-</span> <span class='fu'>mkinfit</span>(<span class='st'>"FOMC"</span>, <span class='no'>FOCUS_2006_C</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>) -<span class='fu'>summary</span>(<span class='no'>fit</span>)</div><div class='output co'>#> mkin version used for fitting:    0.9.47.2  +<span class='fu'>summary</span>(<span class='no'>fit</span>)</div><div class='output co'>#> mkin version used for fitting:    0.9.47.3   #> R version used for fitting:       3.5.1  -#> Date of fit:     Thu Sep  6 13:35:36 2018  -#> Date of summary: Thu Sep  6 13:35:36 2018  +#> Date of fit:     Fri Sep 14 06:39:09 2018  +#> Date of summary: Fri Sep 14 06:39:09 2018   #>   #> Equations:  #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent  #>   #> Model predictions using solution type analytical   #>  -#> Fitted with method Port using 64 model solutions performed in 0.144 s +#> Fitted with method Port using 64 model solutions performed in 0.157 s  #>   #> Weighting: none  #>  @@ -510,7 +511,7 @@    <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#> <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='co'># Fit the model to the FOCUS example dataset D using defaults</span>  <span class='fu'>print</span>(<span class='fu'>system.time</span>(<span class='no'>fit</span> <span class='kw'><-</span> <span class='fu'>mkinfit</span>(<span class='no'>SFO_SFO</span>, <span class='no'>FOCUS_2006_D</span>,                             <span class='kw'>solution_type</span> <span class='kw'>=</span> <span class='st'>"eigen"</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)))</div><div class='output co'>#>        User      System verstrichen  -#>       0.919       0.000       0.920 </div><div class='input'><span class='fu'>coef</span>(<span class='no'>fit</span>)</div><div class='output co'>#>          parent_0 log_k_parent_sink   log_k_parent_m1     log_k_m1_sink  +#>       0.892       0.000       0.892 </div><div class='input'><span class='fu'>coef</span>(<span class='no'>fit</span>)</div><div class='output co'>#>          parent_0 log_k_parent_sink   log_k_parent_m1     log_k_m1_sink   #>          99.59848          -3.03822          -2.98030          -5.24750 </div><div class='input'><span class='fu'><a href='endpoints.html'>endpoints</a></span>(<span class='no'>fit</span>)</div><div class='output co'>#> $ff  #> parent_sink   parent_m1     m1_sink   #>    0.485524    0.514476    1.000000  | 
