From 4bc3ed3875f9a974daf5831e15fca0f5ff13e2f8 Mon Sep 17 00:00:00 2001
From: vosker
Date: Mon, 27 Jul 2020 21:15:08 +0300
Subject: [PATCH 1/3] added solution hw_1.2
---
src/main/java/core/basesyntax/BooleanExpression.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/core/basesyntax/BooleanExpression.java b/src/main/java/core/basesyntax/BooleanExpression.java
index f8cfc8e..a8050b3 100644
--- a/src/main/java/core/basesyntax/BooleanExpression.java
+++ b/src/main/java/core/basesyntax/BooleanExpression.java
@@ -14,6 +14,7 @@ public class BooleanExpression {
* без использования конструкций if-else
*/
public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) {
- return false;
+ int counter = (a ? 1 : 0) + (b ? 1 : 0) + (c ? 1 : 0) + (d ? 1 : 0);
+ return counter == 2;
}
}
From 4b07965b2179e16a74d86e272cb8a0dc3c2589df Mon Sep 17 00:00:00 2001
From: vosker
Date: Mon, 27 Jul 2020 21:19:48 +0300
Subject: [PATCH 2/3] "removed int variable"
---
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 a8050b3..b163e40 100644
--- a/src/main/java/core/basesyntax/BooleanExpression.java
+++ b/src/main/java/core/basesyntax/BooleanExpression.java
@@ -14,7 +14,6 @@ public class BooleanExpression {
* без использования конструкций if-else
*/
public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) {
- int counter = (a ? 1 : 0) + (b ? 1 : 0) + (c ? 1 : 0) + (d ? 1 : 0);
- return counter == 2;
+ return (a ? 1 : 0) + (b ? 1 : 0) + (c ? 1 : 0) + (d ? 1 : 0) == 2;
}
}
From a4a8310db662a624840c116ae4d07110a3caa91b Mon Sep 17 00:00:00 2001
From: vosker
Date: Tue, 28 Jul 2020 11:06:35 +0300
Subject: [PATCH 3/3] fixed mistakes
---
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 b163e40..9c56594 100644
--- a/src/main/java/core/basesyntax/BooleanExpression.java
+++ b/src/main/java/core/basesyntax/BooleanExpression.java
@@ -14,6 +14,6 @@ public class BooleanExpression {
* без использования конструкций if-else
*/
public boolean booleanExpression(boolean a, boolean b, boolean c, boolean d) {
- return (a ? 1 : 0) + (b ? 1 : 0) + (c ? 1 : 0) + (d ? 1 : 0) == 2;
+ return (a ^ b && c ^ d) || (a ^ d && c ^ b);
}
}