diff --git a/Cargo.lock b/Cargo.lock index dd58421..3a008b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "approx" @@ -99,7 +99,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn", ] [[package]] @@ -108,6 +108,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "cc" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" + [[package]] name = "cfg-if" version = "1.0.0" @@ -193,11 +199,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown", "lock_api", "once_cell", @@ -212,11 +219,12 @@ checksum = "e6ca96b45ca70b8045e0462f191bd209fcb3c3bfe8dbfb1257ada54c4dd59169" [[package]] name = "diffsol" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c163a6e2b484ed2ae9fa40535d35116e5ebd988c8068bf89a59b1fc69a7328c" +checksum = "f78ea17bb48628f22bf1b52c679c9ce925415adaab953981270dc527c5b90577" dependencies = [ "anyhow", + "cc", "faer", "nalgebra", "nalgebra-sparse", @@ -261,7 +269,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.61", + "syn", ] [[package]] @@ -281,7 +289,7 @@ checksum = "60d08acb9849f7fb4401564f251be5a526829183a3645a90197dea8e786cf3ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn", ] [[package]] @@ -597,9 +605,9 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "nalgebra" -version = "0.32.5" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" +checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4" dependencies = [ "approx", "matrixmultiply", @@ -613,20 +621,20 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" +checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "nalgebra-sparse" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b113b3101e137b3d0ef20b76b7579cde88e3d1f2f64993d4d6a49f232055cc9" +checksum = "1107e2587bc373090389bd5b54e05ac3184fd02d7c102decf5d76b8feb84b2d0" dependencies = [ "nalgebra", "num-traits", @@ -692,6 +700,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ + "num-bigint", "num-integer", "num-traits", ] @@ -734,7 +743,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.61", + "syn", ] [[package]] @@ -787,7 +796,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.61", + "syn", ] [[package]] @@ -813,7 +822,7 @@ dependencies = [ [[package]] name = "pharmsol" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "argmin", @@ -852,7 +861,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn", "version_check", "yansi", ] @@ -1043,7 +1052,7 @@ checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn", ] [[package]] @@ -1070,9 +1079,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" +checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" dependencies = [ "approx", "num-complex", @@ -1093,17 +1102,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.61" @@ -1146,7 +1144,7 @@ checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 26f84fa..d8edbe4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pharmsol" -version = "0.2.2" +version = "0.2.3" edition = "2021" authors = [ "Julián D. Otálvaro ", @@ -15,10 +15,10 @@ anyhow = "1.0.83" argmin = "0.10.0" argmin-math = { version = "0.4.0", features = ["ndarray_v0_15-nolinalg"] } csv = "1.3.0" -dashmap = "5.5.3" -diffsol = "=0.1.10" +dashmap = "6.0.1" +diffsol = "=0.1.11" lazy_static = "1.4.0" -nalgebra = "0.32.5" +nalgebra = "0.33.0" ndarray = { version = "0.15.6", features = ["rayon"] } rayon = "1.10.0" serde = { version= "1.0.201", features = ["derive"] } diff --git a/src/simulator/ode/diffsol_traits.rs b/src/simulator/ode/diffsol_traits.rs index fa74dce..fd2c20a 100644 --- a/src/simulator/ode/diffsol_traits.rs +++ b/src/simulator/ode/diffsol_traits.rs @@ -36,7 +36,7 @@ where let rhs = Rc::new(rhs); let init = ConstantClosure::new(init, p.clone()); let init = Rc::new(init); - let eqn = OdeSolverEquations::new(rhs, None, None, init, p); + let eqn = OdeSolverEquations::new(rhs, None, None, init, None, p); let atol = M::V::from_element(nstates, M::T::from(atol)); OdeSolverProblem::new( eqn,