diff --git a/examples/meta/main.rs b/examples/meta/main.rs index 4c3fa264d..61dc77ebf 100644 --- a/examples/meta/main.rs +++ b/examples/meta/main.rs @@ -13,7 +13,7 @@ fn main() { let v = vs * ((pkvisit - 1.0) * theta2).exp() * (wt / 70.0); let ke = cl / v; let v2 = relv * v; - dx[0] = rateiv[0] - ke * x[0] * (1.0 - fm) - fm * x[0] + b[0]; + dx[0] = rateiv[1] - ke * x[0] * (1.0 - fm) - fm * x[0] + b[1]; dx[1] = fm * x[0] - k20 * x[1]; }, out: |x, p, t, cov, y| { @@ -23,8 +23,8 @@ fn main() { let v = vs * ((pkvisit - 1.0) * theta2).exp() * (wt / 70.0); let ke = cl / v; let v2 = relv * v; - y[0] = x[0] / v; - y[1] = x[1] / v2; + y[1] = x[0] / v; + y[2] = x[1] / v2; }, }; @@ -39,12 +39,12 @@ fn main() { let ems = AssayErrorModels::new() .add( - 0, + 1, AssayErrorModel::proportional(ErrorPoly::new(1.0, 0.1, 0.0, 0.0), 5.0), ) .unwrap() .add( - 1, + 2, AssayErrorModel::proportional(ErrorPoly::new(1.0, 0.1, 0.0, 0.0), 5.0), ) .unwrap(); diff --git a/examples/neely/main.rs b/examples/neely/main.rs index 98b47cbee..3cf903b19 100644 --- a/examples/neely/main.rs +++ b/examples/neely/main.rs @@ -18,9 +18,9 @@ fn main() { let k21 = q / vp; // - dx[0] = rateiv[0] - ke * x[0] * (1.0 - fm1 - fm2) - (fm1 + fm2) * x[0] - k12 * x[0] + dx[0] = rateiv[1] - ke * x[0] * (1.0 - fm1 - fm2) - (fm1 + fm2) * x[0] - k12 * x[0] + k21 * x[1] - + b[0]; + + b[1]; dx[1] = k12 * x[0] - k21 * x[1]; dx[2] = fm1 * x[0] - k30 * x[2]; dx[3] = fm2 * x[0] - k40 * x[3]; @@ -41,9 +41,9 @@ fn main() { let _k12 = q / v; let _k21 = q / vp; - y[0] = x[0] / v; - y[1] = x[2] / vm1; - y[2] = x[3] / vm2; + y[1] = x[0] / v; + y[2] = x[2] / vm1; + y[3] = x[3] / vm2; }, }; let params = Parameters::new() @@ -60,17 +60,17 @@ fn main() { let ems = AssayErrorModels::new() .add( - 0, + 1, AssayErrorModel::proportional(ErrorPoly::new(1.0, 0.1, 0.0, 0.0), 5.0), ) .unwrap() .add( - 1, + 2, AssayErrorModel::proportional(ErrorPoly::new(1.0, 0.1, 0.0, 0.0), 5.0), ) .unwrap() .add( - 2, + 3, AssayErrorModel::proportional(ErrorPoly::new(1.0, 0.1, 0.0, 0.0), 5.0), ) .unwrap(); diff --git a/examples/two_eq_lag/main.rs b/examples/two_eq_lag/main.rs index ec1c06d65..92454a6b6 100644 --- a/examples/two_eq_lag/main.rs +++ b/examples/two_eq_lag/main.rs @@ -9,16 +9,16 @@ fn main() { diffeq: |x, p, _t, dx, b, rateiv, _cov| { fetch_cov!(cov, t,); fetch_params!(p, ka, ke); - dx[0] = -ka * x[0] + b[0]; + dx[0] = -ka * x[0] + b[1]; dx[1] = ka * x[0] - ke * x[1]; }, lag: |p, _t, _cov| { fetch_params!(p, _ka, _ke, tlag, _v); - lag! {0=>tlag} + lag! {1=>tlag} }, out: |x, p, _t, _cov, y| { fetch_params!(p, _ka, _ke, _tlag, v); - y[0] = x[1] / v; + y[1] = x[1] / v; }, }; // let eq = Equation::new_analytical( @@ -72,7 +72,7 @@ fn main() { let ems = AssayErrorModels::new() .add( - 0, + 1, AssayErrorModel::additive(ErrorPoly::new(-0.00119, 0.44379, -0.45864, 0.16537), 0.0), ) .unwrap();