aziis98/asd-2024
1
0
Fork 0
mirror of https://github.com/aziis98/asd-2024.git synced 2026-10-06 22:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

added progressbars

Browse Source
This commit is contained in:
aziis98
2024-09-30 00:42:36 +02:00
parent 37cfe2eb2c
commit 69b35e6a38
15 changed files with 462 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/fdg-example/src/stress_majorization.rs
+19 -18
View File
@@ -71,26 +71,27 @@ impl<F: Field + Measure + Sum, const D: usize> StressMajorization<F, D> {
&mut self,
graph: &mut StableGraph<(N, Point<F, D>), E>,
) -> F {
graph
.node_indices()
.flat_map(|v| {
graph.node_indices().skip(v.index() + 1).map(move |w| {
let dist = nalgebra::distance(
&graph.node_weight(v).unwrap().1,
&graph.node_weight(w).unwrap().1,
);
// graph
// .node_indices()
// .flat_map(|v| {
// graph.node_indices().skip(v.index() + 1).map(move |w| {
// let dist = nalgebra::distance(
// &graph.node_weight(v).unwrap().1,
// &graph.node_weight(w).unwrap().1,
// );
if dist != F::zero() {
let dij = self.shortest_path_matrix[&v][&w];
// if dist != F::zero() {
// let dij = self.shortest_path_matrix[&v][&w];
let sp_diff = self.shortest_path_matrix[&v][&w] - dist;
dij.simd_sqrt().abs() * sp_diff * sp_diff
} else {
F::zero()
}
})
})
.sum()
// let sp_diff = self.shortest_path_matrix[&v][&w] - dist;
// dij.simd_sqrt().abs() * sp_diff * sp_diff
// } else {
// F::zero()
// }
// })
// })
// .sum()
F::default()
}
}