From 0f1f8ac14475d4b7b9b43f019c05ef99685edc5a Mon Sep 17 00:00:00 2001
From: Daria
Date: Mon, 27 Jul 2020 20:08:41 +0300
Subject: [PATCH 1/2] added solution
---
src/main/java/core/basesyntax/BooleanExpression.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java
index f8cfc8e..da20e90 100644
--- a/src/main/java/core/basesyntax/BooleanExpression.java
+++ b/src/main/java/core/basesyntax/BooleanExpression.java
@@ -14,6 +14,13 @@ public class BooleanExpression {
* без использования конструкций if-else
*/
public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) {
- return false;
+ return (a && b && !c && !d) ||
+ (a && !b && c && !d) ||
+ (a && !b && !c && d) ||
+ (!a && b && c && !d) ||
+ (!a && b && !c && d) ||
+ (!a && !b && c && d);
}
+
+
}
From a452cbd61fa6d8068e8eef3fb99a8575f50aea86 Mon Sep 17 00:00:00 2001
From: Daria
Date: Tue, 28 Jul 2020 13:26:06 +0300
Subject: [PATCH 2/2] issues fixed
---
src/main/java/core/basesyntax/BooleanExpression.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java
index da20e90..bd3c7ae 100644
--- a/src/main/java/core/basesyntax/BooleanExpression.java
+++ b/src/main/java/core/basesyntax/BooleanExpression.java
@@ -13,14 +13,9 @@ public class BooleanExpression {
* Это задание необходимо решать с использованием логических операторов,
* без использования конструкций if-else
*/
+
public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) {
- return (a && b && !c && !d) ||
- (a && !b && c && !d) ||
- (a && !b && !c && d) ||
- (!a && b && c && !d) ||
- (!a && b && !c && d) ||
- (!a && !b && c && d);
+ return (a ^ c && b ^ d) || (a ^ d && b ^ c);
}
-
}