Octavia/python_exercises
Watch
1
0
Fork
You've already forked python_exercises
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove extraneous code

Browse source
This commit is contained in:
lolabird 2024-02-16 22:44:39 -07:00
commit 6a61c7a491
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
thinkcspy/Chapter-17-18-Exercises/rectangle.py
View file

@ -58,27 +58,20 @@ class Rectangle:
def collission(r1, r2): def collission(r1, r2):
conditionW = False conditionW = False
conditionH = False conditionH = False
bigR = r1 r2Arr = r2.getCoords()
lilR = r2 r1Arr = r1.getCoords()
if r1.area() < r2.area():
bigR = r2
lilR = r1
lilArr = lilR.getCoords()
bigArr = bigR.getCoords()
# Compare widths and heights # Compare widths and heights
if lilR.width > bigR.width: if r2.width > r1.width:
if bigArr[0] in range(lilArr[0], lilArr[2] + 1) or bigArr[2] in range(lilArr[0], lilArr[2] + 1): if r1Arr[0] in range(r2Arr[0], r2Arr[2] + 1) or r1Arr[2] in range(r2Arr[0], r2Arr[2] + 1):
conditionW = True conditionW = True
elif lilArr[0] in range(bigArr[0], bigArr[2] + 1) or lilArr[2] in range(bigArr[0], bigArr[2] + 1): elif r2Arr[0] in range(r1Arr[0], r1Arr[2] + 1) or r2Arr[2] in range(r1Arr[0], r1Arr[2] + 1):
conditionW = True conditionW = True
if lilR.height > bigR.height: if r2.height > r1.height:
if bigArr[1] in range(lilArr[1], lilArr[3] + 1) or bigArr[3] in range(lilArr[1], lilArr[3] + 1): if r1Arr[1] in range(r2Arr[1], r2Arr[3] + 1) or r1Arr[3] in range(r2Arr[1], r2Arr[3] + 1):
conditionH = True conditionH = True
elif lilArr[1] in range(bigArr[1], bigArr[3] + 1) or lilArr[3] in range(bigArr[1], bigArr[3] + 1): elif r2Arr[1] in range(r1Arr[1], r1Arr[3] + 1) or r2Arr[3] in range(r1Arr[1], r1Arr[3] + 1):
conditionH = True conditionH = True
if conditionW and conditionH: if conditionW and conditionH:
@ -87,10 +80,7 @@ def collission(r1, r2):
return "All safe for now." return "All safe for now."
r = Rectangle(Point(10, 25), 10, 0) r = Rectangle(Point(-23, 25), 100, 50)
s = Rectangle(Point(10, 20), 10, 4) s = Rectangle(Point(10, 27), 10, 4)
# print(r)
# print(r.collission(Point(10, 25)))
# print(r.contains(Point(10, 25)))
print(collission(r, s)) print(collission(r, s))