From 4fa1a252a9aed83ba1ce06b86e43fc7b03aa03fe Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 28 Apr 2025 11:33:15 +0200 Subject: Revert "tighten code" This reverts commit 60a651148e5a6a95996610a28a849d58f51e9355. --- src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java') diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java index 82f9cc6..8bbe5ef 100644 --- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java +++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java @@ -154,9 +154,12 @@ public final class Combi { // add set of current and any unconnected modules Set isolated = all_set.stream().filter(x -> { - return x == current - || g.getWeight(current, x) == null; + if (x == current) + return false; + Integer weight = g.getWeight(current, x); + return weight == null && !done.contains(x); }).collect(Collectors.toSet()); + isolated.add(current); // add as set and omit from future iterations sets.add(isolated); -- cgit v1.2.3