diff --git a/src/oop/inherit_class.out b/src/oop/inherit_class.out index a75c0b8a..075eaf34 100644 --- a/src/oop/inherit_class.out +++ b/src/oop/inherit_class.out @@ -1,2 +1,2 @@ -sq: 0.56 -ci: 0.40 +sq: 1.25 +ci: 0.18 diff --git a/src/oop/inherit_class.py b/src/oop/inherit_class.py index e05dc41d..b7dd3d22 100644 --- a/src/oop/inherit_class.py +++ b/src/oop/inherit_class.py @@ -73,7 +73,7 @@ def find(cls, method_name): # [/search] # [use] -examples = [square_new("sq", 3), circle_new("ci", 2)] +examples = [square_new("sq", 2), circle_new("ci", 3)] for ex in examples: n = ex["name"] d = call(ex, "density", 5) diff --git a/src/oop/inherit_constructor.out b/src/oop/inherit_constructor.out index a75c0b8a..075eaf34 100644 --- a/src/oop/inherit_constructor.out +++ b/src/oop/inherit_constructor.out @@ -1,2 +1,2 @@ -sq: 0.56 -ci: 0.40 +sq: 1.25 +ci: 0.18 diff --git a/src/oop/inherit_constructor.py b/src/oop/inherit_constructor.py index 2dd2380f..c4719a99 100644 --- a/src/oop/inherit_constructor.py +++ b/src/oop/inherit_constructor.py @@ -77,7 +77,7 @@ def call(thing, method_name, *args): return method(thing, *args) # [call] -examples = [make(Square, "sq", 3), make(Circle, "ci", 2)] +examples = [make(Square, "sq", 2), make(Circle, "ci", 3)] for ex in examples: n = ex["name"] d = call(ex, "density", 5) diff --git a/src/oop/inherit_original.out b/src/oop/inherit_original.out index a75c0b8a..075eaf34 100644 --- a/src/oop/inherit_original.out +++ b/src/oop/inherit_original.out @@ -1,2 +1,2 @@ -sq: 0.56 -ci: 0.40 +sq: 1.25 +ci: 0.18 diff --git a/src/oop/inherit_original.py b/src/oop/inherit_original.py index 3bef04ac..3ba94f19 100644 --- a/src/oop/inherit_original.py +++ b/src/oop/inherit_original.py @@ -39,7 +39,7 @@ def area(self): return math.pi * self.radius ** 2 # [use] -examples = [Square("sq", 3), Circle("ci", 2)] +examples = [Square("sq", 2), Circle("ci", 3)] for ex in examples: n = ex.name d = ex.density(5) diff --git a/src/oop/larger.py b/src/oop/larger.py index 0c98f748..fa88389a 100644 --- a/src/oop/larger.py +++ b/src/oop/larger.py @@ -56,7 +56,7 @@ def call(thing, method_name, *args): # [/call] # [example] -examples = [square_new("sq", 3), circle_new("ci", 2)] +examples = [square_new("sq", 2), circle_new("ci", 3)] for ex in examples: result = call(ex, "larger", 10) print(f"is {ex['name']} larger? {result}") diff --git a/src/oop/shapes_class.out b/src/oop/shapes_class.out index b59c5854..6965921b 100644 --- a/src/oop/shapes_class.out +++ b/src/oop/shapes_class.out @@ -1,2 +1,2 @@ -sq is a Square: 12.00 9.00 -ci is a Circle: 12.57 12.57 +sq is a Square: 8.00 4.00 +ci is a Circle: 18.85 28.27 diff --git a/src/oop/shapes_class.py b/src/oop/shapes_class.py index efbfb1ac..bb5c0bf9 100644 --- a/src/oop/shapes_class.py +++ b/src/oop/shapes_class.py @@ -44,7 +44,7 @@ def circle_new(name, radius): def call(thing, method_name): return thing["_class"][method_name](thing) -examples = [square_new("sq", 3), circle_new("ci", 2)] +examples = [square_new("sq", 2), circle_new("ci", 3)] for ex in examples: n = ex["name"] p = call(ex, "perimeter") diff --git a/src/oop/shapes_dict.out b/src/oop/shapes_dict.out index ac8e669d..6da8d313 100644 --- a/src/oop/shapes_dict.out +++ b/src/oop/shapes_dict.out @@ -1,2 +1,2 @@ -sq 12.00 9.00 -ci 12.57 12.57 +sq 8.00 4.00 +ci 18.85 28.27 diff --git a/src/oop/shapes_dict.py b/src/oop/shapes_dict.py index 4061643d..bd0798bb 100644 --- a/src/oop/shapes_dict.py +++ b/src/oop/shapes_dict.py @@ -34,7 +34,7 @@ def circle_new(name, radius): def call(thing, method_name): return thing[method_name](thing) -examples = [square_new("sq", 3), circle_new("ci", 2)] +examples = [square_new("sq", 2), circle_new("ci", 3)] for ex in examples: n = ex["name"] p = call(ex, "perimeter") diff --git a/src/oop/shapes_original.out b/src/oop/shapes_original.out index 4fe14beb..770ad094 100644 --- a/src/oop/shapes_original.out +++ b/src/oop/shapes_original.out @@ -1,2 +1,2 @@ -sq has perimeter 12.00 and area 9.00 -ci has perimeter 12.57 and area 12.57 +sq has perimeter 8.00 and area 4.00 +ci has perimeter 18.85 and area 28.27 diff --git a/src/oop/shapes_original.py b/src/oop/shapes_original.py index b3d0663d..2165d1f2 100644 --- a/src/oop/shapes_original.py +++ b/src/oop/shapes_original.py @@ -37,7 +37,7 @@ def area(self): # [/concrete] # [poly] -examples = [Square("sq", 3), Circle("ci", 2)] +examples = [Square("sq", 2), Circle("ci", 3)] for thing in examples: n = thing.name p = thing.perimeter()