2019.2.17 继续修改 dataclasses demo

wingfish · wingfish · commit 8ebc60f803b0 · 2019-02-17T22:38:05.000+08:00
diff --git a/section_02_data class/dataclass01.py b/section_02_data class/dataclass01.py
@@ -10,14 +10,18 @@ class Point:
 
 p = Point(1.5, 2.5)
 print(p)
+print(p.x, p.y, p.z)
 
 p = Point(1.5, 2.5, 3)
 print(p)
 
 p = Point(x=2, y=3)
 print(p)
 
+print('---')
+
 
+# 传统方式实现
 class Point2:
     def __init__(self, x, y, z=0.0):
         self.x = x
@@ -31,3 +35,12 @@ def __repr__(self):
 p = Point2(1.5, 2.5)
 print(p)
 print(p.x, p.y, p.z)
+
+print('---')
+
+# 显示经过 dataclass 修饰的方法
+print(dir(p))
+print(p)
+print(p.__repr__())
+
+print('---')
diff --git a/section_02_data class/dataclass02.py b/section_02_data class/dataclass02.py
@@ -2,25 +2,19 @@
 
 
 @dataclass
-class DataClassCard:
-    rank: str
-    suit: str
+class Point:
+    x: float
+    y: float
+    z: float = 0.0
 
 
-queen_of_hearts = DataClassCard('Q', 'Hearts')
-print(queen_of_hearts)
-print(queen_of_hearts.rank)
-print(queen_of_hearts == DataClassCard('Q', 'Hearts'))
+p1 = Point(1.5, 2.5)
+print(p1.x, p1.y, p1.z)
 
+p2 = Point(1.5, 2.5, 0)
+print(p2)
 
-class RegularCard:
-    def __init__(self, rank, suit):
-        self.rank = rank
-        self.suit = suit
+print(p1 == p2)
 
-
-queen_of_hearts = RegularCard('Q', 'Hearts')
-print(queen_of_hearts)
-print(queen_of_hearts.rank)
-print(queen_of_hearts == RegularCard('Q', 'Hearts'))
+print('---')
 
diff --git a/section_02_data class/dataclass20.py b/section_02_data class/dataclass20.py
@@ -0,0 +1,26 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class DataClassCard:
+    rank: str
+    suit: str
+
+
+queen_of_hearts = DataClassCard('Q', 'Hearts')
+print(queen_of_hearts)
+print(queen_of_hearts.rank)
+print(queen_of_hearts == DataClassCard('Q', 'Hearts'))
+
+
+class RegularCard:
+    def __init__(self, rank, suit):
+        self.rank = rank
+        self.suit = suit
+
+
+queen_of_hearts = RegularCard('Q', 'Hearts')
+print(queen_of_hearts)
+print(queen_of_hearts.rank)
+print(queen_of_hearts == RegularCard('Q', 'Hearts'))
+
