Skip to content

Commit 1d1e606

Browse files
StunkymonkeyStunkymonkey
committed
update all
1 parent 920ec09 commit 1d1e606

File tree

24 files changed

+733
-533
lines changed

24 files changed

+733
-533
lines changed

‎Cargo.lock‎

Lines changed: 419 additions & 232 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mlp/gonzalez/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ edition = "2018"
66

77
[dependencies]
88
clap = { version = "4.4", features = ["cargo"] }
9-
rand = "0.8"
9+
rand = "0.9"
1010
rayon = "1.5"

‎mlp/gonzalez/src/gonzalez.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22
use hop_bfs::HopBFS;
3-
use rand::seq::SliceRandom;
3+
use rand::seq::IndexedRandom;
44
use rand::{rngs::StdRng, SeedableRng};
55
use std::collections::BTreeSet;
66

@@ -13,8 +13,7 @@ pub fn partition(
1313
let mut partition_indices: Vec<usize> = vec![0, nodes.len()];
1414
let mut rng: Box<StdRng> = Box::new(SeedableRng::seed_from_u64(42));
1515

16-
let mut up_offset = Vec::<EdgeId>::new();
17-
up_offset.resize(nodes.len() + 1, 0);
16+
let mut up_offset = vec![0; nodes.len() + 1];
1817
let sources: Vec<EdgeId> = edges.iter().map(|x| x.from).rev().collect();
1918
offset::fill_offset(sources, &mut up_offset);
2019

‎mlp/gonzalez/src/graph_helper.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,13 @@ fn edge_index() {
121121

122122
let amount_nodes = 6;
123123

124-
let mut edges = Vec::<Edge>::new();
125-
edges.push(Edge::new(0, 1));
126-
edges.push(Edge::new(2, 1));
127-
edges.push(Edge::new(1, 3));
128-
edges.push(Edge::new(1, 5));
129-
edges.push(Edge::new(1, 4));
124+
let mut edges = vec![
125+
Edge::new(0, 1),
126+
Edge::new(2, 1),
127+
Edge::new(1, 3),
128+
Edge::new(1, 5),
129+
Edge::new(1, 4),
130+
];
130131

131132
let mut up_offset = Vec::<EdgeId>::new();
132133
let mut down_offset = Vec::<EdgeId>::new();
@@ -150,10 +151,7 @@ fn edge_index_line() {
150151

151152
let amount_nodes = 4;
152153

153-
let mut edges = Vec::<Edge>::new();
154-
edges.push(Edge::new(0, 1));
155-
edges.push(Edge::new(1, 2));
156-
edges.push(Edge::new(2, 3));
154+
let mut edges = vec![Edge::new(0, 1), Edge::new(1, 2), Edge::new(2, 3)];
157155

158156
let mut up_offset = Vec::<EdgeId>::new();
159157
let mut down_offset = Vec::<EdgeId>::new();
@@ -191,12 +189,13 @@ fn edges() {
191189

192190
let amount_nodes = 6;
193191

194-
let mut edges = Vec::<Edge>::new();
195-
edges.push(Edge::new(0, 1));
196-
edges.push(Edge::new(2, 1));
197-
edges.push(Edge::new(1, 3));
198-
edges.push(Edge::new(1, 5));
199-
edges.push(Edge::new(1, 4));
192+
let mut edges = vec![
193+
Edge::new(0, 1),
194+
Edge::new(2, 1),
195+
Edge::new(1, 3),
196+
Edge::new(1, 5),
197+
Edge::new(1, 4),
198+
];
200199

201200
let mut up_offset = Vec::<EdgeId>::new();
202201
let mut down_offset = Vec::<EdgeId>::new();
@@ -241,12 +240,13 @@ fn neighbours() {
241240

242241
let amount_nodes = 6;
243242

244-
let mut edges = Vec::<Edge>::new();
245-
edges.push(Edge::new(0, 1));
246-
edges.push(Edge::new(2, 1));
247-
edges.push(Edge::new(1, 3));
248-
edges.push(Edge::new(1, 5));
249-
edges.push(Edge::new(1, 4));
243+
let mut edges = vec![
244+
Edge::new(0, 1),
245+
Edge::new(2, 1),
246+
Edge::new(1, 3),
247+
Edge::new(1, 5),
248+
Edge::new(1, 4),
249+
];
250250

251251
let mut up_offset = Vec::<EdgeId>::new();
252252
let mut down_offset = Vec::<EdgeId>::new();

‎mlp/gonzalez/src/offset.rs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22

33
/// fill offset array
4-
pub fn fill_offset(edges: Vec<NodeId>, offset: &mut Vec<usize>) {
4+
pub fn fill_offset(edges: Vec<NodeId>, offset: &mut [usize]) {
55
for edge in edges {
66
offset[edge + 1] += 1;
77
}
@@ -13,7 +13,7 @@ pub fn fill_offset(edges: Vec<NodeId>, offset: &mut Vec<usize>) {
1313
/// make sure edges are already sorted!!
1414
#[allow(dead_code)]
1515
pub fn generate_offsets_unstable(
16-
edges: &mut Vec<Edge>,
16+
edges: &mut [Edge],
1717
up_offset: &mut Vec<EdgeId>,
1818
down_offset: &mut Vec<EdgeId>,
1919
amount_nodes: usize,
@@ -83,19 +83,20 @@ fn all_offsets() {
8383

8484
let amount_nodes = 10;
8585

86-
let mut edges = Vec::<Edge>::new();
87-
edges.push(Edge::new(0, 1));
88-
edges.push(Edge::new(1, 2));
89-
edges.push(Edge::new(2, 3));
90-
edges.push(Edge::new(3, 4));
91-
edges.push(Edge::new(0, 5));
92-
edges.push(Edge::new(5, 6));
93-
edges.push(Edge::new(6, 4));
94-
edges.push(Edge::new(6, 3));
95-
edges.push(Edge::new(5, 7));
96-
edges.push(Edge::new(7, 8));
97-
edges.push(Edge::new(8, 9));
98-
edges.push(Edge::new(9, 4));
86+
let mut edges = vec![
87+
Edge::new(0, 1),
88+
Edge::new(1, 2),
89+
Edge::new(2, 3),
90+
Edge::new(3, 4),
91+
Edge::new(0, 5),
92+
Edge::new(5, 6),
93+
Edge::new(6, 4),
94+
Edge::new(6, 3),
95+
Edge::new(5, 7),
96+
Edge::new(7, 8),
97+
Edge::new(8, 9),
98+
Edge::new(9, 4),
99+
];
99100

100101
let mut up_offset = Vec::<EdgeId>::new();
101102
let mut down_offset = Vec::<EdgeId>::new();

‎mlp/gonzalez/src/valid_flag.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl ValidFlag {
2424
}
2525

2626
pub fn invalidate_all(&mut self) {
27-
if self.valid_flag == std::usize::MAX {
27+
if self.valid_flag == usize::MAX {
2828
self.nodes = vec![0; self.nodes.len()];
2929
self.valid_flag = 1;
3030
} else {

‎mlp/kmeans/src/partition.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use ndarray::Array2;
33
use crate::constants::*;
44
use crate::structs::*;
55

6-
pub fn partition(partitions: &[usize], nodes: &mut Vec<Node>) -> Result<(), String> {
6+
pub fn partition(partitions: &[usize], nodes: &mut [Node]) -> Result<(), String> {
77
// ids of all nodes
88
let mut partition_order: Vec<NodeId> = (0..nodes.len()).collect();
99
// indices which divides the partitions (including all at the beginning)

‎mlp/merge/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ edition = "2018"
66

77
[dependencies]
88
clap = { version = "4.4", features = ["cargo"] }
9-
rand = "0.8"
9+
rand = "0.9"
1010
rayon = "1.8"
11-
ordered-float = "4.1"
11+
ordered-float = "5.0"

‎mlp/merge/src/graph_helper.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,13 @@ fn edge_index() {
121121

122122
let amount_nodes = 6;
123123

124-
let mut edges = Vec::<Edge>::new();
125-
edges.push(Edge::new(0, 1));
126-
edges.push(Edge::new(2, 1));
127-
edges.push(Edge::new(1, 3));
128-
edges.push(Edge::new(1, 5));
129-
edges.push(Edge::new(1, 4));
124+
let mut edges = vec![
125+
Edge::new(0, 1),
126+
Edge::new(2, 1),
127+
Edge::new(1, 3),
128+
Edge::new(1, 5),
129+
Edge::new(1, 4),
130+
];
130131

131132
let mut up_offset = Vec::<EdgeId>::new();
132133
let mut down_offset = Vec::<EdgeId>::new();
@@ -150,10 +151,7 @@ fn edge_index_line() {
150151

151152
let amount_nodes = 4;
152153

153-
let mut edges = Vec::<Edge>::new();
154-
edges.push(Edge::new(0, 1));
155-
edges.push(Edge::new(1, 2));
156-
edges.push(Edge::new(2, 3));
154+
let mut edges = vec![Edge::new(0, 1), Edge::new(1, 2), Edge::new(2, 3)];
157155

158156
let mut up_offset = Vec::<EdgeId>::new();
159157
let mut down_offset = Vec::<EdgeId>::new();
@@ -191,12 +189,13 @@ fn edges() {
191189

192190
let amount_nodes = 6;
193191

194-
let mut edges = Vec::<Edge>::new();
195-
edges.push(Edge::new(0, 1));
196-
edges.push(Edge::new(2, 1));
197-
edges.push(Edge::new(1, 3));
198-
edges.push(Edge::new(1, 5));
199-
edges.push(Edge::new(1, 4));
192+
let mut edges = vec![
193+
Edge::new(0, 1),
194+
Edge::new(2, 1),
195+
Edge::new(1, 3),
196+
Edge::new(1, 5),
197+
Edge::new(1, 4),
198+
];
200199

201200
let mut up_offset = Vec::<EdgeId>::new();
202201
let mut down_offset = Vec::<EdgeId>::new();
@@ -241,12 +240,13 @@ fn neighbours() {
241240

242241
let amount_nodes = 6;
243242

244-
let mut edges = Vec::<Edge>::new();
245-
edges.push(Edge::new(0, 1));
246-
edges.push(Edge::new(2, 1));
247-
edges.push(Edge::new(1, 3));
248-
edges.push(Edge::new(1, 5));
249-
edges.push(Edge::new(1, 4));
243+
let mut edges = vec![
244+
Edge::new(0, 1),
245+
Edge::new(2, 1),
246+
Edge::new(1, 3),
247+
Edge::new(1, 5),
248+
Edge::new(1, 4),
249+
];
250250

251251
let mut up_offset = Vec::<EdgeId>::new();
252252
let mut down_offset = Vec::<EdgeId>::new();

‎mlp/merge/src/merge.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ use std::time::Instant;
88
pub fn merge(
99
partition_amounts: &mut Vec<usize>,
1010
partition_sizes: &[usize],
11-
nodes: &mut Vec<Node>,
11+
nodes: &mut [Node],
1212
edges: &[Edge],
1313
) -> Result<(), String> {
1414
let heuristic_time = Instant::now();
1515

1616
// create offsets
17-
let mut up_offset = Vec::<EdgeId>::new();
18-
up_offset.resize(nodes.len() + 1, 0);
17+
let mut up_offset = vec![0; nodes.len() + 1];
1918
let sources: Vec<EdgeId> = edges.iter().map(|x| x.from).rev().collect();
2019
offset::fill_offset(sources, &mut up_offset);
2120

@@ -349,5 +348,5 @@ fn get_priority(
349348

350349
(connecting_a_b * (1 + border_nodes_a + border_nodes_b - new_border_nodes)) as f64
351350
/ (nodes_a.len() * nodes_b.len()) as f64
352-
* rng.gen_range(1.0..1.01)
351+
* rng.random_range(1.0..1.01)
353352
}

0 commit comments

Comments
 (0)