From f7c9a0b58b05e2fa890b0ac59eba4eed232417a1 Mon Sep 17 00:00:00 2001 From: ElEgEv <112943269+ElEgEv@users.noreply.github.com> Date: Wed, 11 Oct 2023 21:14:43 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LabWork01/LabWork3/AddData.py | 12 ++++-------- LabWork01/LoadDB.py | 5 +++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/LabWork01/LabWork3/AddData.py b/LabWork01/LabWork3/AddData.py index af31a51..3f4b010 100644 --- a/LabWork01/LabWork3/AddData.py +++ b/LabWork01/LabWork3/AddData.py @@ -3,16 +3,12 @@ import pandas # создаём усовершенствованную таблицу def addData(df: pandas.DataFrame): - # узнаём средние значения для всех столбцов - mean_store_sales = df['Store_Sales'].mean() - mean_daily_customer_count = df['Daily_Customer_Count'].mean() - mean_items_available = df['Items_Available'].mean() - mean_store_area = df['Store_Area'].mean() - - additionForTable = int(len(df) / 10) + # ищем 10% от кол-ва строк (-1 из-за строки заголовков) + additionForTable = int(len(df) / 10) - 1 # добавили 10% значений for i in range(additionForTable): - df.loc[len(df.index)] = [mean_store_area, mean_items_available, mean_daily_customer_count, mean_store_sales] + df.loc[len(df.index)] = [df['Store_ID'].max().round(2) + 1, df['Store_Area'].mean().round(2), df['Items_Available'].mean().round(2), + df['Daily_Customer_Count'].mean().round(2), df['Store_Sales'].mean().round(2)] return df \ No newline at end of file diff --git a/LabWork01/LoadDB.py b/LabWork01/LoadDB.py index cf63338..04aba15 100644 --- a/LabWork01/LoadDB.py +++ b/LabWork01/LoadDB.py @@ -5,6 +5,7 @@ from LabWork01.AnalysSales import analysSalesDataFrame from LabWork01.AnalysSalesCustomers import analysSalesCustomersDataFrame from LabWork01.DataFrameAnalys import analysItemsDataFrame from LabWork01.FuncLoad import createDataFrame +from LabWork01.LabWork3.AddData import addData app = Flask(__name__) @@ -19,6 +20,10 @@ countNull = listShops.isnull().sum() @app.route("/") def home(): + listShops = addData(createDataFrame()) + + print(listShops) + return render_template('main_page.html', context=[], tableAnalys=[], titles=[''], listTypes=listTypes, countNull=countNull, firstRow=1, secondRow=4, firstColumn=1, secondColumn=4) @app.route("/showDiapason", methods=['GET','POST'])