From c0a3e183ab8ea28195bb6208cfa1adbaf8365c8f Mon Sep 17 00:00:00 2001 From: Marina Date: Mon, 27 Jul 2020 18:06:30 +0300 Subject: [PATCH 1/5] hm1.2 --- src/main/java/core/basesyntax/BooleanExpression.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index f8cfc8e..0cdab40 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -14,6 +14,9 @@ public class BooleanExpression { * без использования конструкций if-else

*/ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return false; + + return (a == b && a == c && a == d) ? false + : ((a ^ b) ^ (c ^ d)) ? false + : true; } } From 43a18cd575f56a56591bac6f279bfeb307881a70 Mon Sep 17 00:00:00 2001 From: Marina Date: Mon, 27 Jul 2020 20:15:26 +0300 Subject: [PATCH 2/5] make code shorter --- src/main/java/core/basesyntax/BooleanExpression.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index 0cdab40..01db77e 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -15,8 +15,8 @@ public class BooleanExpression { */ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return (a == b && a == c && a == d) ? false - : ((a ^ b) ^ (c ^ d)) ? false - : true; + return !((a ^ b) ^ (c ^ d)) & ((a ^ b) | ((a ^ b) | (a ^ c))); + + } } From 9fbc087b537d9025777c3c1c72ac3202263ea071 Mon Sep 17 00:00:00 2001 From: Marina Date: Mon, 27 Jul 2020 20:19:43 +0300 Subject: [PATCH 3/5] make code shorter --- src/main/java/core/basesyntax/BooleanExpression.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index 01db77e..347f50a 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -15,8 +15,7 @@ public class BooleanExpression { */ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return !((a ^ b) ^ (c ^ d)) & ((a ^ b) | ((a ^ b) | (a ^ c))); - + return !((a ^ b) ^ (c ^ d)) & ((a ^ b) | (a ^ c)); } } From 3bea7bb0e6f3908e914ab1f547d5b5bacb6b38e0 Mon Sep 17 00:00:00 2001 From: Marina Date: Tue, 28 Jul 2020 12:45:11 +0300 Subject: [PATCH 4/5] && instead & --- src/main/java/core/basesyntax/BooleanExpression.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index 347f50a..c60e73e 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -15,7 +15,7 @@ public class BooleanExpression { */ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return !((a ^ b) ^ (c ^ d)) & ((a ^ b) | (a ^ c)); + return !((a ^ b) ^ (c ^ d)) && ((a ^ b) | (a ^ c)); } } From 14c7791a7491a0ce03e1a4ceebf37014e0689cb6 Mon Sep 17 00:00:00 2001 From: Marina Date: Tue, 28 Jul 2020 15:13:55 +0300 Subject: [PATCH 5/5] add | --- src/main/java/core/basesyntax/BooleanExpression.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java index c60e73e..019a3ea 100644 --- a/src/main/java/core/basesyntax/BooleanExpression.java +++ b/src/main/java/core/basesyntax/BooleanExpression.java @@ -15,7 +15,7 @@ public class BooleanExpression { */ public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) { - return !((a ^ b) ^ (c ^ d)) && ((a ^ b) | (a ^ c)); + return !((a ^ b) ^ (c ^ d)) && ((a ^ b) || (a ^ c)); } }