final

vprud · Oct 24, 2021 · 46ba586 · 46ba586
1 parent 5e18d5e
commit 46ba586
Show file tree

Hide file tree

Showing 35 changed files with 94,373 additions and 4,682 deletions.
diff --git a/README.md b/README.md
@@ -3,9 +3,11 @@
 В этом репозитории хранится исходный код по построению предиктивной модели концентрации загрязняющих веществ (CO, NO2, NO, PM2.5, PM10) по городу Москва за 2020 календарный год рамках [задачи](https://leaders2021.innoagency.ru/04/) хакатона ЛЦТ. А также исходный код по моделированию распространения загрязняющих веществ на территории города Москва.
 
 <p align="center">
-<img align="middle" src="./report/gifs/pollution_simulation_simple.gif" alt="Simulation Demo" width="400" height="600" />
+<img align="middle" src="./report/gifs/pollution_simulation_neuro.gif" alt="Simulation Demo" width="800" height="600" />
 </p>
 
+Отслеживание растпространения загрязняющих вещества по территории города.
+
 ## Базовое использование предиктора
 
 Скачайте и настроение виртуальное окружение: 
@@ -41,4 +43,6 @@ python air_tracer -f n -a "Марьино" "NO" "21-09-2021 15:00"
 ```terminal
 python air_tracer -h
 ```
-Решение собиралось и тестировалось на macOS 10.15.7 (19H1419) 1,6 GHz 2‑ядерный процессор Intel Core i5.
+Решение собиралось и тестировалось на macOS 10.15.7 (19H1419) 1,6 GHz 2‑ядерный процессор Intel Core i5.
+
+
diff --git a/models/estimator/ae_model.onnx b/models/estimator/ae_model.onnx
diff --git a/notes/00_work_geodata.ipynb b/notes/00_work_geodata.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 46,
+   "execution_count": 1,
    "id": "e441337a-b4c8-41ae-88c5-0c406fc1d45b",
    "metadata": {},
    "outputs": [],
@@ -12,24 +12,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 47,
+   "execution_count": 2,
    "id": "6fb3732a-b063-4772-9717-e86d47ae1f2b",
    "metadata": {},
    "outputs": [],
    "source": [
-    "with open('./tmp/targets_dec.npy', 'rb') as f:\n",
+    "with open('./tmp/targets_extra_dec.npy', 'rb') as f:\n",
     "    geodata = np.load(f)\n",
     "    \n",
-    "with open('./tmp/x_coords.npy', 'rb') as f:\n",
+    "with open('./tmp/x_extra_coords.npy', 'rb') as f:\n",
     "    x_coords = np.load(f)\n",
     "    \n",
-    "with open('./tmp/y_coords.npy', 'rb') as f:\n",
+    "with open('./tmp/y_extra_coords.npy', 'rb') as f:\n",
     "    y_coords = np.load(f)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 48,
+   "execution_count": 3,
    "id": "ed58e963-afa9-4288-8657-64fbee73f90a",
    "metadata": {},
    "outputs": [],
@@ -47,8 +47,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 49,
-   "id": "3d2d6b9e-eb3d-4f27-9c6f-15ac841e49a6",
+   "execution_count": 4,
+   "id": "bc592d45-b4a4-4324-a9f5-5a9fc00a5131",
    "metadata": {},
    "outputs": [
     {
@@ -57,7 +57,7 @@
        "0.24554825411133407"
       ]
      },
-     "execution_count": 49,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -69,15 +69,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9d66551a-fd93-4486-b702-091abc5ad3bb",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d81d7d52-903c-4867-9b86-2190ad24e8ac",
+   "id": "b3acb655-7e1d-4165-ad49-235323ebfdb5",
    "metadata": {},
    "outputs": [],
    "source": []

diff --git a/notes/01_read_data.ipynb b/notes/01_read_data.ipynb
diff --git a/notes/03_prep_data_AEnetwork.ipynb b/notes/03_prep_data_AEnetwork.ipynb
diff --git a/notes/04_AEnetwork.ipynb b/notes/04_AEnetwork.ipynb
diff --git a/notes/data.json b/notes/data.json
diff --git a/notes/out.png b/notes/out.png
diff --git a/notes/targets_dec.npy b/notes/targets_dec.npy
diff --git a/notes/temp.png b/notes/temp.png
diff --git a/notes/tmp/2020_preds/2020_Академика Анохина.csv b/notes/tmp/2020_preds/2020_Академика Анохина.csv
diff --git a/notes/tmp/2020_preds/2020_Бутлерова.csv b/notes/tmp/2020_preds/2020_Бутлерова.csv
diff --git a/notes/tmp/2020_preds/2020_Глебовская.csv b/notes/tmp/2020_preds/2020_Глебовская.csv
diff --git a/notes/tmp/2020_preds/2020_Коптевский бул.csv b/notes/tmp/2020_preds/2020_Коптевский бул.csv
diff --git a/notes/tmp/2020_preds/2020_Марьино.csv b/notes/tmp/2020_preds/2020_Марьино.csv
diff --git a/notes/tmp/2020_preds/2020_Останкино.csv b/notes/tmp/2020_preds/2020_Останкино.csv
diff --git a/notes/tmp/2020_preds/2020_Пролетарский проспект.csv b/notes/tmp/2020_preds/2020_Пролетарский проспект.csv
diff --git a/notes/tmp/2020_preds/2020_Спиридоновка.csv b/notes/tmp/2020_preds/2020_Спиридоновка.csv
diff --git a/notes/tmp/2020_preds/2020_Туристская.csv b/notes/tmp/2020_preds/2020_Туристская.csv
diff --git a/notes/tmp/2020_preds/2020_Шаболовка.csv b/notes/tmp/2020_preds/2020_Шаболовка.csv
diff --git a/notes/CO_31dec23h.png → notes/tmp/CO_31dec23h.png b/notes/CO_31dec23h.png → notes/tmp/CO_31dec23h.png
diff --git a/notes/tmp/inputs_sep.npy b/notes/tmp/inputs_sep.npy
diff --git a/notes/tmp/prediction_sep.npy b/notes/tmp/prediction_sep.npy
diff --git a/notes/tmp/predictor_sep.png b/notes/tmp/predictor_sep.png
diff --git a/notes/tmp/targets_extra_dec.npy b/notes/tmp/targets_extra_dec.npy
diff --git a/notes/tmp/targets_extra_positive_dec.npy b/notes/tmp/targets_extra_positive_dec.npy
diff --git a/notes/tmp/targets_sep.npy b/notes/tmp/targets_sep.npy
diff --git a/notes/tmp/x_coords.npy b/notes/tmp/x_coords.npy
diff --git a/notes/tmp/x_extra_coords.npy b/notes/tmp/x_extra_coords.npy
diff --git a/notes/tmp/y_coords.npy b/notes/tmp/y_coords.npy
diff --git a/notes/tmp/y_extra_coords.npy b/notes/tmp/y_extra_coords.npy
diff --git a/notes/your_file.jpeg b/notes/your_file.jpeg
diff --git a/notes/your_file.png b/notes/your_file.png
diff --git a/report/gifs/CO_copernicus_preds.gif b/report/gifs/CO_copernicus_preds.gif
diff --git a/report/gifs/pollution_simulation_neuro.gif b/report/gifs/pollution_simulation_neuro.gif