From acb52018e740d985cb7a8a1045ad13b38e044583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Michaud?= Date: Mon, 18 Nov 2024 23:13:14 +0100 Subject: [PATCH 1/5] bump ahash crate to fix build currently, cargo build generates the following error due to the removal of stdsim: https://github.com/rust-lang/rust/pull/117372 --- Cargo.lock | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f5c76d..db8c31d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,14 +4,15 @@ version = 3 [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -392,9 +393,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -563,9 +564,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -589,7 +590,7 @@ checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -797,3 +798,23 @@ name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] From e0fc9fe2604a6ffd301ee62037bada7956209eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Michaud?= Date: Mon, 18 Nov 2024 23:13:47 +0100 Subject: [PATCH 2/5] fix clippy errors --- src/core/errors.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/errors.rs b/src/core/errors.rs index d379d13..12d8e12 100644 --- a/src/core/errors.rs +++ b/src/core/errors.rs @@ -9,7 +9,7 @@ where V: Copy + Eq, HE: Copy + Eq, { - /// Error when a HyperedgeIndex was not found. + /// Error when a `HyperedgeIndex` was not found. #[error("HyperedgeIndex {0} was not found")] HyperedgeIndexNotFound(HyperedgeIndex), @@ -66,7 +66,7 @@ where #[error("At least two hyperedges must be provided to be joined")] HyperedgesInvalidJoin, - /// Error when a VertexIndex was not found. + /// Error when a `VertexIndex` was not found. #[error("VertexIndex {0} was not found")] VertexIndexNotFound(VertexIndex), From 4d54d5187d29d6b0ee6e0fb3ab412b8936dd56f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Michaud?= Date: Mon, 18 Nov 2024 23:13:47 +0100 Subject: [PATCH 3/5] attempt to fix formatting --- benches/performance.rs | 2 +- src/core/hyperedges/add_hyperedge.rs | 4 ++-- src/core/hyperedges/clear_hyperedges.rs | 2 +- .../hyperedges/contract_hyperedge_vertices.rs | 4 ++-- src/core/hyperedges/get_hyperedge.rs | 2 +- src/core/hyperedges/get_hyperedge_vertices.rs | 4 ++-- src/core/hyperedges/get_hyperedge_weight.rs | 2 +- src/core/hyperedges/get_hyperedges.rs | 2 +- .../hyperedges/get_hyperedges_connecting.rs | 4 ++-- .../get_hyperedges_intersections.rs | 4 ++-- src/core/hyperedges/get_internal_hyperedge.rs | 2 +- .../hyperedges/get_internal_hyperedges.rs | 2 +- src/core/hyperedges/join_hyperedges.rs | 2 +- src/core/hyperedges/remove_hyperedge.rs | 2 +- src/core/hyperedges/reverse_hyperedge.rs | 2 +- .../hyperedges/update_hyperedge_vertices.rs | 4 ++-- .../hyperedges/update_hyperedge_weight.rs | 2 +- src/core/iterator.rs | 2 +- src/core/shared.rs | 2 +- src/core/vertices/add_vertex.rs | 2 +- .../vertices/get_adjacent_vertices_from.rs | 4 ++-- src/core/vertices/get_adjacent_vertices_to.rs | 4 ++-- src/core/vertices/get_dijkstra_connections.rs | 2 +- .../get_full_adjacent_vertices_from.rs | 6 +++--- .../vertices/get_full_adjacent_vertices_to.rs | 6 +++--- .../vertices/get_full_vertex_hyperedges.rs | 2 +- src/core/vertices/get_internal_vertex.rs | 2 +- src/core/vertices/get_internal_vertices.rs | 2 +- src/core/vertices/get_vertex.rs | 2 +- src/core/vertices/get_vertex_degree_in.rs | 4 ++-- src/core/vertices/get_vertex_degree_out.rs | 4 ++-- src/core/vertices/get_vertex_hyperedges.rs | 2 +- src/core/vertices/get_vertex_weight.rs | 2 +- src/core/vertices/get_vertices.rs | 2 +- src/core/vertices/remove_vertex.rs | 2 +- src/core/vertices/update_vertex_weight.rs | 2 +- tests/integration_contraction.rs | 2 +- tests/integration_iterator.rs | 19 +++++++++++-------- tests/integration_join.rs | 2 +- tests/integration_main.rs | 2 +- 40 files changed, 64 insertions(+), 61 deletions(-) diff --git a/benches/performance.rs b/benches/performance.rs index fd58821..fa6c3a1 100644 --- a/benches/performance.rs +++ b/benches/performance.rs @@ -2,7 +2,7 @@ use std::fmt::{Display, Formatter, Result}; -use criterion::{criterion_group, criterion_main, Criterion}; +use criterion::{Criterion, criterion_group, criterion_main}; use hypergraph::{HyperedgeIndex, Hypergraph, VertexIndex}; use itertools::Itertools; diff --git a/src/core/hyperedges/add_hyperedge.rs b/src/core/hyperedges/add_hyperedge.rs index ebf3f9c..6125eb7 100644 --- a/src/core/hyperedges/add_hyperedge.rs +++ b/src/core/hyperedges/add_hyperedge.rs @@ -1,6 +1,6 @@ use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/clear_hyperedges.rs b/src/core/hyperedges/clear_hyperedges.rs index 5d61c92..12c29d5 100644 --- a/src/core/hyperedges/clear_hyperedges.rs +++ b/src/core/hyperedges/clear_hyperedges.rs @@ -1,7 +1,7 @@ use rayon::prelude::*; use crate::{ - bi_hash_map::BiHashMap, errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexTrait, + HyperedgeTrait, Hypergraph, VertexTrait, bi_hash_map::BiHashMap, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/contract_hyperedge_vertices.rs b/src/core/hyperedges/contract_hyperedge_vertices.rs index c0b128b..1098fae 100644 --- a/src/core/hyperedges/contract_hyperedge_vertices.rs +++ b/src/core/hyperedges/contract_hyperedge_vertices.rs @@ -2,8 +2,8 @@ use itertools::Itertools; use rayon::prelude::*; use crate::{ - core::utils::are_slices_equal, errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, - Hypergraph, VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + core::utils::are_slices_equal, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/get_hyperedge.rs b/src/core/hyperedges/get_hyperedge.rs index 07e05ad..f08c84f 100644 --- a/src/core/hyperedges/get_hyperedge.rs +++ b/src/core/hyperedges/get_hyperedge.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/hyperedges/get_hyperedge_vertices.rs b/src/core/hyperedges/get_hyperedge_vertices.rs index 4e4364f..7de8f64 100644 --- a/src/core/hyperedges/get_hyperedge_vertices.rs +++ b/src/core/hyperedges/get_hyperedge_vertices.rs @@ -1,6 +1,6 @@ use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/get_hyperedge_weight.rs b/src/core/hyperedges/get_hyperedge_weight.rs index 1c2f01c..297a98d 100644 --- a/src/core/hyperedges/get_hyperedge_weight.rs +++ b/src/core/hyperedges/get_hyperedge_weight.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/hyperedges/get_hyperedges.rs b/src/core/hyperedges/get_hyperedges.rs index 1048d69..4b7ddd5 100644 --- a/src/core/hyperedges/get_hyperedges.rs +++ b/src/core/hyperedges/get_hyperedges.rs @@ -1,6 +1,6 @@ use rayon::prelude::*; -use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/hyperedges/get_hyperedges_connecting.rs b/src/core/hyperedges/get_hyperedges_connecting.rs index 387eb08..159b958 100644 --- a/src/core/hyperedges/get_hyperedges_connecting.rs +++ b/src/core/hyperedges/get_hyperedges_connecting.rs @@ -1,8 +1,8 @@ use rayon::prelude::*; use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, - VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/get_hyperedges_intersections.rs b/src/core/hyperedges/get_hyperedges_intersections.rs index 5bbb1e9..9bababb 100644 --- a/src/core/hyperedges/get_hyperedges_intersections.rs +++ b/src/core/hyperedges/get_hyperedges_intersections.rs @@ -2,8 +2,8 @@ use itertools::Itertools; use rayon::prelude::*; use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/get_internal_hyperedge.rs b/src/core/hyperedges/get_internal_hyperedge.rs index 36d8822..4681397 100644 --- a/src/core/hyperedges/get_internal_hyperedge.rs +++ b/src/core/hyperedges/get_internal_hyperedge.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/hyperedges/get_internal_hyperedges.rs b/src/core/hyperedges/get_internal_hyperedges.rs index 76ddf8c..b318368 100644 --- a/src/core/hyperedges/get_internal_hyperedges.rs +++ b/src/core/hyperedges/get_internal_hyperedges.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/hyperedges/join_hyperedges.rs b/src/core/hyperedges/join_hyperedges.rs index 3c16cb7..8a57c17 100644 --- a/src/core/hyperedges/join_hyperedges.rs +++ b/src/core/hyperedges/join_hyperedges.rs @@ -1,7 +1,7 @@ use rayon::prelude::*; use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/remove_hyperedge.rs b/src/core/hyperedges/remove_hyperedge.rs index ba96539..1f42bd6 100644 --- a/src/core/hyperedges/remove_hyperedge.rs +++ b/src/core/hyperedges/remove_hyperedge.rs @@ -1,5 +1,5 @@ use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait, + HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/reverse_hyperedge.rs b/src/core/hyperedges/reverse_hyperedge.rs index d44da9a..1c6a73c 100644 --- a/src/core/hyperedges/reverse_hyperedge.rs +++ b/src/core/hyperedges/reverse_hyperedge.rs @@ -1,6 +1,6 @@ use rayon::prelude::*; -use crate::{errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/hyperedges/update_hyperedge_vertices.rs b/src/core/hyperedges/update_hyperedge_vertices.rs index 59c433a..b9da3a5 100644 --- a/src/core/hyperedges/update_hyperedge_vertices.rs +++ b/src/core/hyperedges/update_hyperedge_vertices.rs @@ -1,8 +1,8 @@ use rayon::prelude::*; use crate::{ - core::utils::are_slices_equal, errors::HypergraphError, HyperedgeIndex, HyperedgeKey, - HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + core::utils::are_slices_equal, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/hyperedges/update_hyperedge_weight.rs b/src/core/hyperedges/update_hyperedge_weight.rs index 3ac9f31..b5497b6 100644 --- a/src/core/hyperedges/update_hyperedge_weight.rs +++ b/src/core/hyperedges/update_hyperedge_weight.rs @@ -1,5 +1,5 @@ use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait, + HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/iterator.rs b/src/core/iterator.rs index 9157d09..10cccef 100644 --- a/src/core/iterator.rs +++ b/src/core/iterator.rs @@ -1,6 +1,6 @@ use rayon::prelude::*; -use crate::{errors::HypergraphError, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait}; +use crate::{HyperedgeKey, HyperedgeTrait, Hypergraph, VertexTrait, errors::HypergraphError}; impl IntoIterator for Hypergraph where diff --git a/src/core/shared.rs b/src/core/shared.rs index b37f9e8..87b64d6 100644 --- a/src/core/shared.rs +++ b/src/core/shared.rs @@ -2,7 +2,7 @@ use itertools::Itertools; use rayon::prelude::*; use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError, }; /// Enumeration of the different types of connection. diff --git a/src/core/vertices/add_vertex.rs b/src/core/vertices/add_vertex.rs index 46a35ff..d466dc4 100644 --- a/src/core/vertices/add_vertex.rs +++ b/src/core/vertices/add_vertex.rs @@ -1,7 +1,7 @@ use crate::{ + HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::types::{AIndexSet, ARandomState}, errors::HypergraphError, - HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, }; impl Hypergraph diff --git a/src/core/vertices/get_adjacent_vertices_from.rs b/src/core/vertices/get_adjacent_vertices_from.rs index f2cc93f..2e4f095 100644 --- a/src/core/vertices/get_adjacent_vertices_from.rs +++ b/src/core/vertices/get_adjacent_vertices_from.rs @@ -1,8 +1,8 @@ use rayon::prelude::*; use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/vertices/get_adjacent_vertices_to.rs b/src/core/vertices/get_adjacent_vertices_to.rs index 9f69820..18a62eb 100644 --- a/src/core/vertices/get_adjacent_vertices_to.rs +++ b/src/core/vertices/get_adjacent_vertices_to.rs @@ -1,8 +1,8 @@ use rayon::prelude::*; use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/vertices/get_dijkstra_connections.rs b/src/core/vertices/get_dijkstra_connections.rs index 6aad381..d2a2294 100644 --- a/src/core/vertices/get_dijkstra_connections.rs +++ b/src/core/vertices/get_dijkstra_connections.rs @@ -7,7 +7,7 @@ use std::{ use rayon::prelude::*; use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError, }; #[derive(Clone, Copy, Debug, PartialEq, Eq)] diff --git a/src/core/vertices/get_full_adjacent_vertices_from.rs b/src/core/vertices/get_full_adjacent_vertices_from.rs index 9cc391c..ca02629 100644 --- a/src/core/vertices/get_full_adjacent_vertices_from.rs +++ b/src/core/vertices/get_full_adjacent_vertices_from.rs @@ -1,9 +1,9 @@ use indexmap::IndexMap; -use itertools::{fold, Itertools}; +use itertools::{Itertools, fold}; use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, - VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; #[allow(clippy::type_complexity)] diff --git a/src/core/vertices/get_full_adjacent_vertices_to.rs b/src/core/vertices/get_full_adjacent_vertices_to.rs index 7a5f93e..989a436 100644 --- a/src/core/vertices/get_full_adjacent_vertices_to.rs +++ b/src/core/vertices/get_full_adjacent_vertices_to.rs @@ -1,9 +1,9 @@ use indexmap::IndexMap; -use itertools::{fold, Itertools}; +use itertools::{Itertools, fold}; use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, - VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; #[allow(clippy::type_complexity)] diff --git a/src/core/vertices/get_full_vertex_hyperedges.rs b/src/core/vertices/get_full_vertex_hyperedges.rs index c746f30..1a82dfa 100644 --- a/src/core/vertices/get_full_vertex_hyperedges.rs +++ b/src/core/vertices/get_full_vertex_hyperedges.rs @@ -1,6 +1,6 @@ use rayon::prelude::*; -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/vertices/get_internal_vertex.rs b/src/core/vertices/get_internal_vertex.rs index e4182ce..b6f4211 100644 --- a/src/core/vertices/get_internal_vertex.rs +++ b/src/core/vertices/get_internal_vertex.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/vertices/get_internal_vertices.rs b/src/core/vertices/get_internal_vertices.rs index bf57b48..928bda8 100644 --- a/src/core/vertices/get_internal_vertices.rs +++ b/src/core/vertices/get_internal_vertices.rs @@ -1,6 +1,6 @@ use rayon::prelude::*; -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/vertices/get_vertex.rs b/src/core/vertices/get_vertex.rs index 62ae72b..ca4e439 100644 --- a/src/core/vertices/get_vertex.rs +++ b/src/core/vertices/get_vertex.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/vertices/get_vertex_degree_in.rs b/src/core/vertices/get_vertex_degree_in.rs index 23a9be1..9992ae3 100644 --- a/src/core/vertices/get_vertex_degree_in.rs +++ b/src/core/vertices/get_vertex_degree_in.rs @@ -1,6 +1,6 @@ use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/vertices/get_vertex_degree_out.rs b/src/core/vertices/get_vertex_degree_out.rs index 0309a15..5d75a40 100644 --- a/src/core/vertices/get_vertex_degree_out.rs +++ b/src/core/vertices/get_vertex_degree_out.rs @@ -1,6 +1,6 @@ use crate::{ - core::shared::Connection, errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, - VertexTrait, + HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, core::shared::Connection, + errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/vertices/get_vertex_hyperedges.rs b/src/core/vertices/get_vertex_hyperedges.rs index 39e8018..50a307a 100644 --- a/src/core/vertices/get_vertex_hyperedges.rs +++ b/src/core/vertices/get_vertex_hyperedges.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use crate::{ - errors::HypergraphError, HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + HyperedgeIndex, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/vertices/get_vertex_weight.rs b/src/core/vertices/get_vertex_weight.rs index 0b0e820..2784fef 100644 --- a/src/core/vertices/get_vertex_weight.rs +++ b/src/core/vertices/get_vertex_weight.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/vertices/get_vertices.rs b/src/core/vertices/get_vertices.rs index 813e2db..1884d70 100644 --- a/src/core/vertices/get_vertices.rs +++ b/src/core/vertices/get_vertices.rs @@ -1,6 +1,6 @@ use rayon::prelude::*; -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/src/core/vertices/remove_vertex.rs b/src/core/vertices/remove_vertex.rs index 8bbbe38..384f6ad 100644 --- a/src/core/vertices/remove_vertex.rs +++ b/src/core/vertices/remove_vertex.rs @@ -1,7 +1,7 @@ use rayon::prelude::*; use crate::{ - errors::HypergraphError, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, + HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError, }; impl Hypergraph diff --git a/src/core/vertices/update_vertex_weight.rs b/src/core/vertices/update_vertex_weight.rs index d2cf6f6..ca90a8c 100644 --- a/src/core/vertices/update_vertex_weight.rs +++ b/src/core/vertices/update_vertex_weight.rs @@ -1,4 +1,4 @@ -use crate::{errors::HypergraphError, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait}; +use crate::{HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait, errors::HypergraphError}; impl Hypergraph where diff --git a/tests/integration_contraction.rs b/tests/integration_contraction.rs index 1e8ebee..bc1a4fd 100644 --- a/tests/integration_contraction.rs +++ b/tests/integration_contraction.rs @@ -4,7 +4,7 @@ mod common; use common::{Hyperedge, Vertex}; -use hypergraph::{errors::HypergraphError, HyperedgeIndex, Hypergraph, VertexIndex}; +use hypergraph::{HyperedgeIndex, Hypergraph, VertexIndex, errors::HypergraphError}; #[test] fn integration_contration() { diff --git a/tests/integration_iterator.rs b/tests/integration_iterator.rs index a37e5d6..aaa0118 100644 --- a/tests/integration_iterator.rs +++ b/tests/integration_iterator.rs @@ -44,14 +44,17 @@ fn integration_iterator() { vec![ (hyperedge_one, vec![vertex_one, vertex_two, vertex_three]), (hyperedge_two, vec![vertex_four, vertex_five]), - ( - hyperedge_three, - vec![vertex_three, vertex_three, vertex_three] - ), - ( - hyperedge_four, - vec![vertex_five, vertex_four, vertex_three, vertex_one] - ) + (hyperedge_three, vec![ + vertex_three, + vertex_three, + vertex_three + ]), + (hyperedge_four, vec![ + vertex_five, + vertex_four, + vertex_three, + vertex_one + ]) ], "should provide `into_iter()` yelding a vector of tuples of the form (hyperedge, vector of vertices)" ); diff --git a/tests/integration_join.rs b/tests/integration_join.rs index da912f3..d1e41ef 100644 --- a/tests/integration_join.rs +++ b/tests/integration_join.rs @@ -4,7 +4,7 @@ mod common; use common::{Hyperedge, Vertex}; -use hypergraph::{errors::HypergraphError, Hypergraph}; +use hypergraph::{Hypergraph, errors::HypergraphError}; #[test] fn integration_contration() { diff --git a/tests/integration_main.rs b/tests/integration_main.rs index 97b6a93..949efbf 100644 --- a/tests/integration_main.rs +++ b/tests/integration_main.rs @@ -4,7 +4,7 @@ mod common; use common::{Hyperedge, Vertex}; -use hypergraph::{errors::HypergraphError, HyperedgeIndex, Hypergraph, VertexIndex}; +use hypergraph::{HyperedgeIndex, Hypergraph, VertexIndex, errors::HypergraphError}; #[test] fn integration_main() { From 7c55cbdfa46259ee56a47e138d92f267cf627a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Michaud?= Date: Mon, 18 Nov 2024 23:29:54 +0100 Subject: [PATCH 4/5] attempt to not parallelize he intersection --- src/core/hyperedges/get_hyperedges_intersections.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hyperedges/get_hyperedges_intersections.rs b/src/core/hyperedges/get_hyperedges_intersections.rs index 9bababb..9e237c3 100644 --- a/src/core/hyperedges/get_hyperedges_intersections.rs +++ b/src/core/hyperedges/get_hyperedges_intersections.rs @@ -26,7 +26,7 @@ where // Get the internal vertices of the hyperedges and keep the eventual error. let vertices = hyperedges - .into_par_iter() + .into_iter() .map(|hyperedge_index| { self.get_internal_hyperedge(hyperedge_index) .and_then(|internal_index| { From e7ad51a9ee901bc2bcdf7357af58dcd18b8c2c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Michaud?= Date: Mon, 18 Nov 2024 23:33:46 +0100 Subject: [PATCH 5/5] remove rayon prelude --- src/core/hyperedges/get_hyperedges_intersections.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/hyperedges/get_hyperedges_intersections.rs b/src/core/hyperedges/get_hyperedges_intersections.rs index 9e237c3..df14729 100644 --- a/src/core/hyperedges/get_hyperedges_intersections.rs +++ b/src/core/hyperedges/get_hyperedges_intersections.rs @@ -1,5 +1,4 @@ use itertools::Itertools; -use rayon::prelude::*; use crate::{ HyperedgeIndex, HyperedgeKey, HyperedgeTrait, Hypergraph, VertexIndex, VertexTrait,