From 84d1fcc4509bc5185ccd98d02d9f24543ff039e5 Mon Sep 17 00:00:00 2001 From: lizart-tech Date: Mon, 27 Jul 2020 17:24:18 +0300 Subject: [PATCH 1/3] hw-1.2 --- src/main/java/core/basesyntax/BooleanExpression.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index f8cfc8e..e6607cc 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -14,6 +14,11 @@ public class BooleanExpression { * без использования конструкций if-else

*/ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return false; + return (((a && b) && (!c && !d)) + || ((a && c) && (!b && !d)) + || ((a && d) && (!c && !b)) + || ((b && c) && (!a && !d)) + || ((b && d) && (!c && !a)) + || ((c && d) && (!a && !b))) ? true : false; } } From 949864c4cf68f7235bb94e1a887ff293a441f3ec Mon Sep 17 00:00:00 2001 From: "m.mikhajlov" Date: Mon, 27 Jul 2020 19:08:50 +0300 Subject: [PATCH 2/3] deleted ternary operator, used XOR --- src/main/java/core/basesyntax/BooleanExpression.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index e6607cc..508cfb8 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -14,11 +14,11 @@ public class BooleanExpression { * без использования конструкций if-else

*/ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return (((a && b) && (!c && !d)) - || ((a && c) && (!b && !d)) - || ((a && d) && (!c && !b)) - || ((b && c) && (!a && !d)) - || ((b && d) && (!c && !a)) - || ((c && d) && (!a && !b))) ? true : false; + return (((a ^ b) && (c ^ d)) + || ((a ^ c) && (b ^ d)) + || ((a ^ d) && (c ^ b)) + || ((b ^ c) && (a ^ d)) + || ((b ^ d) && (c ^ a)) + || ((c ^ d) && (a ^ b))); } } From ee852f1a1d2c5762331068f58000f2995b46e7b7 Mon Sep 17 00:00:00 2001 From: "m.mikhajlov" Date: Tue, 28 Jul 2020 13:21:02 +0300 Subject: [PATCH 3/3] deleted redundant checks --- src/main/java/core/basesyntax/BooleanExpression.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index 508cfb8..32aa402 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -14,11 +14,6 @@ public class BooleanExpression { * без использования конструкций if-else

*/ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return (((a ^ b) && (c ^ d)) - || ((a ^ c) && (b ^ d)) - || ((a ^ d) && (c ^ b)) - || ((b ^ c) && (a ^ d)) - || ((b ^ d) && (c ^ a)) - || ((c ^ d) && (a ^ b))); + return (a ^ b) && (c ^ d) || (a ^ c) && (b ^ d); } }