berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(autorouter/planar_reconfigurer): Make g-scores proportional to number of changed routes

This commit is contained in:
Mikolaj Wielgus 2025-11-19 00:18:30 +01:00
parent f2c67ed81d
commit a8a2e8d8cb
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/autorouter/planar_reconfigurer.rs
View File

@ -104,19 +104,19 @@ impl SccSearchNode {
let mut expanded_nodes = vec![];
if let Some(resized) = self.clone().resize(length) {
if let Some(permuted_resized) = resized.permute() {
if let Some((permuted_resized, changed_count)) = resized.permute() {
expanded_nodes.push((
0.1,
(self.curr_permutation.len() - length) as f64,
changed_count as f64 / 100.0,
(self.curr_permutation.len() - permuted_resized.length) as f64,
permuted_resized,
));
}
}
if let Some(permuted) = self.clone().permute() {
if let Some((permuted, changed_count)) = self.clone().permute() {
expanded_nodes.push((
0.1,
(self.curr_permutation.len() - self.length) as f64,
changed_count as f64 / 100.0,
(self.curr_permutation.len() - permuted.length) as f64,
permuted,
));
}
@ -141,12 +141,19 @@ impl SccSearchNode {
})
}
fn permute(mut self) -> Option<Self> {
fn permute(mut self) -> Option<(Self, usize)> {
let mut changed_count = 0;
for (i, element) in self.permutations.next()?.iter().enumerate() {
self.curr_permutation[i] = element.clone();
if self.curr_permutation[i] != *element {
self.curr_permutation[i] = element.clone();
// FIXME: Uncommenting this breaks the 4x4_1206_led_matrix test.
changed_count += 1;
}
}
Some(self)
Some((self, changed_count))
}
}