From 10103a3c7433f0e84697c8e8eaf5b7112a587f07 Mon Sep 17 00:00:00 2001 From: hneemann Date: Thu, 9 May 2024 13:31:05 +0200 Subject: [PATCH] fixed a bug in max path len calculation --- .../java/de/neemann/digital/analyse/CycleDetector.java | 2 +- .../java/de/neemann/digital/analyse/ModelAnalyser.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/neemann/digital/analyse/CycleDetector.java b/src/main/java/de/neemann/digital/analyse/CycleDetector.java index ea6c5165c..e70d532d2 100644 --- a/src/main/java/de/neemann/digital/analyse/CycleDetector.java +++ b/src/main/java/de/neemann/digital/analyse/CycleDetector.java @@ -48,7 +48,7 @@ public final class CycleDetector { traverse(root, s.getValue(), nodes, visited); } - // Turned of for now because if it is used you can build circuits with a state + // Turned off for now because if it is used you can build circuits with a cycle // which are not detected as such. //removeSwitchCycles(nodes.values()); diff --git a/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java b/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java index bb77f9939..29cbad463 100644 --- a/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java +++ b/src/main/java/de/neemann/digital/analyse/ModelAnalyser.java @@ -319,11 +319,8 @@ public class ModelAnalyser { * @throws AnalyseException AnalyseException */ public int calcMaxPathLen() throws PinException, BacktrackException, AnalyseException { - LOGGER.debug("start to calculate the depth of the model..."); - - if (!Main.isExperimentalMode() && !modelContainsSwitches()) - CycleDetector.checkForCycles(inputs); - + LOGGER.debug("start to calculate the max path len of the model..."); + CycleDetector.checkForCycles(inputs); PathLenAnalyser da = new PathLenAnalyser(this); return da.getMaxPathLen(); }