работа над ошибками, исправлено оформление
This commit is contained in:
parent
31cf7e2c81
commit
45d8c51946
Binary file not shown.
|
|
@ -2,24 +2,23 @@ from math import sqrt
|
||||||
from multipledispatch import dispatch
|
from multipledispatch import dispatch
|
||||||
|
|
||||||
class PointXY():
|
class PointXY():
|
||||||
def distance_from_zero(point):
|
def distance_from_zero(point):
|
||||||
return sqrt( point.x ** 2 + point.y ** 2 )
|
return sqrt( point.x ** 2 + point.y ** 2 )
|
||||||
|
|
||||||
def distance_to(self, point):
|
def distance_to(self, point):
|
||||||
return sqrt( (point.x - self.x) ** 2 + (point.y - self.y) ** 2)
|
return sqrt( (point.x - self.x) ** 2 + (point.y - self.y) ** 2)
|
||||||
|
|
||||||
def if_inside(self, r):
|
def if_inside(self, r):
|
||||||
if (r.a.x <= self.x <= r.b.x) and (r.a.y <= self.y <= r.b.y):
|
if (r.a.x <= self.x <= r.b.x) and (r.a.y <= self.y <= r.b.y):
|
||||||
return 'точка внутри прямоуголника'
|
return 'точка внутри прямоуголника'
|
||||||
else:
|
return 'точка вне прямоугольника'
|
||||||
return 'точка вне прямоугольника'
|
|
||||||
|
|
||||||
def __init__(self, x:int, y:int):
|
def __init__(self, x:int, y:int):
|
||||||
self.x = x
|
self.x = x
|
||||||
self.y = y
|
self.y = y
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return 'x = ' + str(self.x) + ' y = ' + str(self.y)
|
return 'x = ' + str(self.x) + ' y = ' + str(self.y)
|
||||||
|
|
||||||
class Rect():
|
class Rect():
|
||||||
def area(self):
|
def area(self):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue