diff --git a/README.md b/README.md index 11cb40e..199696b 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ $ marp 01.md && open 01.html |10| Иваело Кръстев | [Ivaelo](https://github.com/Ivaelo) | | | |11| Ивайло Димов | [IvailoDimov](https://github.com/IvailoDimov) | | | |12| Ивайло Генчев | [Squidfishrl](https://github.com/Squidfishrl) | | | -|13| Иван Станчев | [IvanStanchev](https://github.com/IvanStanchev) | | | +|13| Иван Станчев | [IvanStanchev](https://github.com/IvanStanchev) | 🍬🍬 | | |14| Йордан Христов | [dachkata555](https://github.com/dachkata555) | | | |15| Калин Георгиев | [kgeorgiev77](https://github.com/kgeorgiev77) | 🍬 | | |16| Кристиан Косев | [Grozdi](https://github.com/Grozdi) | | | diff --git a/homeworks/05_Vladimir_Aleksiev/01_check_circles.py b/homeworks/05_Vladimir_Aleksiev/01_check_circles.py deleted file mode 100644 index 91ca0fa..0000000 --- a/homeworks/05_Vladimir_Aleksiev/01_check_circles.py +++ /dev/null @@ -1 +0,0 @@ -hehe diff --git a/homeworks/14_Ivan_Stanchev/01_check_circles.py b/homeworks/14_Ivan_Stanchev/01_check_circles.py new file mode 100644 index 0000000..66b76d8 --- /dev/null +++ b/homeworks/14_Ivan_Stanchev/01_check_circles.py @@ -0,0 +1,37 @@ +from math import sqrt + +def check_circles(c1_center, c1_radius, c2_center, c2_radius): + x1, y1 = c1_center + x2, y2 = c2_center + distance = sqrt((x1-x2)**2 + (y1-y2)**2) + sum_of_radii = c1_radius + c2_radius + +#MATCHING + if(c1_center == c2_center and c1_radius == c2_radius): + return "MATCHING" + +# TOUCHING + if d == sum_of_radii: + return "TOUCHING" + elif d < sum_of_radii: + +# CONTAINING + if d + c2_radius <= c1_radius: + return "First circle contains second one" + + elif d + c1_radius <= c2_radius: + return "Second circle contains first one" + +# INTERSECTING + else: + return "INTERSECTING" +# NO_COMMON + elif d > sum_of_radii: + return "NO_COMMON" + + elif d < sum_of_radii: + if d + c2_radius <= c1_radius: + return "Circle one contains circle two" + elif d + c1_radius <= c2_radius: + return "Circle two contains circle one" +