From 8fedaf4cba8c155d02a09742a0a08aa28bdb68d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=96=E5=BF=83=E5=A6=8D?= <2392642810@qq.com>
Date: Wed, 10 May 2023 09:14:37 +0800
Subject: [PATCH] =?UTF-8?q?5.9=20=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...32\346\200\201\347\273\203\344\271\240.md" | 239 +++++++++---------
 .../20230509 \345\274\202\345\270\270.md"     |  26 ++
 2 files changed, 144 insertions(+), 121 deletions(-)
 create mode 100644 "03 \350\265\226\345\277\203\345\246\215/20230509 \345\274\202\345\270\270.md"

diff --git "a/03 \350\265\226\345\277\203\345\246\215/20230505 \345\244\232\346\200\201\347\273\203\344\271\240.md" "b/03 \350\265\226\345\277\203\345\246\215/20230505 \345\244\232\346\200\201\347\273\203\344\271\240.md"
index fd629c7..7851220 100644
--- "a/03 \350\265\226\345\277\203\345\246\215/20230505 \345\244\232\346\200\201\347\273\203\344\271\240.md"	
+++ "b/03 \350\265\226\345\277\203\345\246\215/20230505 \345\244\232\346\200\201\347\273\203\344\271\240.md"	
@@ -27,141 +27,138 @@
 （4）在测试类中，新建一个比较图形面积的方法，再建一个比较图形周长的方法，main方法中创建多个圆和矩形对象,再调用方法比较他们的周长或面积。
 
 ```java
-//测试类
+package Demo;
+
+import java.util.Scanner;
+
 public class GraphicTest {
-    public static void main(String[] args) {
-        Scanner sc = new Scanner(System.in);
-        Graphic[] arr = new Graphic[4];
-
-        Circle c1 = new Circle();
-        System.out.println("请输入圆形1的半径");
-        int radius1=sc.nextInt();
-        c1.setRadius(radius1);
-        arr[0]=c1;
-
-        Circle c2 = new Circle();
-        System.out.println("请输入圆形2的半径");
-        int radius2=sc.nextInt();
-        c2.setRadius(radius2);
-        arr[1]=c2;
-
-        Rectangle r1 = new Rectangle();
-        System.out.println("请输入矩形1的长与宽");
-        int length1=sc.nextInt();
-        r1.setLength(length1);
-        int width1=sc.nextInt();
-        r1.setWidth(width1);
-        arr[2]=r1;
-
-        Rectangle r2 = new Rectangle();
-        System.out.println("请输入矩形2的长与宽");
-        int length2=sc.nextInt();
-        r2.setLength(length2);
-        int width2=sc.nextInt();
-        r2.setWidth(width2);
-        arr[3]=r2;
-
-        //冒泡法排序
-        System.out.println("排序前");
-        for (int i = 0; i < arr.length; i++) {
-            System.out.println(arr[i].getInfo());
-        }
-        System.out.println();
-        System.out.println("排序后");
-        for (int i = 1; i < arr.length; i++) {
-            for (int j = 0; j < arr.length-1; j++) {
-                if(arr[j].area()>arr[j+1].area()){
-                    Graphic tmp=arr[j];
-                    arr[j]=arr[j+1];
-                    arr[j+1]=tmp;
-                }
-            }
+    //测试类
+        public static void main(String[] args) {
+            Graphic circle = new Graphic();
+
+            Scanner sc = new Scanner(System.in);
+
+            Circle c1 = new Circle();
+            System.out.println("请输入圆形1的半径");
+            int radius1=sc.nextInt();
+            c1.setRadius(radius1);
+
+            Circle c2 = new Circle();
+            System.out.println("请输入圆形2的半径");
+            int radius2=sc.nextInt();
+            c2.setRadius(radius2);
+
+            Rectangle r1 = new Rectangle();
+            System.out.println("请输入矩形1的长与宽");
+            int length1=sc.nextInt();
+            r1.setLength(length1);
+            int width1=sc.nextInt();
+            r1.setWidth(width1);
+
+            Rectangle r2 = new Rectangle();
+            System.out.println("请输入矩形2的长与宽");
+            int length2=sc.nextInt();
+            r2.setLength(length2);
+            int width2=sc.nextInt();
+            r2.setWidth(width2);
+
+            compare(c1,c2);
+            compare(r1,r2);
+            compare(c1,r1);
+            compare(c2,r2);
         }
-        for (int i = 0; i < arr.length; i++) {
-            System.out.println(arr[i].getInfo());
+        public  static void compare(Graphic g1,Graphic g2) {
+            if (g1.area()> g2.area()){
+                System.out.println("图形1面积比图形2面积大									\n"+g1.getInfo()+"\n"+g2.getInfo());
+            }else if (g1.area()<g2.area()){
+                System.out.println("图形1面积比图形2面积小									\n"+g1.getInfo()+"\n"+g2.getInfo());
+            }else {
+                System.out.println("图形1面积和图形2面积一样大					    			\n"+g1.getInfo()+"\n"+g2.getInfo());
+            }
+            System.out.println();
         }
-    }
 }
-//父类
-class Graphic {
-    public double area(){
-        return 0.0;
-    }
-    public double perimeter(){
-        return 0.0;
-    }
-    public String getInfo(){
-        return "图形面积为"+area()+"图形周长为"+perimeter();
+    //父类
+    class Graphic {
+        public double area(){
+            return 0.0;
+        }
+        public double perimeter(){
+            return 0.0;
+        }
+        public String getInfo(){
+            return "图形面积为"+area()+"图形周长为"+perimeter();
+        }
     }
-}
-//子类
-class Circle extends Graphic{
-    private int radius;
+    //子类
+    class Circle extends Graphic{
+        private int radius;
 
-    public Circle(){}
-    public Circle(int radius) {
-        this.radius = radius;
-    }
+        public Circle(){}
+        public Circle(int radius) {
+            this.radius = radius;
+        }
 
-    public int getRadius() {
-        return radius;
-    }
-    public void setRadius(int radius) {
-        this.radius = radius;
-    }
+        public int getRadius() {
+            return radius;
+        }
+        public void setRadius(int radius) {
+            this.radius = radius;
+        }
 
-    @Override
-    public double area() {
-        return 3.14*radius*radius;
-    }
+        @Override
+        public double area() {
+            return 3.14*radius*radius;
+        }
 
-    @Override
-    public double perimeter() {
-        return 2*3.14*radius;
-    }
+        @Override
+        public double perimeter() {
+            return 2*3.14*radius;
+        }
 
-    @Override
-    public String getInfo() {
-        return "圆的半径为"+radius+super.getInfo();
-    }
-}
-//子类
-class Rectangle extends Graphic{
-    private int length;
-    private int width;
-
-    public Rectangle(){}
-    public Rectangle(int length, int width) {
-        this.length = length;
-        this.width = width;
+        @Override
+        public String getInfo() {
+            return "圆的半径为"+radius+super.getInfo();
+        }
     }
+    //子类
+    class Rectangle extends Graphic{
+        private int length;
+        private int width;
 
-    public int getLength() {
-        return length;
-    }
-    public void setLength(int length) {
-        this.length = length;
-    }
-    public int getWidth() {
-        return width;
-    }
-    public void setWidth(int width) {
-        this.width = width;
-    }
+        public Rectangle(){}
+        public Rectangle(int length, int width) {
+            this.length = length;
+            this.width = width;
+        }
 
-    @Override
-    public double area() {
-        return length*width;
-    }
+        public int getLength() {
+            return length;
+        }
+        public void setLength(int length) {
+            this.length = length;
+        }
+        public int getWidth() {
+            return width;
+        }
+        public void setWidth(int width) {
+            this.width = width;
+        }
 
-    @Override
-    public double perimeter() {
-        return 2*length+2*width;
-    }
+        @Override
+        public double area() {
+            return length*width;
+        }
 
-    @Override
-    public String getInfo() {
-        return "长为"+length+"宽为"+width+super.getInfo();
-    }
+        @Override
+        public double perimeter() {
+            return 2*length+2*width;
+        }
+
+        @Override
+        public String getInfo() {
+            return "长为"+length+"宽为"+width+super.getInfo();
+        }
 }
+
 ```
\ No newline at end of file
diff --git "a/03 \350\265\226\345\277\203\345\246\215/20230509 \345\274\202\345\270\270.md" "b/03 \350\265\226\345\277\203\345\246\215/20230509 \345\274\202\345\270\270.md"
new file mode 100644
index 0000000..cef70cb
--- /dev/null
+++ "b/03 \350\265\226\345\277\203\345\246\215/20230509 \345\274\202\345\270\270.md"	
@@ -0,0 +1,26 @@
+### 用键盘输入两个整数，并求和；如果输入的不是整数用异常去处理
+
+```java
+import java.util.Scanner;
+
+public class Demo1 {
+    public static void main(String[] args) {
+        Scanner sc = new Scanner(System.in);
+        while (true) {
+            System.out.println("请输入两个整数");
+            String num1 = sc.next();
+            String num2 = sc.next();
+            try {
+               int n1 = Integer.parseInt(num1);
+               int n2 = Integer.parseInt(num2);
+               int num = n1 + n2;
+               System.out.println("两个整数的和是" + num);
+               break;
+            } catch (NumberFormatException e) {
+                System.out.println("只能输入整数,请重新输入");
+            }
+        }
+    }
+}
+```
+
-- 
Gitee