暂存文件的引用修复
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import os
|
||||
from app.services.tjnetwork import *
|
||||
from app.native.api.project import copy_project
|
||||
from run_simulation import run_simulation_ex, from_clock_to_seconds_2
|
||||
from app.algorithms.api_ex.run_simulation import run_simulation_ex, from_clock_to_seconds_2
|
||||
from math import sqrt, pi
|
||||
from epanet.epanet import Output
|
||||
from app.services.epanet.epanet import Output
|
||||
import json
|
||||
from datetime import datetime
|
||||
import time
|
||||
@@ -17,11 +17,11 @@ import app.services.simulation as simulation
|
||||
import geopandas as gpd
|
||||
from sqlalchemy import create_engine
|
||||
import ast
|
||||
import sensitivity
|
||||
import app.services.project_info as project_info
|
||||
import app.algorithms.api_ex.kmeans_sensor
|
||||
import app.algorithms.api_ex.Fdataclean
|
||||
import app.algorithms.api_ex.Pdataclean
|
||||
import app.algorithms.api_ex.kmeans_sensor as kmeans_sensor
|
||||
import app.algorithms.api_ex.Fdataclean as Fdataclean
|
||||
import app.algorithms.api_ex.Pdataclean as Pdataclean
|
||||
import app.algorithms.api_ex.sensitivity as sensitivity
|
||||
from app.native.api.postgresql_info import get_pgconn_string
|
||||
|
||||
|
||||
@@ -1425,7 +1425,7 @@ def pressure_sensor_placement_kmeans(
|
||||
# dump_inp
|
||||
inp_name = f"./db_inp/{name}.db.inp"
|
||||
dump_inp(name, inp_name, "2")
|
||||
sensor_location = api_ex.kmeans_sensor.kmeans_sensor_placement(
|
||||
sensor_location = kmeans_sensor.kmeans_sensor_placement(
|
||||
name=name, sensor_num=sensor_number, min_diameter=min_diameter
|
||||
)
|
||||
try:
|
||||
@@ -1475,7 +1475,7 @@ def flow_data_clean(input_csv_file: str) -> str:
|
||||
if not os.path.exists(input_csv_path):
|
||||
raise FileNotFoundError(f"指定的文件不存在: {input_csv_path}")
|
||||
# 调用 Fdataclean.clean_flow_data_kf 函数进行数据清洗
|
||||
out_xlsx_path = api_ex.Fdataclean.clean_flow_data_kf(input_csv_path)
|
||||
out_xlsx_path = Fdataclean.clean_flow_data_kf(input_csv_path)
|
||||
print("清洗后的数据已保存到:", out_xlsx_path)
|
||||
|
||||
|
||||
@@ -1502,7 +1502,7 @@ def pressure_data_clean(input_csv_file: str) -> str:
|
||||
if not os.path.exists(input_csv_path):
|
||||
raise FileNotFoundError(f"指定的文件不存在: {input_csv_path}")
|
||||
# 调用 Fdataclean.clean_flow_data_kf 函数进行数据清洗
|
||||
out_xlsx_path = api_ex.Pdataclean.clean_pressure_data_km(input_csv_path)
|
||||
out_xlsx_path = Pdataclean.clean_pressure_data_km(input_csv_path)
|
||||
print("清洗后的数据已保存到:", out_xlsx_path)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user