Skip to content

Greco model #190

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
Siel merged 2 commits into from
Sep 29, 2025
Merged

Greco model #190

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
0f5b748
make get_xm0best return xm0best/(xm0best_1.0)
Siel Sep 5, 2025
e82694c
update faer
Siel Sep 29, 2025
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
6 changes: 3 additions & 3 deletions examples/drusano/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ fn main() -> Result<()> {
let u_s = x[0] / (v1 * e50_1s);
let v_s = x[1] / (v2 * e50_2s);
let w_s = alpha_s * u_s * v_s / (e50_1s * e50_2s);
let xm0best = get_xm0best(u_s, v_s, w_s, 1.0 / h1s, 1.0 / h2s, alpha_s);
let xm0best = get_e2(u_s, v_s, w_s, 1.0 / h1s, 1.0 / h2s, alpha_s);
dx[2] = xns * (kgs * e - kks * xm0best);

// Case r1
let u_r1 = x[0] / (v1 * e50_1r1);
let v_r1 = x[1] / (v2 * e50_2r1);
let w_r1 = alpha_r1 * u_r1 * v_r1 / (e50_1r1 * e50_2r1);
let xm0best = get_xm0best(u_r1, v_r1, w_r1, 1.0 / h1r1, 1.0 / h2r1, alpha_s);
let xm0best = get_e2(u_r1, v_r1, w_r1, 1.0 / h1r1, 1.0 / h2r1, alpha_s);
dx[3] = xnr1 * (kgr1 * e - kkr1 * xm0best);

// Case r2
let u_r2 = x[0] / (v1 * e50_1r2);
let v_r2 = x[1] / (v2 * e50_2r2);
let w_r2 = alpha_r2 * u_r2 * v_r2 / (e50_1r2 * e50_2r2);
let xm0best = get_xm0best(u_r2, v_r2, w_r2, 1.0 / h1r2, 1.0 / h2r2, alpha_s);
let xm0best = get_e2(u_r2, v_r2, w_r2, 1.0 / h1r2, 1.0 / h2r2, alpha_s);
dx[4] = xnr2 * (kgr2 * e - kkr2 * xm0best);
},
|_p, _t, _cov| lag! {},
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub mod prelude {
pub use crate::algorithms::Algorithm;
pub use crate::routines;
pub use crate::routines::logger;
pub use crate::routines::optimization::bestmo::get_xm0best;
pub use crate::routines::optimization::bestmo::get_e2;

pub use pharmsol;

Expand Down
2 changes: 1 addition & 1 deletion src/routines/optimization/bestmo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn find_m0(afinal: f64, b: f64, alpha: f64, h1: f64, h2: f64) -> f64 {
xm
}

pub fn get_xm0best(a: f64, b: f64, w: f64, h1: f64, h2: f64, alpha_s: f64) -> f64 {
pub fn get_e2(a: f64, b: f64, w: f64, h1: f64, h2: f64, alpha_s: f64) -> f64 {
// trivial cases
if a.abs() < 1.0e-12 && b.abs() < 1.0e-12 {
return 0.0;
Expand Down
Loading