Skip to content

Commit b2e1cea

Browse files
AxectAxect
committed
FIX: Apply cargo fmt
1 parent da242b1 commit b2e1cea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1854
-930
lines changed

‎examples/b_spline_test.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ fn main() -> Result<(), Box<dyn Error>> {
1212
vec![1f64, 2f64],
1313
];
1414

15-
1615
let spline = BSpline::clamped(degree, knots, control_points.clone())?;
1716
let t = linspace(0f64, 3f64, 200);
1817
let (x, y): (Vec<f64>, Vec<f64>) = spline.eval_vec(&t).into_iter().unzip();
@@ -23,8 +22,7 @@ fn main() -> Result<(), Box<dyn Error>> {
2322
let control_y = control_points.iter().map(|v| v[1]).collect::<Vec<f64>>();
2423

2524
let mut plt = Plot2D::new();
26-
plt
27-
.insert_pair((x.clone(), y.clone()))
25+
plt.insert_pair((x.clone(), y.clone()))
2826
.insert_pair((control_x.clone(), control_y.clone()))
2927
.set_plot_type(vec![(1, PlotType::Scatter)])
3028
.set_color(vec![(0, "darkblue"), (1, "red")])

‎examples/broyden_test.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
use peroxide::fuga::*;
2-
use peroxide::numerical::root::{Pt, Intv};
2+
use peroxide::numerical::root::{Intv, Pt};
33

44
fn main() -> Result<(), Box<dyn std::error::Error>> {
55
let problem = Quadratic;
6-
let broyden = BroydenMethod { max_iter: 100, tol: 1e-6, rtol: 1e-6 };
6+
let broyden = BroydenMethod {
7+
max_iter: 100,
8+
tol: 1e-6,
9+
rtol: 1e-6,
10+
};
711
let root = broyden.find(&problem)?;
812
let result = problem.function(root)?;
913

@@ -17,10 +21,7 @@ struct Quadratic;
1721

1822
impl RootFindingProblem<2, 2, Intv<2>> for Quadratic {
1923
fn function(&self, x: Pt<2>) -> anyhow::Result<Pt<2>> {
20-
Ok([
21-
x[0] * x[0] + x[1] * x[1] - 1.0,
22-
x[0] + x[1] - 2f64.sqrt()
23-
])
24+
Ok([x[0] * x[0] + x[1] * x[1] - 1.0, x[0] + x[1] - 2f64.sqrt()])
2425
}
2526

2627
fn initial_guess(&self) -> Intv<2> {

‎examples/chebyshev.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use peroxide::fuga::*;
44
fn main() {
55
let mut c = chebyshev_polynomial(0, SpecialKind::First);
66
c.print();
7-
for i in 1 .. 11 {
7+
for i in 1..11 {
88
c = chebyshev_polynomial(i, SpecialKind::First);
99
c.print();
1010
}

‎examples/dataframe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate peroxide;
33
use peroxide::fuga::*;
44

55
fn main() {
6-
let x = c!(1,2,3,4);
6+
let x = c!(1, 2, 3, 4);
77
let a = Series::new(x);
88
a.print();
99
println!("");
@@ -19,7 +19,7 @@ fn main() {
1919
df.print();
2020
println!("");
2121

22-
df["1"] = Series::new(c!(5,6,7,8));
22+
df["1"] = Series::new(c!(5, 6, 7, 8));
2323

2424
df.print();
2525
println!("");

‎examples/df_csv.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate peroxide;
33
use peroxide::fuga::*;
44

55
fn main() -> Result<(), Box<dyn Error>> {
6-
let a = Series::new(vec![1,2,3,4]);
6+
let a = Series::new(vec![1, 2, 3, 4]);
77
let b = Series::new(c!(0.1, 0.2, 0.3, 0.4));
88
let c = Series::new(vec![true, false, true, false]);
99
let d = Series::new(vec!['a', 'b', 'c', 'd']);
@@ -13,7 +13,7 @@ fn main() -> Result<(), Box<dyn Error>> {
1313

1414
df.print();
1515

16-
#[cfg(feature="csv")]
16+
#[cfg(feature = "csv")]
1717
{
1818
df.write_csv("example_data/df_csv.csv")?;
1919

‎examples/df_nc.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ extern crate peroxide;
22
use peroxide::fuga::*;
33

44
fn main() -> Result<(), Box<dyn Error>> {
5-
#[cfg(feature = "nc")] {
5+
#[cfg(feature = "nc")]
6+
{
67
let a = Series::new(vec![1, 2, 3, 4]);
78
let b = Series::new(vec![0.1, 0.2, 0.3, 0.4]);
89
let c = Series::new(vec![true, false, false, true]);
9-
let d = Series::new(vec!["a", "b", "c", "d"].into_iter().map(|x| x.to_string()).collect());
10+
let d = Series::new(
11+
vec!["a", "b", "c", "d"]
12+
.into_iter()
13+
.map(|x| x.to_string())
14+
.collect(),
15+
);
1016

11-
let mut df = DataFrame::new(vec![a,b,c,d]);
17+
let mut df = DataFrame::new(vec![a, b, c, d]);
1218
df.set_header(vec!["a", "b", "c", "d"]);
1319
println!("Write:");
1420
df.print();

‎examples/gradient.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use peroxide::fuga::*;
22

33
fn main() {
4-
f(2f64).print(); // x^3 = 8
5-
f_grad(2f64).print(); // 3 * x^2 = 12
6-
f_hess(2f64).print(); // 6 * x = 12
4+
f(2f64).print(); // x^3 = 8
5+
f_grad(2f64).print(); // 3 * x^2 = 12
6+
f_hess(2f64).print(); // 6 * x = 12
77
}
88

9-
#[ad_function] // generates f_grad, f_hess
9+
#[ad_function] // generates f_grad, f_hess
1010
fn f(x: f64) -> f64 {
11-
x.powi(3) // x^3
11+
x.powi(3) // x^3
1212
}

‎examples/lorenz_dp45.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ use peroxide::fuga::*;
44
fn main() -> Result<(), Box<dyn Error>> {
55
let dp45 = DP45::new(1e-4, 0.9, 1e-6, 1e-1, 100);
66
let basic_ode_solver = BasicODESolver::new(dp45);
7-
let (_, y_vec) = basic_ode_solver.solve(
8-
&Lorenz,
9-
(0f64, 100f64),
10-
1e-2,
11-
)?;
7+
let (_, y_vec) = basic_ode_solver.solve(&Lorenz, (0f64, 100f64), 1e-2)?;
128
let y_mat = py_matrix(y_vec);
139
let y0 = y_mat.col(0);
1410
let y2 = y_mat.col(2);
1511

1612
#[cfg(feature = "plot")]
1713
{
1814
let mut plt = Plot2D::new();
19-
plt
20-
.set_domain(y0)
15+
plt.set_domain(y0)
2116
.insert_image(y2)
2217
.set_xlabel(r"$y_0$")
2318
.set_ylabel(r"$y_2$")

‎examples/lorenz_gl4.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ use peroxide::fuga::*;
44
fn main() -> Result<(), Box<dyn Error>> {
55
let gl4 = GL4::new(ImplicitSolver::FixedPoint, 1e-6, 100);
66
let basic_ode_solver = BasicODESolver::new(gl4);
7-
let (_, y_vec) = basic_ode_solver.solve(
8-
&Lorenz,
9-
(0f64, 100f64),
10-
1e-2,
11-
)?;
7+
let (_, y_vec) = basic_ode_solver.solve(&Lorenz, (0f64, 100f64), 1e-2)?;
128
let y_mat = py_matrix(y_vec);
139
let y0 = y_mat.col(0);
1410
let y2 = y_mat.col(2);
1511

1612
#[cfg(feature = "plot")]
1713
{
1814
let mut plt = Plot2D::new();
19-
plt
20-
.set_domain(y0)
15+
plt.set_domain(y0)
2116
.insert_image(y2)
2217
.set_xlabel(r"$y_0$")
2318
.set_ylabel(r"$y_2$")

‎examples/lorenz_rk4.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,15 @@ use peroxide::fuga::*;
33
#[allow(unused_variables)]
44
fn main() -> Result<(), Box<dyn Error>> {
55
let basic_ode_solver = BasicODESolver::new(RK4);
6-
let (_, y_vec) = basic_ode_solver.solve(
7-
&Lorenz,
8-
(0f64, 100f64),
9-
1e-2,
10-
)?;
6+
let (_, y_vec) = basic_ode_solver.solve(&Lorenz, (0f64, 100f64), 1e-2)?;
117
let y_mat = py_matrix(y_vec);
128
let y0 = y_mat.col(0);
139
let y2 = y_mat.col(2);
1410

1511
#[cfg(feature = "plot")]
1612
{
1713
let mut plt = Plot2D::new();
18-
plt
19-
.set_domain(y0)
14+
plt.set_domain(y0)
2015
.insert_image(y2)
2116
.set_xlabel(r"$y_0$")
2217
.set_ylabel(r"$y_2$")

‎examples/lorenz_rkf45.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ use peroxide::fuga::*;
44
fn main() -> Result<(), Box<dyn Error>> {
55
let rkf45 = RKF45::new(1e-4, 0.9, 1e-6, 1e-2, 100);
66
let basic_ode_solver = BasicODESolver::new(rkf45);
7-
let (_, y_vec) = basic_ode_solver.solve(
8-
&Lorenz,
9-
(0f64, 100f64),
10-
1e-2,
11-
)?;
7+
let (_, y_vec) = basic_ode_solver.solve(&Lorenz, (0f64, 100f64), 1e-2)?;
128
let y_mat = py_matrix(y_vec);
139
let y0 = y_mat.col(0);
1410
let y2 = y_mat.col(2);
1511

1612
#[cfg(feature = "plot")]
1713
{
1814
let mut plt = Plot2D::new();
19-
plt
20-
.set_domain(y0)
15+
plt.set_domain(y0)
2116
.insert_image(y2)
2217
.set_xlabel(r"$y_0$")
2318
.set_ylabel(r"$y_2$")

‎examples/lorenz_tsit45.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ use peroxide::fuga::*;
44
fn main() -> Result<(), Box<dyn Error>> {
55
let tsit45 = TSIT45::new(1e-2, 0.9, 1e-6, 1e-1, 100);
66
let basic_ode_solver = BasicODESolver::new(tsit45);
7-
let (_, y_vec) = basic_ode_solver.solve(
8-
&Lorenz,
9-
(0f64, 100f64),
10-
1e-2,
11-
)?;
7+
let (_, y_vec) = basic_ode_solver.solve(&Lorenz, (0f64, 100f64), 1e-2)?;
128
let y_mat = py_matrix(y_vec);
139
let y0 = y_mat.col(0);
1410
let y2 = y_mat.col(2);
1511

1612
#[cfg(feature = "plot")]
1713
{
1814
let mut plt = Plot2D::new();
19-
plt
20-
.set_domain(y0)
15+
plt.set_domain(y0)
2116
.insert_image(y2)
2217
.set_xlabel(r"$y_0$")
2318
.set_ylabel(r"$y_2$")

‎examples/matmul.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ fn main() {
77

88
// Create Matrix
99
let m = rand(row, col);
10-
10+
1111
// Create another Matrix
1212
let n = rand(row, col);
13-
13+
1414
// Matmul
1515
let result = m * n;
1616

17-
result[(row/2, col/2)].print();
17+
result[(row / 2, col / 2)].print();
1818
}

‎examples/ode_env.rs

+3-10
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,15 @@ fn main() -> Result<(), Box<dyn Error>> {
1111

1212
let c = cubic_hermite_spline(&t, &y, Quadratic)?;
1313

14-
let test_problem = Test {
15-
cs: c,
16-
};
14+
let test_problem = Test { cs: c };
1715
let basic_ode_solver = BasicODESolver::new(RK4);
18-
let (t_vec, y_vec) = basic_ode_solver.solve(
19-
&test_problem,
20-
(0f64, 10f64),
21-
0.01,
22-
)?;
16+
let (t_vec, y_vec) = basic_ode_solver.solve(&test_problem, (0f64, 10f64), 0.01)?;
2317
let y_vec: Vec<f64> = y_vec.into_iter().flatten().collect();
2418

2519
#[cfg(feature = "plot")]
2620
{
2721
let mut plt = Plot2D::new();
28-
plt
29-
.set_domain(t_vec)
22+
plt.set_domain(t_vec)
3023
.insert_image(y_vec)
3124
.set_xlabel(r"$t$")
3225
.set_ylabel(r"$y$")

‎examples/ode_test_gl4.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@ use peroxide::fuga::*;
44
fn main() -> Result<(), Box<dyn Error>> {
55
let gl4 = GL4::new(ImplicitSolver::FixedPoint, 1e-6, 100);
66
let basic_ode_solver = BasicODESolver::new(gl4);
7-
let (t_vec, y_vec) = basic_ode_solver.solve(
8-
&Test,
9-
(0f64, 10f64),
10-
0.01,
11-
)?;
7+
let (t_vec, y_vec) = basic_ode_solver.solve(&Test, (0f64, 10f64), 0.01)?;
128
let y_vec: Vec<f64> = y_vec.into_iter().flatten().collect();
139

1410
#[cfg(feature = "plot")]
1511
{
1612
let mut plt = Plot2D::new();
17-
plt
18-
.set_domain(t_vec)
13+
plt.set_domain(t_vec)
1914
.insert_image(y_vec)
2015
.set_xlabel(r"$t$")
2116
.set_ylabel(r"$y$")

‎examples/ode_test_rk4.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ use peroxide::fuga::*;
33
#[allow(unused_variables)]
44
fn main() -> Result<(), Box<dyn Error>> {
55
let basic_ode_solver = BasicODESolver::new(RK4);
6-
let (t_vec, y_vec) = basic_ode_solver.solve(
7-
&Test,
8-
(0f64, 10f64),
9-
1e-3,
10-
)?;
6+
let (t_vec, y_vec) = basic_ode_solver.solve(&Test, (0f64, 10f64), 1e-3)?;
117
let y_vec: Vec<f64> = y_vec.into_iter().flatten().collect();
128

139
#[cfg(feature = "plot")]
1410
{
1511
let mut plt = Plot2D::new();
16-
plt
17-
.set_domain(t_vec)
12+
plt.set_domain(t_vec)
1813
.insert_image(y_vec)
1914
.set_xlabel(r"$t$")
2015
.set_ylabel(r"$y$")

‎examples/ode_test_rkf45.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@ use peroxide::fuga::*;
44
fn main() -> Result<(), Box<dyn Error>> {
55
let rkf = RKF45::new(1e-4, 0.9, 1e-6, 1e-1, 100);
66
let basic_ode_solver = BasicODESolver::new(rkf);
7-
let (t_vec, y_vec) = basic_ode_solver.solve(
8-
&Test,
9-
(0f64, 10f64),
10-
0.01,
11-
)?;
7+
let (t_vec, y_vec) = basic_ode_solver.solve(&Test, (0f64, 10f64), 0.01)?;
128
let y_vec: Vec<f64> = y_vec.into_iter().flatten().collect();
139

1410
#[cfg(feature = "plot")]
1511
{
1612
let mut plt = Plot2D::new();
17-
plt
18-
.set_domain(t_vec)
13+
plt.set_domain(t_vec)
1914
.insert_image(y_vec)
2015
.set_xlabel(r"$t$")
2116
.set_ylabel(r"$y$")

‎examples/optim.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,17 @@ fn main() {
2121

2222
// Optimizer setting
2323
let mut opt = Optimizer::new(data, quad);
24-
let p = opt.set_init_param(n_init)
24+
let p = opt
25+
.set_init_param(n_init)
2526
.set_max_iter(50)
2627
.set_method(LevenbergMarquardt)
2728
.optimize();
28-
p.print(); // Optimized parameter
29-
opt.get_error().print(); // Optimized RMSE
29+
p.print(); // Optimized parameter
30+
opt.get_error().print(); // Optimized RMSE
3031
}
3132

3233
fn quad(x: &Vec<f64>, n: Vec<AD>) -> Option<Vec<AD>> {
33-
Some(
34-
x.clone().into_iter()
35-
.map(|t| pow_temp(t, n[0]))
36-
.collect()
37-
)
34+
Some(x.clone().into_iter().map(|t| pow_temp(t, n[0])).collect())
3835
}
3936

4037
#[inline]

‎examples/pseudo_inv.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use peroxide::fuga::*;
33

44
fn main() {
55
let a = ml_matrix("2 -1 0;4 3 -2");
6-
#[cfg(feature="O3")]
6+
#[cfg(feature = "O3")]
77
{
88
let b = a.pseudo_inv();
99
assert_eq!(&a * &b, eye(2));

‎examples/root_macro_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[macro_use]
22
extern crate peroxide;
3-
use peroxide::fuga::*;
43
use anyhow::Result;
4+
use peroxide::fuga::*;
55

66
fn main() -> Result<()> {
77
let root_bisect = bisection!(f, (0.0, 2.0), 100, 1e-6)?;

0 commit comments

Comments
 (0)