From fa4710b17028ac16042a2eaf7453780bd08098f0 Mon Sep 17 00:00:00 2001 From: Dorival Pedroso Date: Tue, 24 Sep 2024 12:25:32 +1000 Subject: [PATCH 1/3] Replace use crate::something with use something --- russell_lab/src/algo/mod.rs | 21 ++++----- russell_lab/src/base/mod.rs | 17 +++---- russell_lab/src/check/mod.rs | 35 ++++++++------- russell_lab/src/lib.rs | 15 ++++--- russell_lab/src/math/mod.rs | 33 +++++++------- russell_lab/src/matrix/mod.rs | 83 ++++++++++++++++++----------------- russell_lab/src/matvec/mod.rs | 23 +++++----- russell_lab/src/vector/mod.rs | 45 +++++++++---------- russell_ode/src/lib.rs | 35 ++++++++------- russell_sparse/src/lib.rs | 45 +++++++++---------- russell_stat/src/lib.rs | 17 +++---- russell_tensor/src/lib.rs | 33 +++++++------- 12 files changed, 207 insertions(+), 195 deletions(-) diff --git a/russell_lab/src/algo/mod.rs b/russell_lab/src/algo/mod.rs index bcabbccc..04f952d1 100644 --- a/russell_lab/src/algo/mod.rs +++ b/russell_lab/src/algo/mod.rs @@ -11,13 +11,14 @@ mod quadrature; mod root_finder; mod root_finder_brent; mod testing; -pub use crate::algo::common::*; -pub use crate::algo::interp_chebyshev::*; -pub use crate::algo::interp_lagrange::*; -pub use crate::algo::linear_fitting::*; -pub use crate::algo::min_bracketing::*; -pub use crate::algo::min_solver::*; -pub use crate::algo::num_jacobian::*; -pub use crate::algo::quadrature::*; -pub use crate::algo::root_finder::*; -pub use crate::algo::testing::*; + +pub use common::*; +pub use interp_chebyshev::*; +pub use interp_lagrange::*; +pub use linear_fitting::*; +pub use min_bracketing::*; +pub use min_solver::*; +pub use num_jacobian::*; +pub use quadrature::*; +pub use root_finder::*; +pub use testing::*; diff --git a/russell_lab/src/base/mod.rs b/russell_lab/src/base/mod.rs index bfdc0292..dafe3c49 100644 --- a/russell_lab/src/base/mod.rs +++ b/russell_lab/src/base/mod.rs @@ -9,11 +9,12 @@ mod macros; mod read_table; mod sort; mod stopwatch; -pub use crate::base::as_array::*; -pub use crate::base::auxiliary_blas::*; -pub use crate::base::enums::*; -pub use crate::base::formatters::*; -pub use crate::base::generators::*; -pub use crate::base::read_table::*; -pub use crate::base::sort::*; -pub use crate::base::stopwatch::*; + +pub use as_array::*; +pub use auxiliary_blas::*; +pub use enums::*; +pub use formatters::*; +pub use generators::*; +pub use read_table::*; +pub use sort::*; +pub use stopwatch::*; diff --git a/russell_lab/src/check/mod.rs b/russell_lab/src/check/mod.rs index d87c6442..3907bfb9 100644 --- a/russell_lab/src/check/mod.rs +++ b/russell_lab/src/check/mod.rs @@ -105,20 +105,21 @@ mod deriv2_backward; mod deriv2_central; mod deriv2_forward; mod testing; -pub use crate::check::approx_eq::*; -pub use crate::check::array_approx_eq::*; -pub use crate::check::assert_alike::*; -pub use crate::check::complex_approx_eq::*; -pub use crate::check::complex_array_approx_eq::*; -pub use crate::check::deriv1_approx_eq::*; -pub use crate::check::deriv1_approx_eq_bw::*; -pub use crate::check::deriv1_approx_eq_fw::*; -pub use crate::check::deriv1_backward::*; -pub use crate::check::deriv1_central::*; -pub use crate::check::deriv1_forward::*; -pub use crate::check::deriv2_approx_eq::*; -pub use crate::check::deriv2_approx_eq_bw::*; -pub use crate::check::deriv2_approx_eq_fw::*; -pub use crate::check::deriv2_backward::*; -pub use crate::check::deriv2_central::*; -pub use crate::check::deriv2_forward::*; + +pub use approx_eq::*; +pub use array_approx_eq::*; +pub use assert_alike::*; +pub use complex_approx_eq::*; +pub use complex_array_approx_eq::*; +pub use deriv1_approx_eq::*; +pub use deriv1_approx_eq_bw::*; +pub use deriv1_approx_eq_fw::*; +pub use deriv1_backward::*; +pub use deriv1_central::*; +pub use deriv1_forward::*; +pub use deriv2_approx_eq::*; +pub use deriv2_approx_eq_bw::*; +pub use deriv2_approx_eq_fw::*; +pub use deriv2_backward::*; +pub use deriv2_central::*; +pub use deriv2_forward::*; diff --git a/russell_lab/src/lib.rs b/russell_lab/src/lib.rs index a794df97..7177224b 100644 --- a/russell_lab/src/lib.rs +++ b/russell_lab/src/lib.rs @@ -154,13 +154,14 @@ pub mod math; pub mod matrix; pub mod matvec; pub mod vector; -pub use crate::algo::*; -pub use crate::base::*; -pub use crate::check::*; -use crate::internal::*; -pub use crate::matrix::*; -pub use crate::matvec::*; -pub use crate::vector::*; + +pub use algo::*; +pub use base::*; +pub use check::*; +use internal::*; +pub use matrix::*; +pub use matvec::*; +pub use vector::*; // run code from README file #[doc = include_str!("../README.md")] diff --git a/russell_lab/src/math/mod.rs b/russell_lab/src/math/mod.rs index 4d2060b3..cf7a6338 100644 --- a/russell_lab/src/math/mod.rs +++ b/russell_lab/src/math/mod.rs @@ -16,19 +16,20 @@ mod functions; mod gamma; mod ln_gamma; mod modulo; -pub use crate::math::bessel_0::*; -pub use crate::math::bessel_1::*; -pub use crate::math::bessel_mod::*; -pub use crate::math::bessel_n::*; -pub use crate::math::beta::*; -pub use crate::math::chebyshev::*; -pub use crate::math::complex::*; -pub use crate::math::composition::*; -pub use crate::math::constants::*; -pub use crate::math::elliptic::*; -pub use crate::math::erf::*; -pub use crate::math::erf_inv::*; -pub use crate::math::functions::*; -pub use crate::math::gamma::*; -pub use crate::math::ln_gamma::*; -pub use crate::math::modulo::*; + +pub use bessel_0::*; +pub use bessel_1::*; +pub use bessel_mod::*; +pub use bessel_n::*; +pub use beta::*; +pub use chebyshev::*; +pub use complex::*; +pub use composition::*; +pub use constants::*; +pub use elliptic::*; +pub use erf::*; +pub use erf_inv::*; +pub use functions::*; +pub use gamma::*; +pub use ln_gamma::*; +pub use modulo::*; diff --git a/russell_lab/src/matrix/mod.rs b/russell_lab/src/matrix/mod.rs index f7d79647..bee69e2b 100644 --- a/russell_lab/src/matrix/mod.rs +++ b/russell_lab/src/matrix/mod.rs @@ -42,44 +42,45 @@ mod mat_update; mod mat_write_vismatrix; mod num_matrix; mod testing; -pub use crate::matrix::aliases::*; -pub use crate::matrix::complex_mat_add::*; -pub use crate::matrix::complex_mat_approx_eq::*; -pub use crate::matrix::complex_mat_cholesky::*; -pub use crate::matrix::complex_mat_copy::*; -pub use crate::matrix::complex_mat_eigen::*; -pub use crate::matrix::complex_mat_eigen_herm::*; -pub use crate::matrix::complex_mat_gen_eigen::*; -pub use crate::matrix::complex_mat_herm_rank_op::*; -pub use crate::matrix::complex_mat_inverse::*; -pub use crate::matrix::complex_mat_mat_mul::*; -pub use crate::matrix::complex_mat_norm::*; -pub use crate::matrix::complex_mat_scale::*; -pub use crate::matrix::complex_mat_svd::*; -pub use crate::matrix::complex_mat_sym_rank_op::*; -pub use crate::matrix::complex_mat_t_mat_mul::*; -pub use crate::matrix::complex_mat_unzip::*; -pub use crate::matrix::complex_mat_update::*; -pub use crate::matrix::complex_mat_zip::*; -pub use crate::matrix::mat_add::*; -pub use crate::matrix::mat_approx_eq::*; -pub use crate::matrix::mat_cholesky::*; -pub use crate::matrix::mat_convert_to_blas_band::*; -pub use crate::matrix::mat_copy::*; -pub use crate::matrix::mat_eigen::*; -pub use crate::matrix::mat_eigen_sym::*; -pub use crate::matrix::mat_eigen_sym_jacobi::*; -pub use crate::matrix::mat_eigenvalues::*; -pub use crate::matrix::mat_gen_eigen::*; -pub use crate::matrix::mat_inverse::*; -pub use crate::matrix::mat_mat_mul::*; -pub use crate::matrix::mat_max_abs_diff::*; -pub use crate::matrix::mat_norm::*; -pub use crate::matrix::mat_pseudo_inverse::*; -pub use crate::matrix::mat_scale::*; -pub use crate::matrix::mat_svd::*; -pub use crate::matrix::mat_sym_rank_op::*; -pub use crate::matrix::mat_t_mat_mul::*; -pub use crate::matrix::mat_update::*; -pub use crate::matrix::mat_write_vismatrix::*; -pub use crate::matrix::num_matrix::*; + +pub use aliases::*; +pub use complex_mat_add::*; +pub use complex_mat_approx_eq::*; +pub use complex_mat_cholesky::*; +pub use complex_mat_copy::*; +pub use complex_mat_eigen::*; +pub use complex_mat_eigen_herm::*; +pub use complex_mat_gen_eigen::*; +pub use complex_mat_herm_rank_op::*; +pub use complex_mat_inverse::*; +pub use complex_mat_mat_mul::*; +pub use complex_mat_norm::*; +pub use complex_mat_scale::*; +pub use complex_mat_svd::*; +pub use complex_mat_sym_rank_op::*; +pub use complex_mat_t_mat_mul::*; +pub use complex_mat_unzip::*; +pub use complex_mat_update::*; +pub use complex_mat_zip::*; +pub use mat_add::*; +pub use mat_approx_eq::*; +pub use mat_cholesky::*; +pub use mat_convert_to_blas_band::*; +pub use mat_copy::*; +pub use mat_eigen::*; +pub use mat_eigen_sym::*; +pub use mat_eigen_sym_jacobi::*; +pub use mat_eigenvalues::*; +pub use mat_gen_eigen::*; +pub use mat_inverse::*; +pub use mat_mat_mul::*; +pub use mat_max_abs_diff::*; +pub use mat_norm::*; +pub use mat_pseudo_inverse::*; +pub use mat_scale::*; +pub use mat_svd::*; +pub use mat_sym_rank_op::*; +pub use mat_t_mat_mul::*; +pub use mat_update::*; +pub use mat_write_vismatrix::*; +pub use num_matrix::*; diff --git a/russell_lab/src/matvec/mod.rs b/russell_lab/src/matvec/mod.rs index 296322c7..1181140d 100644 --- a/russell_lab/src/matvec/mod.rs +++ b/russell_lab/src/matvec/mod.rs @@ -11,14 +11,15 @@ mod solve_lin_sys; mod vec_mat_mul; mod vec_outer; mod vec_outer_update; -pub use crate::matvec::complex_mat_vec_mul::*; -pub use crate::matvec::complex_solve_lin_sys::*; -pub use crate::matvec::complex_vec_mat_mul::*; -pub use crate::matvec::mat_sum_cols::*; -pub use crate::matvec::mat_sum_rows::*; -pub use crate::matvec::mat_vec_mul::*; -pub use crate::matvec::mat_vec_mul_update::*; -pub use crate::matvec::solve_lin_sys::*; -pub use crate::matvec::vec_mat_mul::*; -pub use crate::matvec::vec_outer::*; -pub use crate::matvec::vec_outer_update::*; + +pub use complex_mat_vec_mul::*; +pub use complex_solve_lin_sys::*; +pub use complex_vec_mat_mul::*; +pub use mat_sum_cols::*; +pub use mat_sum_rows::*; +pub use mat_vec_mul::*; +pub use mat_vec_mul_update::*; +pub use solve_lin_sys::*; +pub use vec_mat_mul::*; +pub use vec_outer::*; +pub use vec_outer_update::*; diff --git a/russell_lab/src/vector/mod.rs b/russell_lab/src/vector/mod.rs index b66548bf..1a292b35 100644 --- a/russell_lab/src/vector/mod.rs +++ b/russell_lab/src/vector/mod.rs @@ -22,25 +22,26 @@ mod vec_norm; mod vec_rms_scaled; mod vec_scale; mod vec_update; -pub use crate::vector::aliases::*; -pub use crate::vector::complex_vec_add::*; -pub use crate::vector::complex_vec_approx_eq::*; -pub use crate::vector::complex_vec_copy::*; -pub use crate::vector::complex_vec_norm::*; -pub use crate::vector::complex_vec_scale::*; -pub use crate::vector::complex_vec_unzip::*; -pub use crate::vector::complex_vec_update::*; -pub use crate::vector::complex_vec_zip::*; -pub use crate::vector::num_vector::*; -pub use crate::vector::vec_add::*; -pub use crate::vector::vec_all_finite::*; -pub use crate::vector::vec_approx_eq::*; -pub use crate::vector::vec_copy::*; -pub use crate::vector::vec_fmt_scientific::*; -pub use crate::vector::vec_inner::*; -pub use crate::vector::vec_max_abs_diff::*; -pub use crate::vector::vec_max_scaled::*; -pub use crate::vector::vec_norm::*; -pub use crate::vector::vec_rms_scaled::*; -pub use crate::vector::vec_scale::*; -pub use crate::vector::vec_update::*; + +pub use aliases::*; +pub use complex_vec_add::*; +pub use complex_vec_approx_eq::*; +pub use complex_vec_copy::*; +pub use complex_vec_norm::*; +pub use complex_vec_scale::*; +pub use complex_vec_unzip::*; +pub use complex_vec_update::*; +pub use complex_vec_zip::*; +pub use num_vector::*; +pub use vec_add::*; +pub use vec_all_finite::*; +pub use vec_approx_eq::*; +pub use vec_copy::*; +pub use vec_fmt_scientific::*; +pub use vec_inner::*; +pub use vec_max_abs_diff::*; +pub use vec_max_scaled::*; +pub use vec_norm::*; +pub use vec_rms_scaled::*; +pub use vec_scale::*; +pub use vec_update::*; diff --git a/russell_ode/src/lib.rs b/russell_ode/src/lib.rs index b3749821..b6a1e3a6 100644 --- a/russell_ode/src/lib.rs +++ b/russell_ode/src/lib.rs @@ -208,23 +208,24 @@ mod samples; mod stats; mod system; mod workspace; -pub use crate::constants::*; -use crate::detect_stiffness::*; -pub use crate::enums::*; -use crate::erk_dense_out::*; -use crate::euler_backward::*; -use crate::euler_forward::*; -use crate::explicit_runge_kutta::*; -pub use crate::ode_solver::*; -use crate::ode_solver_trait::*; -pub use crate::output::*; -pub use crate::params::*; -pub use crate::pde_discrete_laplacian_2d::*; -use crate::radau5::*; -pub use crate::samples::*; -pub use crate::stats::*; -pub use crate::system::*; -use crate::workspace::*; + +pub use constants::*; +use detect_stiffness::*; +pub use enums::*; +use erk_dense_out::*; +use euler_backward::*; +use euler_forward::*; +use explicit_runge_kutta::*; +pub use ode_solver::*; +use ode_solver_trait::*; +pub use output::*; +pub use params::*; +pub use pde_discrete_laplacian_2d::*; +use radau5::*; +pub use samples::*; +pub use stats::*; +pub use system::*; +use workspace::*; // run code from README file #[doc = include_str!("../README.md")] diff --git a/russell_sparse/src/lib.rs b/russell_sparse/src/lib.rs index d60b37a5..e96e2912 100644 --- a/russell_sparse/src/lib.rs +++ b/russell_sparse/src/lib.rs @@ -262,26 +262,27 @@ mod stats_lin_sol; mod stats_lin_sol_mumps; mod verify_lin_sys; mod write_matrix_market; -pub use crate::aliases::*; -pub use crate::complex_lin_solver::*; -pub use crate::complex_solver_klu::*; -pub use crate::complex_solver_umfpack::*; -use crate::constants::*; -pub use crate::coo_matrix::*; -pub use crate::csc_matrix::*; -pub use crate::csr_matrix::*; -pub use crate::enums::*; -pub use crate::lin_sol_params::*; -pub use crate::lin_solver::*; -pub use crate::numerical_jacobian::*; -pub use crate::read_matrix_market::*; -pub use crate::samples::*; -pub use crate::solver_klu::*; -pub use crate::solver_umfpack::*; -pub use crate::sparse_matrix::*; -pub use crate::stats_lin_sol::*; -pub use crate::stats_lin_sol_mumps::*; -pub use crate::verify_lin_sys::*; + +pub use aliases::*; +pub use complex_lin_solver::*; +pub use complex_solver_klu::*; +pub use complex_solver_umfpack::*; +use constants::*; +pub use coo_matrix::*; +pub use csc_matrix::*; +pub use csr_matrix::*; +pub use enums::*; +pub use lin_sol_params::*; +pub use lin_solver::*; +pub use numerical_jacobian::*; +pub use read_matrix_market::*; +pub use samples::*; +pub use solver_klu::*; +pub use solver_umfpack::*; +pub use sparse_matrix::*; +pub use stats_lin_sol::*; +pub use stats_lin_sol_mumps::*; +pub use verify_lin_sys::*; #[cfg(feature = "with_mumps")] mod complex_solver_mumps; @@ -290,10 +291,10 @@ mod complex_solver_mumps; mod solver_mumps; #[cfg(feature = "with_mumps")] -pub use crate::complex_solver_mumps::*; +pub use complex_solver_mumps::*; #[cfg(feature = "with_mumps")] -pub use crate::solver_mumps::*; +pub use solver_mumps::*; // run code from README file #[doc = include_str!("../README.md")] diff --git a/russell_stat/src/lib.rs b/russell_stat/src/lib.rs index a62dea60..2afc8a82 100644 --- a/russell_stat/src/lib.rs +++ b/russell_stat/src/lib.rs @@ -30,14 +30,15 @@ mod distribution_uniform; mod histogram; mod probability_distribution; mod statistics; -pub use crate::distribution_frechet::*; -pub use crate::distribution_gumbel::*; -pub use crate::distribution_lognormal::*; -pub use crate::distribution_normal::*; -pub use crate::distribution_uniform::*; -pub use crate::histogram::*; -pub use crate::probability_distribution::*; -pub use crate::statistics::*; + +pub use distribution_frechet::*; +pub use distribution_gumbel::*; +pub use distribution_lognormal::*; +pub use distribution_normal::*; +pub use distribution_uniform::*; +pub use histogram::*; +pub use probability_distribution::*; +pub use statistics::*; // run code from README file #[doc = include_str!("../README.md")] diff --git a/russell_tensor/src/lib.rs b/russell_tensor/src/lib.rs index aedc7fb7..5935bfc3 100644 --- a/russell_tensor/src/lib.rs +++ b/russell_tensor/src/lib.rs @@ -27,22 +27,23 @@ mod samples_tensor4; mod spectral2; mod tensor2; mod tensor4; -pub use crate::as_matrix_3x3::*; -pub use crate::as_matrix_9x9::*; -pub use crate::constants::*; -pub use crate::derivatives_t2::*; -pub use crate::derivatives_t4::*; -pub use crate::enums::*; -pub use crate::lin_elasticity::*; -pub use crate::operations_mix1::*; -pub use crate::operations_mix2::*; -pub use crate::operations_t2::*; -pub use crate::operations_t4::*; -pub use crate::samples_tensor2::*; -pub use crate::samples_tensor4::*; -pub use crate::spectral2::*; -pub use crate::tensor2::*; -pub use crate::tensor4::*; + +pub use as_matrix_3x3::*; +pub use as_matrix_9x9::*; +pub use constants::*; +pub use derivatives_t2::*; +pub use derivatives_t4::*; +pub use enums::*; +pub use lin_elasticity::*; +pub use operations_mix1::*; +pub use operations_mix2::*; +pub use operations_t2::*; +pub use operations_t4::*; +pub use samples_tensor2::*; +pub use samples_tensor4::*; +pub use spectral2::*; +pub use tensor2::*; +pub use tensor4::*; // run code from README file #[doc = include_str!("../README.md")] From 6e6a0b46e7b5848c1e7ec643b4eee2b8d2817149 Mon Sep 17 00:00:00 2001 From: Dorival Pedroso Date: Tue, 24 Sep 2024 12:36:06 +1000 Subject: [PATCH 2/3] Update MUMPS version because 5.7.1 is no longer available in Debian! --- zscripts/compile-and-install-mumps.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zscripts/compile-and-install-mumps.bash b/zscripts/compile-and-install-mumps.bash index f036d388..0bc8e417 100755 --- a/zscripts/compile-and-install-mumps.bash +++ b/zscripts/compile-and-install-mumps.bash @@ -12,7 +12,7 @@ sudo () { BLAS_LIB=${1:-""} # options -VERSION="5.7.1" +VERSION="5.7.3" PREFIX="/usr/local" INCDIR=$PREFIX/include/mumps LIBDIR=$PREFIX/lib/mumps From 555ccf569bf6faa02149b1f03a75126037175e88 Mon Sep 17 00:00:00 2001 From: Dorival Pedroso Date: Tue, 24 Sep 2024 12:43:10 +1000 Subject: [PATCH 3/3] Update plotpy version because of breaking changes --- russell_lab/Cargo.toml | 2 +- russell_ode/Cargo.toml | 2 +- russell_stat/Cargo.toml | 2 +- russell_stat/examples/plot_distribution_functions.rs | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/russell_lab/Cargo.toml b/russell_lab/Cargo.toml index ae512a25..3570d751 100644 --- a/russell_lab/Cargo.toml +++ b/russell_lab/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } [dev-dependencies] criterion = "0.5" -plotpy = "1.1" +plotpy = "1.9" serde_json = "1.0" serial_test = "3.0" diff --git a/russell_ode/Cargo.toml b/russell_ode/Cargo.toml index 67308588..e1fbb5d2 100644 --- a/russell_ode/Cargo.toml +++ b/russell_ode/Cargo.toml @@ -24,6 +24,6 @@ serde_json = "1.0" structopt = "0.3" [dev-dependencies] -plotpy = "1.1" +plotpy = "1.9" rayon = "1.10" serial_test = "3.0" diff --git a/russell_stat/Cargo.toml b/russell_stat/Cargo.toml index e1486bbd..0d40e8fd 100644 --- a/russell_stat/Cargo.toml +++ b/russell_stat/Cargo.toml @@ -21,4 +21,4 @@ rand = "0.8.5" rand_distr = "0.4.3" [dev-dependencies] -plotpy = "1.1" +plotpy = "1.9" diff --git a/russell_stat/examples/plot_distribution_functions.rs b/russell_stat/examples/plot_distribution_functions.rs index 98105c75..fdf6098b 100644 --- a/russell_stat/examples/plot_distribution_functions.rs +++ b/russell_stat/examples/plot_distribution_functions.rs @@ -34,7 +34,7 @@ fn main() -> Result<(), StrError> { .set_subplot(2, 1, 2) .add(&curve_cdf) .grid_and_labels("$x$", "$CDF(x)$") - .set_super_title(&title, Some(params)) + .set_super_title(&title, Some(¶ms)) .set_figure_size_points(350.0, 500.0) .save(&path)?; @@ -61,7 +61,7 @@ fn main() -> Result<(), StrError> { .set_subplot(2, 1, 2) .add(&curve_cdf) .grid_and_labels("$x$", "$CDF(x)$") - .set_super_title(&title, Some(params)) + .set_super_title(&title, Some(¶ms)) .set_figure_size_points(350.0, 500.0) .save(&path)?; @@ -88,7 +88,7 @@ fn main() -> Result<(), StrError> { .set_subplot(2, 1, 2) .add(&curve_cdf) .grid_and_labels("$x$", "$CDF(x)$") - .set_super_title(&title, Some(params)) + .set_super_title(&title, Some(¶ms)) .set_figure_size_points(350.0, 500.0) .save(&path)?; @@ -115,7 +115,7 @@ fn main() -> Result<(), StrError> { .set_subplot(2, 1, 2) .add(&curve_cdf) .grid_and_labels("$x$", "$CDF(x)$") - .set_super_title(&title, Some(params)) + .set_super_title(&title, Some(¶ms)) .set_figure_size_points(350.0, 500.0) .save(&path)?; @@ -142,7 +142,7 @@ fn main() -> Result<(), StrError> { .set_subplot(2, 1, 2) .add(&curve_cdf) .grid_and_labels("$x$", "$CDF(x)$") - .set_super_title(&title, Some(params)) + .set_super_title(&title, Some(¶ms)) .set_figure_size_points(350.0, 500.0) .save(&path)?;