From 686b003bbeae6546146c8a3752ff696640f8540a Mon Sep 17 00:00:00 2001
From: Samuel Turpin <samuel.turpin.etu@univ-lille.fr>
Date: Fri, 29 Mar 2024 14:51:27 +0100
Subject: [PATCH] =?UTF-8?q?Calculatrice=20d=C3=A9sormais=20fonctionnel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/td05/Calculatrice.java | 40 +++++++++++++++++++++++++-------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/td05/Calculatrice.java b/src/td05/Calculatrice.java
index 48e3aed..078b978 100644
--- a/src/td05/Calculatrice.java
+++ b/src/td05/Calculatrice.java
@@ -8,43 +8,57 @@ public class Calculatrice
{
System.out.println(m);
}
+
+ private static boolean func_1(char c)
+ {
+ switch (c) {
+ case '+':
+ return false;
+ case '-':
+ return false;
+ case '*':
+ return false;
+ case '/':
+ return false;
+ }
+ return true;
+ }
public static void main(String[] args)
{
Scanner sc = new Scanner(System.in);
m("Bienvenue dans la calculatrice !");
- m("Ecrivez un signe pour une adition(+) soustraction(-) multiplication(*) et une division(/)");
- char c;
- do {
- c = sc.next().charAt(0);
- } while(!(c == '+'));
+ char c = 'd';
+ double db1 = 0.0;
+ double db2 = 0.0;
+ double calcul = 0.0;
m("Ecrivez le premier nombre");
- double db1;
do {
db1 = sc.nextDouble();
} while(!(db1 <= Double.MIN_VALUE) && !(db1 <= Double.MAX_VALUE));
-
+ m("Ecrivez un signe pour une adition(+) soustraction(-) multiplication(*) et une division(/)");
+ do {
+ c = sc.next().charAt(0);
+ }
+ while(func_1(c));
m("Ecrivez le deuxième nombre");
- double db2;
do {
db2 = sc.nextDouble();
} while(!(db2 <= Double.MIN_VALUE) && !(db2 <= Double.MAX_VALUE));
- double calcul = 0.0;
switch (c) {
case '+':
calcul = db1 + db2;
break;
- case '-':
+ case '-':
calcul = db1 - db2;
break;
- case '*':
+ case '*':
calcul = db1 * db2;
break;
- case '/':
+ case '/':
calcul = db1 / db2;
break;
}
-
System.out.println("Le résultat pour le calcul : " + db1 + c + db2 + " = " + calcul);
}
}
--
GitLab