From 8225dc8ccd54b9d4462ba7381bd580e25267676d Mon Sep 17 00:00:00 2001
From: Samuel Turpin <samuel.turpin.etu@univ-lille.fr>
Date: Wed, 27 Mar 2024 14:41:27 +0100
Subject: [PATCH] b

---
 src/td05/Calculatrice.java       | 51 ++++++++++++++++++++++++++++++++
 src/td05/EncapsulatedCircle.java | 35 ++++++++++++++++++++++
 src/td05/Mail.java               | 23 --------------
 src/td05/Main.java               | 15 ++++++++++
 src/td05/Point.java              | 32 ++++++++++++++++++++
 5 files changed, 133 insertions(+), 23 deletions(-)
 create mode 100644 src/td05/Calculatrice.java
 create mode 100644 src/td05/EncapsulatedCircle.java
 delete mode 100644 src/td05/Mail.java
 create mode 100644 src/td05/Main.java
 create mode 100644 src/td05/Point.java

diff --git a/src/td05/Calculatrice.java b/src/td05/Calculatrice.java
new file mode 100644
index 0000000..e5bfd63
--- /dev/null
+++ b/src/td05/Calculatrice.java
@@ -0,0 +1,51 @@
+package td05;
+
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class Calculatrice
+{
+    private static void m(String m)
+    {
+        System.out.println(m);
+    }
+    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 == '+'));
+        m("Ecrivez le premier nombre");
+        double db1;
+        do {
+            db1 = sc.nextDouble();
+        } while(!(db1 <= Double.MIN_VALUE) && !(db1 <= Double.MAX_VALUE));
+
+        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 '-':
+                calcul = db1 - db2;
+                   break;
+                   case '*':
+             calcul = db1 * db2;
+                break;
+                case '/':
+             calcul = db1 / db2;
+                break;
+        }
+
+        System.out.println("Le résultat pour le calcul : " + db1 + c + db2 + " = " + calcul);
+    }
+}
diff --git a/src/td05/EncapsulatedCircle.java b/src/td05/EncapsulatedCircle.java
new file mode 100644
index 0000000..3897f68
--- /dev/null
+++ b/src/td05/EncapsulatedCircle.java
@@ -0,0 +1,35 @@
+package td05;
+
+public class EncapsulatedCircle
+{
+    private double x, y, r;
+
+    public EncapsulatedCircle(double x, double y, double r)
+    {
+        this.x = x;
+        this.y = y;
+        this.r = r;
+    }
+
+    public void moveCenter(double dx, double dy)
+    {
+        this.x=dx;
+        this.y=dy;
+    }
+
+    public void updateRadius(double dr)
+    {
+        this.r=dr;
+    }
+
+    public Point getCenter()
+    {
+        return new Point(this.x, this.y);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "EncapsulatedCircle[Point("+this.x+","+this.y+"),"+this.r+"]";
+    }
+}
\ No newline at end of file
diff --git a/src/td05/Mail.java b/src/td05/Mail.java
deleted file mode 100644
index da67eea..0000000
--- a/src/td05/Mail.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package td05;
-
-public class Mail
-{
-    public static final double BASIS = 0.0;
-    private boolean express = false;
-    private String address = "";
-
-    public Mail(boolean b, String s)
-    {
-
-    }
-
-    public boolean isValid()
-    {
-        return true;
-    }
-
-    public double frank()
-    {
-        return 0.0;
-    }
-}
diff --git a/src/td05/Main.java b/src/td05/Main.java
new file mode 100644
index 0000000..ddf9790
--- /dev/null
+++ b/src/td05/Main.java
@@ -0,0 +1,15 @@
+package td05;
+
+public class Main
+{
+    public static void main(String[] args)
+    {
+        EncapsulatedCircle e = new EncapsulatedCircle(3, 3, 5);
+
+        System.out.println(e);
+        e.moveCenter(9,5);
+        e.updateRadius(10);
+        System.out.println(e);
+        System.out.println(e.getCenter());
+    }
+}
\ No newline at end of file
diff --git a/src/td05/Point.java b/src/td05/Point.java
new file mode 100644
index 0000000..42c83d5
--- /dev/null
+++ b/src/td05/Point.java
@@ -0,0 +1,32 @@
+package td05;
+
+public class Point
+{
+    private double x, y;
+
+    public Point(double x, double y)
+    {
+        this.x = x;
+        this.y = y;
+    }
+
+    public void move(double x, double y)
+    {
+        x=x+1;
+        y=y+1;
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public double getY() {
+        return y;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Point("+this.x+","+this.y+")";
+    }
+}
\ No newline at end of file
-- 
GitLab