From 71cbbed55fc530c01c7f60dad8e7dde4ffec5632 Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 27 Feb 2019 11:13:22 +0100 Subject: [PATCH] simplified DT switches, see #255 --- .../de/neemann/digital/core/switching/PlainSwitch.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/neemann/digital/core/switching/PlainSwitch.java b/src/main/java/de/neemann/digital/core/switching/PlainSwitch.java index 53f93c68d..977912351 100644 --- a/src/main/java/de/neemann/digital/core/switching/PlainSwitch.java +++ b/src/main/java/de/neemann/digital/core/switching/PlainSwitch.java @@ -88,7 +88,9 @@ public final class PlainSwitch implements NodeInterface { if (input2 instanceof CommonBusValue) { final CommonBusValue in1 = (CommonBusValue) input1; final CommonBusValue in2 = (CommonBusValue) input2; - if (!isDoubleThrow) { + if (isDoubleThrow) + return new RealSwitch(in1, in2); + else { ObservableValue constant = in1.searchConstant(); if (constant != null) return new UniDirectionalSwitch(constant, output2); @@ -99,8 +101,7 @@ public final class PlainSwitch implements NodeInterface { else return new RealSwitch(in1, in2); } - } else - return new RealSwitch(in1, in2); + } } else return new UniDirectionalSwitch(input1, output2); } else {