Skip to content

Commit

Permalink
Bump up crates
Browse files Browse the repository at this point in the history
  • Loading branch information
@lan496
lan496 committed Feb 12, 2025
1 parent 1aa5299 commit 1864dc7
Show file tree
Hide file tree
Showing 11 changed files with 218 additions and 212 deletions.
285 changes: 143 additions & 142 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ test:
doc:
cargo doc --open

[group('rust')]
upgrade:
cargo upgrade -i

[group('rust')]
[working-directory: 'moyo']
profile:
Expand Down
14 changes: 7 additions & 7 deletions moyo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ serde.workspace = true
serde_json.workspace = true
approx.workspace = true
log.workspace = true
itertools = "0.13"
thiserror = "1.0"
itertools = "0.14"
thiserror = "2.0"
union-find = "0.4"
strum = "0.25"
strum_macros = "0.25"
strum = "0.27"
strum_macros = "0.27"
kiddo = "5.0.3"
once_cell = "1.20.2"
once_cell = "1.20.3"

[dev-dependencies]
rand = "0.8"
rstest = "0.18"
rand = "0.9"
rstest = "0.24"
criterion = { version = "0.5", features = ["html_reports"] }
env_logger = "0.11"
test-log = "0.2"
Expand Down
36 changes: 18 additions & 18 deletions moyo/src/math/delaunay.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ mod tests {

for _ in 0..256 {
let basis = Matrix3::<f64>::new(
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
);
let (reduced_basis, trans_mat) = delaunay_reduce(&basis);
assert_relative_eq!(
Expand All @@ -146,15 +146,15 @@ mod tests {

for _ in 0..256 {
let basis = Matrix3::<f64>::new(
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
);
let (reduced_basis, trans_mat) = delaunay_reduce(&basis);
assert_relative_eq!(
Expand Down
6 changes: 3 additions & 3 deletions moyo/src/math/hnf.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ mod tests {
let mut rng: StdRng = SeedableRng::from_seed([0; 32]);

for _ in 0..256 {
let m = SMatrix::<i32, 3, 3>::from_fn(|_, _| rng.gen_range(-4..4));
let m = SMatrix::<i32, 3, 3>::from_fn(|_, _| rng.random_range(-4..4));
let _ = HNF::new(&m);

let m = SMatrix::<i32, 5, 7>::from_fn(|_, _| rng.gen_range(-4..4));
let m = SMatrix::<i32, 5, 7>::from_fn(|_, _| rng.random_range(-4..4));
let _ = HNF::new(&m);

let m = SMatrix::<i32, 7, 5>::from_fn(|_, _| rng.gen_range(-4..4));
let m = SMatrix::<i32, 7, 5>::from_fn(|_, _| rng.random_range(-4..4));
let _ = HNF::new(&m);
}
}
Expand Down
36 changes: 18 additions & 18 deletions moyo/src/math/minkowski.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,15 @@ mod tests {

for _ in 0..256 {
let basis = Matrix3::<f64>::new(
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
);
let (reduced_basis, trans_mat) = minkowski_reduce(&basis);
assert!(is_minkowski_reduced(&reduced_basis));
Expand All @@ -230,15 +230,15 @@ mod tests {

for _ in 0..256 {
let basis = Matrix3::<f64>::new(
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
);
let (reduced_basis, trans_mat) = minkowski_reduce(&basis);
assert!(is_minkowski_reduced(&reduced_basis));
Expand Down
36 changes: 18 additions & 18 deletions moyo/src/math/niggli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,15 +471,15 @@ mod tests {

for _ in 0..256 {
let basis = Matrix3::<f64>::new(
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.gen::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
rng.random::<i8>() as f64,
);
let (reduced_basis, trans_mat) = niggli_reduce(&basis);

Expand All @@ -489,15 +489,15 @@ mod tests {

for _ in 0..256 {
let basis = Matrix3::<f64>::new(
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.gen(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
rng.random(),
);
let (reduced_basis, trans_mat) = niggli_reduce(&basis);
assert!(is_niggli_reduced(&reduced_basis));
Expand Down
6 changes: 3 additions & 3 deletions moyo/src/math/snf.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ mod tests {
let mut rng: StdRng = SeedableRng::from_seed([0; 32]);

for _ in 0..256 {
let m = SMatrix::<i32, 3, 3>::from_fn(|_, _| rng.gen_range(-4..4));
let m = SMatrix::<i32, 3, 3>::from_fn(|_, _| rng.random_range(-4..4));
let _ = SNF::new(&m);

let m = SMatrix::<i32, 5, 7>::from_fn(|_, _| rng.gen_range(-4..4));
let m = SMatrix::<i32, 5, 7>::from_fn(|_, _| rng.random_range(-4..4));
let _ = SNF::new(&m);

let m = SMatrix::<i32, 7, 5>::from_fn(|_, _| rng.gen_range(-4..4));
let m = SMatrix::<i32, 7, 5>::from_fn(|_, _| rng.random_range(-4..4));
let _ = SNF::new(&m);
}
}
Expand Down
4 changes: 2 additions & 2 deletions moyopy/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ serde.workspace = true
serde_json.workspace = true
approx.workspace = true
log.workspace = true
pyo3-log = "0.10"
pyo3-log = "0.12"

[dependencies.pyo3]
version = "0.21"
version = "0.23"
features = ["abi3-py39"]
2 changes: 1 addition & 1 deletion moyopy/python/moyopy/_data.pyi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ class MagneticSpaceGroupType:
def construct_type(self) -> int:
"""Construct type of magnetic space group from 1 to 4."""

def operations_from_number(number: int, setting: Setting) -> Operations: ...
def operations_from_number(number: int, *, setting: Setting | None = None) -> Operations: ...
1 change: 1 addition & 0 deletions moyopy/src/data.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use moyo::base::{MoyoError, Operation};
use moyo::data::{hall_symbol_entry, HallSymbol, Setting};

#[pyfunction]
#[pyo3(signature = (number, *, setting=None))]
pub fn operations_from_number(
number: i32,
setting: Option<PySetting>,
Expand Down

0 comments on commit 1864dc7

Please sign in to comment.