Skip to content

Commit caba246

Browse files
mhovdSiel
andauthored
feat!: Update NPResult to contain the posterior and predictions (#224)
* Add method to write Theta with names and probs * Add Posterior to NPResult * Add predictions to NPResult * Update predictions.rs * Implement suggestions * chore: Clean up some comments * feat: some methods needed in hermes (#226) * some methods needed in hermes --------- Co-authored-by: Julian Otalvaro <juliandavid347@gmail.com>
1 parent 807fd5f commit caba246

File tree

18 files changed

+115
-57
lines changed

18 files changed

+115
-57
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ tracing-subscriber = { version = "0.3.19", features = [
2929
] }
3030
faer = "0.23.1"
3131
faer-ext = { version = "0.7.1", features = ["nalgebra", "ndarray"] }
32-
pharmsol = "=0.20.0"
32+
pharmsol = "=0.21.0"
3333
rand = "0.9.0"
3434
anyhow = "1.0.100"
3535
rayon = "1.10.0"

examples/bimodal_ke/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn main() -> Result<()> {
4848
settings.initialize_logs()?;
4949
let data = data::read_pmetrics("examples/bimodal_ke/bimodal_ke.csv")?;
5050
let mut algorithm = dispatch_algorithm(settings, eq, data)?;
51-
let result = algorithm.fit()?;
51+
let mut result = algorithm.fit()?;
5252
result.write_outputs()?;
5353

5454
Ok(())

examples/drusano/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ fn main() -> Result<()> {
137137
algorithm.initialize().unwrap();
138138
algorithm.fit().unwrap();
139139
// while !algorithm.next_cycle().unwrap() {}
140-
let result = algorithm.into_npresult();
140+
let mut result = algorithm.into_npresult()?;
141141
result.write_outputs().unwrap();
142142
Ok(())
143143
}

examples/iov/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn main() -> Result<()> {
5252
let data = data::read_pmetrics("examples/iov/test.csv").unwrap();
5353
let mut algorithm = dispatch_algorithm(settings, sde, data).unwrap();
5454
algorithm.initialize().unwrap();
55-
let result = algorithm.fit().unwrap();
55+
let mut result = algorithm.fit().unwrap();
5656
result.write_outputs().unwrap();
5757

5858
Ok(())

examples/meta/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ fn main() {
6464
let mut algorithm = dispatch_algorithm(settings, eq, data).unwrap();
6565
// let result = algorithm.fit().unwrap();
6666
algorithm.initialize().unwrap();
67-
let result = algorithm.fit().unwrap();
67+
let mut result = algorithm.fit().unwrap();
6868
result.write_outputs().unwrap();
6969
}

examples/neely/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ fn main() {
9696
settings.initialize_logs().unwrap();
9797
let data = data::read_pmetrics("examples/neely/data.csv").unwrap();
9898
let mut algorithm = dispatch_algorithm(settings, ode, data).unwrap();
99-
let result = algorithm.fit().unwrap();
99+
let mut result = algorithm.fit().unwrap();
100100
result.write_outputs().unwrap();
101101
}

examples/new_iov/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ fn main() {
5555
let data = data::read_pmetrics("examples/new_iov/data.csv").unwrap();
5656
let mut algorithm = dispatch_algorithm(settings, sde, data).unwrap();
5757
algorithm.initialize().unwrap();
58-
let result = algorithm.fit().unwrap();
58+
let mut result = algorithm.fit().unwrap();
5959
result.write_outputs().unwrap();
6060
}

examples/theophylline/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ fn main() {
5353
let mut algorithm = dispatch_algorithm(settings, eq, data).unwrap();
5454
// let result = algorithm.fit().unwrap();
5555
algorithm.initialize().unwrap();
56-
let result = algorithm.fit().unwrap();
56+
let mut result = algorithm.fit().unwrap();
5757
result.write_outputs().unwrap();
5858
}

examples/two_eq_lag/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fn main() {
8989
settings.initialize_logs().unwrap();
9090
let data = data::read_pmetrics("examples/two_eq_lag/two_eq_lag.csv").unwrap();
9191
let mut algorithm = dispatch_algorithm(settings, eq, data).unwrap();
92-
let result = algorithm.fit().unwrap();
92+
let mut result = algorithm.fit().unwrap();
9393
// algorithm.initialize().unwrap();
9494
// while !algorithm.next_cycle().unwrap() {}
9595
// let result = algorithm.into_npresult();

examples/vanco_sde/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ fn main() {
7878

7979
let mut algorithm = dispatch_algorithm(settings, sde, data).unwrap();
8080
algorithm.initialize().unwrap();
81-
let result = algorithm.fit().unwrap();
81+
let mut result = algorithm.fit().unwrap();
8282
result.write_outputs().unwrap();
8383
}

0 commit comments

Comments
 (0)