Merge pull request #32 from SENATOROVAI/Prorected_main

Prorected main
kypena · Nov 14, 2024 · 80d0efd · 80d0efd
2 parents ff087f2 + 12776e1
commit 80d0efd
Show file tree

Hide file tree

Showing 9 changed files with 1,996 additions and 4 deletions.
diff --git a/DIRECTORY.md b/DIRECTORY.md
@@ -2,6 +2,8 @@
 ## [Help](/help.py)
 
 ## Python
+  * [Clean Code Conspect](python/clean_code_conspect.ipynb)
+  * [Clean Code Conspect](python/clean_code_conspect.py)
   * Made-Easy
     * [Chapter 13 Modules And Packages Python Made Easy](python/made-easy/chapter_13_modules_and_packages_python_made_easy.ipynb)
     * [Chapter 13 Modules And Packages Python Made Easy](python/made-easy/chapter_13_modules_and_packages_python_made_easy.py)
@@ -18,6 +20,7 @@
     * [Chapter 6 Functions](python/made-easy/chapter_6_functions.ipynb)
     * [Chapter 6 Functions](python/made-easy/chapter_6_functions.py)
     * [Chapter 8 Data Structure And Sequence](python/made-easy/chapter_8_data_structure_and_sequence.ipynb)
+    * [Chapter 8 Data Structure And Sequence](python/made-easy/chapter_8_data_structure_and_sequence.py)
   * Probability
     * [Monte Carlo](python/probability/monte_carlo.ipynb)
     * [Monte Carlo](python/probability/monte_carlo.py)

diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 ## [Help](/help.py)
 
 ## Python
+  * [Clean Code Conspect](python/clean_code_conspect.ipynb)
+  * [Clean Code Conspect](python/clean_code_conspect.py)
   * Made-Easy
     * [Chapter 13 Modules And Packages Python Made Easy](python/made-easy/chapter_13_modules_and_packages_python_made_easy.ipynb)
     * [Chapter 13 Modules And Packages Python Made Easy](python/made-easy/chapter_13_modules_and_packages_python_made_easy.py)
@@ -18,6 +20,7 @@
     * [Chapter 6 Functions](python/made-easy/chapter_6_functions.ipynb)
     * [Chapter 6 Functions](python/made-easy/chapter_6_functions.py)
     * [Chapter 8 Data Structure And Sequence](python/made-easy/chapter_8_data_structure_and_sequence.ipynb)
+    * [Chapter 8 Data Structure And Sequence](python/made-easy/chapter_8_data_structure_and_sequence.py)
   * Probability
     * [Monte Carlo](python/probability/monte_carlo.ipynb)
     * [Monte Carlo](python/probability/monte_carlo.py)

diff --git a/env.yml b/env.yml
@@ -0,0 +1,39 @@
+name: senatorov
+channels:
+  - defaults
+dependencies:
+  - _libgcc_mutex=0.1=main
+  - _openmp_mutex=5.1=1_gnu
+  - blas=1.0=mkl
+  - bzip2=1.0.8=h5eee18b_6
+  - ca-certificates=2024.9.24=h06a4308_0
+  - expat=2.6.3=h6a678d5_0
+  - intel-openmp=2023.1.0=hdb19cb5_46306
+  - ld_impl_linux-64=2.40=h12ee557_0
+  - libffi=3.4.4=h6a678d5_1
+  - libgcc-ng=11.2.0=h1234567_1
+  - libgomp=11.2.0=h1234567_1
+  - libmpdec=4.0.0=h5eee18b_0
+  - libstdcxx-ng=11.2.0=h1234567_1
+  - libuuid=1.41.5=h5eee18b_0
+  - mkl=2023.1.0=h213fc3f_46344
+  - mkl-service=2.4.0=py313h5eee18b_1
+  - mkl_fft=1.3.11=py313h5eee18b_0
+  - mkl_random=1.2.8=py313h06d7b56_0
+  - ncurses=6.4=h6a678d5_0
+  - numpy=2.1.3=py313hf4aebb8_0
+  - numpy-base=2.1.3=py313h3fc9231_0
+  - openssl=3.0.15=h5eee18b_0
+  - pip=24.2=py313h06a4308_0
+  - python=3.13.0=hf623796_100_cp313
+  - python_abi=3.13=0_cp313
+  - readline=8.2=h5eee18b_0
+  - setuptools=72.1.0=py313h06a4308_0
+  - sqlite=3.45.3=h5eee18b_0
+  - tbb=2021.8.0=hdb19cb5_0
+  - tk=8.6.14=h39e8969_0
+  - tzdata=2024b=h04d1e81_0
+  - wheel=0.44.0=py313h06a4308_0
+  - xz=5.4.6=h5eee18b_1
+  - zlib=1.2.13=h5eee18b_1
+prefix: /home/tatiana/anaconda3/envs/senatorov
diff --git a/log.txt b/log.txt
@@ -42,3 +42,13 @@ Discussion-> Accomplishments
 
 28.06.24
 Матожидание ДСВ - среднее значение при многократном повторении испытаний.Дисперсия дискретной случайной величины.показывает насколько далеко «разбросаны» данные относительно среднего значения. Дисперсия – это математическое ожидание квадратов отклонений случайной величины от её математического ожидания.
+
+
+14.11.2024
+conda create -n senatorov python=3.9 -  создание окружение
+conda activate senatorov - активация
+conda deactivate - деактивация
+conda install pandas numpy - устанвка пакета
+conda remove -n senatorov --all - удаление виртуального окружение
+Выгрузка зависимости (dependencies)
+conda env export > env.yml / pip - requirements.txt - выгрузка (yml - conda, pip - lkz)
diff --git a/python/clean_code_conspect.ipynb b/python/clean_code_conspect.ipynb
diff --git a/python/clean_code_conspect.py b/python/clean_code_conspect.py
diff --git a/python/made-easy/chapter_3_python_basics.py b/python/made-easy/chapter_3_python_basics.py
@@ -140,8 +140,10 @@
 letter_a: int = 5
 letter_b: int = 6
 product_ab: int = 5 * 6
-print(f"when {letter_a} is multiplied by {letter_b}, 
-the result is {product_ab}")
+print(
+    f"""when {letter_a} is multiplied by {letter_b}, 
+the result is {product_ab}"""
+)
 
 print("      /|")
 print("     / |")

diff --git a/python/made-easy/chapter_5_control_flow_statements.py b/python/made-easy/chapter_5_control_flow_statements.py
@@ -52,8 +52,10 @@
 # +
 name: str = "Petin Kate"
 basic_salary: int = int(input(f"Salary of {name}: "))
-city_class: str = input(f"{name} lives in a 
-city class (a/b/c): ")
+city_class: str = input(
+    f"""{name} lives in a 
+city class (a/b/c): """
+)
 
 if city_class in ("a", "A"):
     hra = (basic_salary * 30) / 100
@@ -349,6 +351,7 @@
 
 # Проверка на прямоугольный треугольник
 
+
 # +
 def triangle(ang_a: float, ang_b: float, ang_c: float) -> str:
     """Проверяет, является ли треугольник прямоугольным."""

diff --git a/python/made-easy/chapter_8_data_structure_and_sequence.py b/python/made-easy/chapter_8_data_structure_and_sequence.py