From 1fa6773e308135d125339af82a10da42bf1eb500 Mon Sep 17 00:00:00 2001
From: zhuyanshuo <3663541984@qq.com>
Date: Mon, 30 Mar 2026 15:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {w5 => w4}/56659ce40041862627f0ca124de1db47.png | Bin
 {w5 => w4}/743570fdfbd74c9de110a474949723bd.png | Bin
 {w5 => w4}/AI协助记录                       |   0
 {w5 => w4}/Main.java                            |   6 +++---
 {w5 => w4}/Shape.java                           |  16 ++++++++--------
 {w5 => w4}/be557904d4ec497ad578cc01aa266417.png | Bin
 {w5 => w4}/dbe59697c52434ebfb81ec2eec1f4295.png | Bin
 {w5 => w4}/实验报告                         |   0
 {w5 => w4}/组合vs继承                       |   0
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename {w5 => w4}/56659ce40041862627f0ca124de1db47.png (100%)
 rename {w5 => w4}/743570fdfbd74c9de110a474949723bd.png (100%)
 rename {w5 => w4}/AI协助记录 (100%)
 rename {w5 => w4}/Main.java (66%)
 rename {w5 => w4}/Shape.java (67%)
 rename {w5 => w4}/be557904d4ec497ad578cc01aa266417.png (100%)
 rename {w5 => w4}/dbe59697c52434ebfb81ec2eec1f4295.png (100%)
 rename {w5 => w4}/实验报告 (100%)
 rename {w5 => w4}/组合vs继承 (100%)

diff --git a/w5/56659ce40041862627f0ca124de1db47.png b/w4/56659ce40041862627f0ca124de1db47.png
similarity index 100%
rename from w5/56659ce40041862627f0ca124de1db47.png
rename to w4/56659ce40041862627f0ca124de1db47.png
diff --git a/w5/743570fdfbd74c9de110a474949723bd.png b/w4/743570fdfbd74c9de110a474949723bd.png
similarity index 100%
rename from w5/743570fdfbd74c9de110a474949723bd.png
rename to w4/743570fdfbd74c9de110a474949723bd.png
diff --git a/w5/AI协助记录 b/w4/AI协助记录
similarity index 100%
rename from w5/AI协助记录
rename to w4/AI协助记录
diff --git a/w5/Main.java b/w4/Main.java
similarity index 66%
rename from w5/Main.java
rename to w4/Main.java
index 90595af..fc1b8cd 100644
--- a/w5/Main.java
+++ b/w4/Main.java
@@ -1,9 +1,9 @@
 public class Main {
     public static void main(String[] args) {
         // 创建图形对象
-        Shape circle = new Circle(3);
-        Shape rectangle = new Rectangle(4, 5);
-        Shape triangle = new Triangle(6, 8);
+        Shape circle = new Circle(6);
+        Shape rectangle = new Rectangle(7, 9);
+        Shape triangle = new Triangle(7, 10);
 
         // 统一计算并打印面积
         ShapeUtil.printArea(circle);
diff --git a/w5/Shape.java b/w4/Shape.java
similarity index 67%
rename from w5/Shape.java
rename to w4/Shape.java
index f557c06..9433db9 100644
--- a/w5/Shape.java
+++ b/w4/Shape.java
@@ -1,17 +1,17 @@
 
-    abstract class Shape {
-        public abstract double getArea();
+    abstract class Shape {//定义一个抽象类
+        public abstract double getArea();//强制所有图形都必须能计算面积
     }
 
     // 圆形
-    class Circle extends Shape {
-        private double radius;
+    class Circle extends Shape {//继承shape，必须实现getarea
+        private double radius;//半径私有属性
 
         public Circle(double radius) {
             this.radius = radius;
-        }
+        }//构造方法无返回值，给对象赋初始值
 
-        @Override
+        @Override//重写父类方法
         public double getArea() {
             return Math.PI * radius * radius;
         }
@@ -50,8 +50,8 @@
     }
 
     // 工具类
-    class ShapeUtil {
-        public static void printArea(Shape shape) {
+    class ShapeUtil {//专门用来打印图形面积
+        public static void printArea(Shape shape) {//任意接受一个图形
             System.out.println("图形面积：" + shape.getArea());
         }
     }
diff --git a/w5/be557904d4ec497ad578cc01aa266417.png b/w4/be557904d4ec497ad578cc01aa266417.png
similarity index 100%
rename from w5/be557904d4ec497ad578cc01aa266417.png
rename to w4/be557904d4ec497ad578cc01aa266417.png
diff --git a/w5/dbe59697c52434ebfb81ec2eec1f4295.png b/w4/dbe59697c52434ebfb81ec2eec1f4295.png
similarity index 100%
rename from w5/dbe59697c52434ebfb81ec2eec1f4295.png
rename to w4/dbe59697c52434ebfb81ec2eec1f4295.png
diff --git a/w5/实验报告 b/w4/实验报告
similarity index 100%
rename from w5/实验报告
rename to w4/实验报告
diff --git a/w5/组合vs继承 b/w4/组合vs继承
similarity index 100%
rename from w5/组合vs继承
rename to w4/组合vs继承