home

.obsidian/workspace.json

@@ -8,17 +8,43 @@
         "type": "tabs",
         "children": [
           {
+<<<<<<< HEAD
             "id": "0e85ed30946e35f2",
+=======
+            "id": "8d194e7636138ac6",
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
+<<<<<<< HEAD
                 "file": "todo/Задачи по направлениям.md",
+=======
+                "file": "English/Homework.md",
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
+<<<<<<< HEAD
               "title": "Задачи по направлениям"
+=======
+              "title": "Homework"
+            }
+          },
+          {
+            "id": "25499edfa3df7ece",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "todo/Счета.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Счета"
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
             }
           }
         ]
@@ -136,6 +162,7 @@
       "markdown-importer:Импорт Markdown-файлов": false
     }
   },
+<<<<<<< HEAD
   "active": "0e85ed30946e35f2",
   "lastOpenFiles": [
     "todo/Разное.md",
@@ -148,6 +175,25 @@
     "todo/Тренировки и занятия.md",
     "Python/function.md",
     "2024-10-22.md",
+=======
+  "active": "8d194e7636138ac6",
+  "lastOpenFiles": [
+    "English/Text 1.md",
+    "English/Homework.md",
+    "todo/Задачи по направлениям.md",
+    "todo/Тренировки и занятия.md",
+    "todo/Счета.md",
+    "Women in Japan.md",
+    "ROTEK/universal IO/universal IO.md",
+    "Python/Docstring. Аннотации..md",
+    "Python/function основное.md",
+    "2024-10-22.md",
+    "2024-10-20.md",
+    "ROTEK/universal IO/tasks.md",
+    "todo/Разное.md",
+    "ROTEK/universal IO/Test HV.md",
+    "Python/venv.md",
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
     "Python/common.md",
     "Python/Архитектура.md",
     "English/img/1537e342-777b-4425-b76d-586f4f212f54.JPEG",
@@ -164,8 +210,11 @@
     "common.md",
     "linux/linux common.md",
     "linux/make.md",
+<<<<<<< HEAD
     "linux/Raspberry PI.md",
     "linux/Raspberry Pi 3 Model B v1.2.md",
+=======
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
     "English/img/1537e342-777b-4425-b76d-586f4f212f54.JPEG.~tmp",
     "English/img",
     "English/Новая папка",

English/Homework.md

@@ -20,12 +20,25 @@
 7. Kate used to watch TV every day. Kate didn't watch TV every day.
 8. Peter used to have breakfast at school. Peter didn't have breakfast at school.
 
-165 Раскрой скобки.
+~={green}165 Раскрой скобки.=~
 1. The children were swimming in the lake when I saw them.
 2. I was working in the garden when he came to see me.
 3. They were walking in the park when it began to rain.
 4. I was making a snowman while they were skating.
 5. She was speaking with the teacher when I came up to her.
+<<<<<<< HEAD:English/Homework.md
 6. We were cleaning the rooms while mum was cooking.
 7. Nick was playing the guitar while Kate was writing a letter.
-8. My brother was watching TV when Sam knocked.
+8. My brother was watching TV when Sam knocked.
+=======
+6. We were cleaning the rooms while mum cooked.
+7. Nick was playing the guitar while Kate wrote a letter.
+8. My brother was watching TV when Sam knocked.
+
+~={green}231 Presetn Perfect, Present Continuous, Present Simple, Past Simple.=~
+1. What are you doing here at such a late hour? Are you writing your composition? - No, I have written already. I am working at my report. And when did you write your composition? I finished it two days ago.
+2. I say, Tom, let's have dinner. - No, thank you, I have already had dinner.
+3. What is the wather like? Is it stiil rainnig? No it has stopped raining.
+4. Please give me a pencil, I lost mine.
+5. 
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36:English/Homework.md

Python/Docstring. Аннотации..md

@@ -0,0 +1,102 @@
+Docstring - строка документирования.
+
+Вызывается:
+```python
+help(abs)
+abs.__doc__
+```
+В языках со строгой типизация (Python) с объектами определенных типов можно производить только ограниченный набор действий.
+
+~={magenta}В Python динамическая строгая типизация.=~
+
+<h5>Аннотация типов в Python</h5>
+```python
+numbers: list = []  # переменная numbers хранит список
+languages: dict = {}  # переменная languages хранит словарь
+temperature: tuple = (1, 2, 3)  # переменная temperature хранит кортеж
+letters: set = set('hello')  # переменная letters хранит множество
+```
+Для указания нескольких типов данных можно использовать ~={magenta}Union=~
+```python
+from typing import Union
+
+def add_numbers(a: Union[int, float], b: Union[int, float]) -> Union[int, float]:
+	return a + b
+
+param: int | float | str
+```
+
+Можно использовать ~={magenta}Optional=~. В данном случае указывается, что список может быть None.
+
+```python
+from typing import Optional
+
+num: Optional[int] = None
+```
+
+```python
+def append_to_list(value, my_list: Optional[list] = None):
+    if my_list is None:
+        my_list = []
+    my_list.append(value)
+    return my_list
+```
+
+Объект ~={magenta}Any=~ указывает на любой тип данных.
+
+```python
+from typing import Optional, Any, List
+
+def append_to_list(value: Any, my_list: Optional[list] = None) -> List[Any]:
+    if my_list is None:
+        my_list = []
+    my_list.append(value)
+    return my_list
+```
+
+<h5>Аннотация элементов кортежа</h5>
+```python
+from typing import Tuple
+
+# Кортеж может содержать элементы разных типов
+words: Tuple[str, int] = ("hello", 300)
+
+# Кортеж может содержать неизвестное количество элементов типа str
+words: Tuple[str, ...] = ("hello", "world", '!')
+```
+<h5>Аннотация словарей</h5>
+Здесь функция `foo` принимает один аргумент `bar`, он должен являться словарем, у которого ключи могут быть либо строкой либо целым числом, а значения могут быть либо пустыми (тип `None`) , либо строкой
+
+```python
+from typing import Dict, Optional, Union
+
+def foo(bar: Dict[Union[str, int], Optional[str]]) -> bool:
+   return True
+```
+
+~={green}Аннотации в Python с версии 3.9=~
+```python
+
+# Замена typing
+word: list[str] = ['hello', 'world']
+numbers: list[float] = [1.1, 3.0, 4.5]
+letters: set[str] = set('hello')
+digits: frozenset[int] = frozenset([1, 2, 2, 1])
+
+# Замена Union
+param: int | float | bool
+
+# Замена Optional
+param: int | None = None
+word: str | None = None
+
+# Аннотация словарей
+person: dict[str, str] = { "first_name": "John", "last_name": "Doe"}
+
+# Аннотация кортежей
+words: tuple[str, int] = ("hello", 300)
+
+#
+def foo(bar: dict[str | int, str | None]) -> bool:
+   return True
+```

Women in Japan.md

@@ -0,0 +1,35 @@
+J: Akito, our readers ask a lot of questions about the social role of women in Japan. Has anything changed for women in recent years?
+
+Akito: It would be wrong to say that things have changed a lot recently because women in my country have basically followed the same customs and traditions for generations. One of these traditions is, of course, to marry. The typical age for marriage these days being around 27.
+
+J: So how can they be sure of finding the right partner at that age?
+
+Akito: Well, it is quite common for Japanese parents, for example, to pay detectives to check out possible partners in order to find out about that family background generally.
+
+J: So, once you marry, Japanese women then settle happily into that lifetime role?
+
+Akito: Well, yes, but training courses before marriage are still popular. They tend to learn traditional arts such as the tea ceremony and flower arranging. For many Japanese women, to be the ideal houswife is a full-time job and some mothers even train their daughters at home.
+
+J: So what does a typical Japanese housewife do, that is so different from other housewives?
+
+Akito: Well, for example, some wives may be expected to reserve a seat on a train at one station ready for their husbands getting on at the next. All houswives and mothers will almost certainly be involved in the daily routine of washing the clothes and making a traditional lunch, which they then take to their children at school.
+
+J: So what do women get in return for taking care of everyone?
+
+Akito: Well, basically, they are expected to give up any real hope of a career as the general focus is almost certainly on the organisation of the family and home. One thing they don't usually have to organaise, however, is babysitters as married couples in Japan do not tend to go out together.
+
+J: And what about the rights of women?
+
+Akito: Well, there was one particular woman who did actually manage to get a high position in politics, but because she was unmarried she was unable to continue her work supporting the rights of women.
+
+recent years - последние годы
+customs - обычаи
+generally - в целом
+is quite common - довольно распространенно
+tend - иметь тенденция, как правило
+even - даже
+almost certainly be involved - почти наверняка будет вовлечен
+give up any real hope - отказаться от всякой реальной надежды
+almost certainly - почти наверняка
+however - однако
+particular - особый

todo/Задачи по направлениям.md

@@ -1,14 +1,27 @@
 <h6>Работа и образование</h6>
 - [ ] Пройти на 100% курс по Python OOP.
 - [x] Закрыть раздел "3. Параметры и аргументы" в курсе Python Function на 100%.
+<<<<<<< HEAD
 - [x] Сделать ДЗ по английскому на 15 ноября.
 - [ ] Закрыть раздел 4. Докстрока и аннотации до 18 ноября.
+=======
+- [ ] Сделать ДЗ по английскому на 22 ноября.
+- [x] Закрыть раздел 4. Докстрока и аннотации до 18 ноября.
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
 <h6>Финансы:</h6>
 - [ ] Разобраться со вкладом в ПСБ
+- [ ] Разобраться с налогами
 <h6>Бытовые:</h6>
 - [ ] Сделать VPN на планшете
 - [ ] Починить кухонный стул
 - [ ] Отмыть детский стульчик
+<<<<<<< HEAD
+=======
+- [ ] Покрасить стену на кухне
+- [ ] Передать показания счетчиков
+- [ ] Поменять колеса
+- [ ] Разобраться со стиральной машиной
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
 - [x] Купить корм для пауков
 - [x] Заплатить за кофе.
 - [x] Записаться на стрижку в ноябре
@@ -19,7 +32,11 @@
 - [ ] ~={red}Зубы=~. Записаться к осмотр к стоматологу (Екатерина +7 926 973-07-49 сказать, что муж племянницы дондурмы. Метро Фрунзенская)
 <h6>Задачи по датам</h6>
 - [x] Суббота 16 ноября в 12:00. Стрижка
+<<<<<<< HEAD
 - [ ] Четверг 21 ноября в 12:20. Визит к ортодонту 
+=======
+- [x] Четверг 21 ноября в 12:20. Визит к ортодонту 
+>>>>>>> e774a96d68a553a2d94a59bea727ebf6f70e0a36
 - [ ] Долг 10к руб. 10 декабря, Синь.
 - [x] Оплатил сервер до 20 февраля
 

todo/Счета.md

@@ -10,10 +10,10 @@
 ##### <font color = "#1D8571">Передача показаний с 15-ого числа</font>
 - [ ] Широкая вода. хол , гор 
 - [ ] Широкая электричество: 
-- [ ] Подрезково: хол , гор , эл  (Новый счетчик горячей воды, передал по старому ) 
-- [ ] Химки: 471 - , 473 - , 450 - , 402 - , эл -  ~={red}=~
-- [ ] Планерная Нина электричество: 14330
-- [ ] Планерная Батя электричество: 5900
+- [x] Подрезково: хол , гор , эл  (Новый счетчик горячей воды, передал по старому ) 
+- [x] Химки: 471 - 28, 473 - 767, 450 - 189, 402 - 210, эл - 15368
+- [x] Планерная Нина электричество: 14522
+- [x] Планерная Батя электричество: 5941
 ##### <font color = "#1D8571">Дополнительно</font>
 - [x] Отдать Нине (отдать )
 - [x] Домашний интернет

todo/Тренировки и занятия.md

@@ -40,6 +40,18 @@ renderHabitCalendar(this.container, dv, {
 {
     date: '2024-11-12',
     content: '💪\r🏊‍♀️', 
+},
+{
+    date: '2024-11-13',
+    content: '🦵', 
+},
+{
+    date: '2024-11-15',
+    content: '💪\r', 
+},
+{
+    date: '2024-11-16',
+    content: '🦵\r😵', 
 },
   ]
 })