From b2b75d4334dbe552d59253487a25790969808ea8 Mon Sep 17 00:00:00 2001
From: Slava Rogozhkin <rse.slife@yandex.ru>
Date: Wed, 20 Nov 2024 23:21:39 +0300
Subject: [PATCH] 17.11

---
 __pycache__/more_class.cpython-312.pyc | Bin 5431 -> 8496 bytes
 more_class.py                          |  48 ++++++++++++++---
 shopinglist.py                         |  71 +++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 shopinglist.py

diff --git a/__pycache__/more_class.cpython-312.pyc b/__pycache__/more_class.cpython-312.pyc
index 47527372edf6233576cb57870e55f6f8eb46a1c2..a4f314be84a29a22f5ac5ce1c92c3cca027a384e 100644
GIT binary patch
delta 3643
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
Y4LNN>`LyYI7jcpLQTYoFDz@N%0S<RFGXMYp

delta 1179
zcmaiyO>7fa5Xbj<*SmJH6MMJ**fb3e#<4e~iQU8@q94%4v7@BQA*h!iY7BNrBooA2
zM->4HR7F))wQ8(aiKIn}BUN?wfD$k&pdKhED)kZ<RHc>>tttUWCpmEF0cNrg)KmBH
z+nIU)H}mGbS^e-vyZbk%^ED2>N7vd;{v~nTKgE)VB#Pky;jE<Dil29pp5jlf{+yV#
z=EQL!E6xgIQdXMf#%yP8nw_cSS*zlk_bmDre5DT-nwPCBk|C|e3`bS%xu^85IeND^
zmbR&E)bcIS*kenw8}y;Y@ItthC?}Va)u#64GgURZI&dR(HFYz4d;HdTwI}hbyV^Ze
zRfp~=!)uOVc8q_6J#<OzGd?9y^*muQcN`oq3kWeYaMj&Q4EDsGXLEvw$m~ZU{>c&O
z>>{`Ba$n+${3UDAI{*5jcfot#6)DBa-Amo&_);94y2$wlNnPTiu@&9WSEh~Wo5F4J
zmUzD_^-JsB;GN*z(4EllU8!~7aGmF(gJc7Dunl=gG02E!p}U|EbpQ;W%Ix1=y{a1=
z-DTGIc)v(|m0ZW)*GblCEyMBtutxeks0o`IMZMf#63XI|`2BEI2``7MO6+>Sd5j7~
z4z4*4Qp`63w?67<pHjf4O@JCdIaQ!7=<Wp=+_sE1U_g8c0SvtZFw1RPh<*R2NbDbx
zO;NBz;|`16H-EU!!LQW6g}*Huu^%F4BFu53==QJy=ik0&a12XL%;%;~P84d^Pbag5
z2^wVYHS8uTJKAtwd<zs1c-WwkW@c~v&WT$nM&X`hw%QmWyV;+Ob27#u)P>8Ph#))X
z3X))D(KSdEikCyZrbb4)j~$mgNE`b`z7pNZN#BGeod*O00kdbki5cf;?nI$8ot~VU
zETq#NEU&bPKFs2;%qbc2v1wxf_r7{R^CWmC4PFwLc9j2HC00p#ezsh|4K-^rlh<=J
zfEii=GkhQusgVOUqJeolqS@#k)JYQ=JyR&qS9Q&TI|D`im?8+!3E)MK_|P+s7d`3)
znojqj;vJAwF8UK>ECeoXL*RVTDB^8I9I+p<JsStm!r`D1#Lg5^4PBf!^HTSrh48bM
zrY|M5Ml_NA5QrS!Uiz=RW_$P4>Fjhq_dZR45)ZCp3w53l@__R^;6hIYnH(Y;9P(*o
NFF9k`<dEAnp92I$7P0^U

diff --git a/more_class.py b/more_class.py
index 34fe7da..74be591 100644
--- a/more_class.py
+++ b/more_class.py
@@ -9,17 +9,36 @@ class PointXY():
         return sqrt( (point.x - self.x) ** 2 + (point.y - self.y) ** 2)
 
     def if_inside(self, r):
-        if (r.a.x <= self.x <= r.b.x) and (r.a.y <= self.y <= r.b.y):
-            return 'точка внутри прямоуголника'
-        return 'точка вне прямоугольника'
+        return (r.a.x <= self.x <= r.b.x) and (r.a.y <= self.y <= r.b.y)
+
+    def __str__(self):
+        return 'x = ' + str(self.x) + ' y = ' + str(self.y)
+
+    def __eq__(self, point):
+        return self.distance_to(point) == 0
+
+    def __ne__(self, point):
+        return self.distance_to(point) != 0
+
+    def __add__(self, point):
+        return PointXY(self.x + point.x, self.y + point.y)
+
+    def __mul__(self, multiplier):
+        return PointXY(self.x * multiplier, self.y * multiplier)
+
+    def __neg__(self):
+        return PointXY(-self.x, -self.y)
+
+    def __invert__(self):
+        return PointXY(-self.x, -self.y)
+
+    def __abs__(self):
+        return sqrt(pow(self.x, 2) + pow(self.y, 2))
 
     def __init__(self, x:int, y:int):
         self.x = x
         self.y = y
 
-    def __str__(self):
-        return 'x = ' + str(self.x) + ' y = ' + str(self.y)
-
 class Rect():
     def area(self):
         return self.lenght * self.width
@@ -58,4 +77,21 @@ class Rect():
         else:
             return 'x = ' + str(self.lenght) + ' y = ' + str(self.width) + ' a(' + str(self.a.x) + ':' + str(self.a.y) + ')' + ' b(' + str(self.b.x) + ':' + str(self.b.y) + ')'
 
+class Display(Rect):
+    def __init__(self, diagonal, height: int, width: int):
+        super().__init__(height, width)
+        self.diagonal = diagonal
+        self.dpi = round((sqrt(pow(self.height, 2) + pow(self.width, 2))) / self.diagonal, 2)
+
+    def get_dpi(self):
+        return self.dpi
+
+    def get_pixel_num(self):
+        return super().area()
+
+    def area(self):
+        return round((self.height / self.get_dpi()) * (self.width / self.get_dpi()), 1)
+
+    def get_resolution_px(self):
+        return self.height, self.width
 
diff --git a/shopinglist.py b/shopinglist.py
new file mode 100644
index 0000000..642ad74
--- /dev/null
+++ b/shopinglist.py
@@ -0,0 +1,71 @@
+class ShoppingList(dict):
+    def __init__(self, data):
+        return super().__init__(data)
+
+    def multiply(self, k: float):
+        new_ingredients = self.copy()
+        for key,value in new_ingredients.items():
+            new_ingredients[key] = value * k
+        return new_ingredients
+
+    def add(self, ingredients: dict):
+        new_ingredients = self.copy()
+        for key1,value1 in self.items():
+            for key2,value2 in ingredients.items():
+                if key1 == key2:
+                    new_ingredients[key1] = value1 + value2
+                elif key2 not in new_ingredients:
+                    new_ingredients.update({key2: value2})
+        return new_ingredients
+
+    def __add__(self, other):
+        new_list = self.copy()
+        for key1,value1 in self.items():
+            for key2,value2 in other.items():
+                if key1 == key2:
+                    new_list[key1] = value1 + value2
+                    break
+                elif key2 not in new_list:
+                    new_list.update({key2: value2})
+        return new_list
+
+    def __mul__(self, other):
+        new_list = self.copy()
+        for key1,value1 in self.items():
+            for key2,value2 in other.items():
+                if key1 == key2:
+                    new_list[key1] = value1 * value2
+                    break
+                elif key2 not in new_list:
+                    new_list.update({key2: value2})
+        return new_list
+
+def multiply_ingredients(ingredients: dict, k: float) -> dict:
+    new_ingredients = ingredients.copy()
+    for key,value in new_ingredients.items():
+        new_ingredients[key] = value * k
+    return new_ingredients
+
+
+def add_ingredients(ingredients1: dict, ingredients2: dict) -> dict:
+    new_ingredients = ingredients1.copy()
+    for key1,value1 in ingredients1.items():
+        for key2,value2 in ingredients2.items():
+            if key1 == key2:
+                new_ingredients[key1] = value1 + value2
+            elif key2 not in new_ingredients:
+                new_ingredients.update({key2: value2})
+    return new_ingredients
+
+
+soup = {'onion': 1, 'potato': 2, 'water': 2.5, 'meat': 0.5}
+salad = {'potato': 2, 'meat': 0.3, 'mayonaise': 0.1, 'peas': 200}
+#soup + 2 * salad  # словари так не умеют :(
+
+new_soup = ShoppingList(soup)
+new_salad = ShoppingList(salad)
+
+print(new_soup + new_salad)
+print(new_soup * new_salad)
+print(new_soup.add(new_salad))
+print(add_ingredients(soup, salad))