Skip to content

fix: Update examples to match the data #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhovd merged 2 commits into from
Apr 1, 2026
Merged

fix: Update examples to match the data #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272d8e9
fix examples to match the data
Siel Mar 25, 2026
cfe109c
Merge branch 'main' into fix/examples
mhovd Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/meta/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand All @@ -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;
},
};

Expand All @@ -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();
Expand Down
16 changes: 8 additions & 8 deletions examples/neely/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ fn main() {
let k21 = q / vp;

//</tem>
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];
Expand All @@ -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()
Expand All @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions examples/two_eq_lag/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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();
Expand Down
Loading