From 16995087ba9d080efdfbbb38b9cbc265386787ee Mon Sep 17 00:00:00 2001
From: eduard ermakov <ehermakov@gmail.com>
Date: Mon, 24 Jul 2023 23:31:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=8E=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87=D0=B8=20=D1=81=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B5=D0=B9=20word=5Fcount?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main.py                                   |  6 +++--
 HNS/Excercises/072023 Test function/main.py   | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/HNS/Excercises/04072023 Определить количество каждого слова в строке/main.py b/HNS/Excercises/04072023 Определить количество каждого слова в строке/main.py
index 05e82d9..1772db7 100644
--- a/HNS/Excercises/04072023 Определить количество каждого слова в строке/main.py	
+++ b/HNS/Excercises/04072023 Определить количество каждого слова в строке/main.py	
@@ -1,7 +1,9 @@
+import re
+import numpy as np
+
+
 def word_count(text):
     c = []
-    import re
-    import numpy as np
     final = {}
     a = re.sub("[^А-Яа-я-A-Z-a-z ]", "", text).lower()
     b = str(a).split()
diff --git a/HNS/Excercises/072023 Test function/main.py b/HNS/Excercises/072023 Test function/main.py
index a394e64..05578f0 100644
--- a/HNS/Excercises/072023 Test function/main.py	
+++ b/HNS/Excercises/072023 Test function/main.py	
@@ -1,3 +1,6 @@
+import re
+import numpy as np
+
 def verify(message, expected, actual):
     a = "========================="
     print(a)
@@ -13,8 +16,6 @@ def verify(message, expected, actual):
 
 
 
-
-
 def verify_all(dataset):
     summa_success = int()
     summa_failed = int()
@@ -46,10 +47,26 @@ def max_array(array):
 
 
 
-array = [2, 3, 5, 8, 89, 65, 75,7895, 2, 1, 1]
+def word_count(text):
+    c = []
+    final = {}
+    a = re.sub("[^А-Яа-я-A-Z-a-z ]", "", text).lower()
+    b = str(a).split()
+    c = list(b)
+    unique_array, count_array = np.unique(c, return_counts=True)
+    final = zip(unique_array, count_array)
+    final2 = list(final)
+    return final2
 
 
-dataset = [("Test1", 3, min_array(array)), ("Test2", 7895, max_array(array))]
+
+f = 'Я пришел, я ушел, я нашел'
+
+array = [2, 3, 5, 8, 89, 65, 75, 7895, 2, 1, 1]
+
+
+dataset = [("Test1", 3, min_array(array)), ("Test2", 7895, max_array(array)),
+           ("Test3", [('нашел', 1), ('пришел', 1), ('ушел', 1), ('я', 3)], word_count(f))]
 
 
 verify_all(dataset)