Compare commits
No commits in common. "aa946dd79b3f8b1be1cb03a53a4f98e2facb00ad" and "2b3e70b3b6ab2a6c032a050e515fa04a0aa7eeeb" have entirely different histories.
aa946dd79b
...
2b3e70b3b6
|
|
@ -1,216 +0,0 @@
|
||||||
# Byte-compiled / optimized / DLL files
|
|
||||||
__pycache__/
|
|
||||||
*.py[codz]
|
|
||||||
*$py.class
|
|
||||||
|
|
||||||
# C extensions
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Distribution / packaging
|
|
||||||
.Python
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
|
||||||
downloads/
|
|
||||||
eggs/
|
|
||||||
.eggs/
|
|
||||||
lib/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
var/
|
|
||||||
wheels/
|
|
||||||
share/python-wheels/
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
||||||
MANIFEST
|
|
||||||
|
|
||||||
# PyInstaller
|
|
||||||
# Usually these files are written by a python script from a template
|
|
||||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
|
||||||
*.manifest
|
|
||||||
*.spec
|
|
||||||
|
|
||||||
# Installer logs
|
|
||||||
pip-log.txt
|
|
||||||
pip-delete-this-directory.txt
|
|
||||||
|
|
||||||
# Unit test / coverage reports
|
|
||||||
htmlcov/
|
|
||||||
.tox/
|
|
||||||
.nox/
|
|
||||||
.coverage
|
|
||||||
.coverage.*
|
|
||||||
.cache
|
|
||||||
nosetests.xml
|
|
||||||
coverage.xml
|
|
||||||
*.cover
|
|
||||||
*.py.cover
|
|
||||||
.hypothesis/
|
|
||||||
.pytest_cache/
|
|
||||||
cover/
|
|
||||||
|
|
||||||
# Translations
|
|
||||||
*.mo
|
|
||||||
*.pot
|
|
||||||
|
|
||||||
# Django stuff:
|
|
||||||
*.log
|
|
||||||
local_settings.py
|
|
||||||
db.sqlite3
|
|
||||||
db.sqlite3-journal
|
|
||||||
|
|
||||||
# Flask stuff:
|
|
||||||
instance/
|
|
||||||
.webassets-cache
|
|
||||||
|
|
||||||
# Scrapy stuff:
|
|
||||||
.scrapy
|
|
||||||
|
|
||||||
# Sphinx documentation
|
|
||||||
docs/_build/
|
|
||||||
|
|
||||||
# PyBuilder
|
|
||||||
.pybuilder/
|
|
||||||
target/
|
|
||||||
|
|
||||||
# Jupyter Notebook
|
|
||||||
.ipynb_checkpoints
|
|
||||||
|
|
||||||
# IPython
|
|
||||||
profile_default/
|
|
||||||
ipython_config.py
|
|
||||||
|
|
||||||
# pyenv
|
|
||||||
# For a library or package, you might want to ignore these files since the code is
|
|
||||||
# intended to run in multiple environments; otherwise, check them in:
|
|
||||||
# .python-version
|
|
||||||
|
|
||||||
# pipenv
|
|
||||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
|
||||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
|
||||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
|
||||||
# install all needed dependencies.
|
|
||||||
# Pipfile.lock
|
|
||||||
|
|
||||||
# UV
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
|
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
|
||||||
# commonly ignored for libraries.
|
|
||||||
# uv.lock
|
|
||||||
|
|
||||||
# poetry
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
|
||||||
# commonly ignored for libraries.
|
|
||||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
|
||||||
# poetry.lock
|
|
||||||
# poetry.toml
|
|
||||||
|
|
||||||
# pdm
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
|
||||||
# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
|
|
||||||
# https://pdm-project.org/en/latest/usage/project/#working-with-version-control
|
|
||||||
# pdm.lock
|
|
||||||
# pdm.toml
|
|
||||||
.pdm-python
|
|
||||||
.pdm-build/
|
|
||||||
|
|
||||||
# pixi
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
|
|
||||||
# pixi.lock
|
|
||||||
# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
|
|
||||||
# in the .venv directory. It is recommended not to include this directory in version control.
|
|
||||||
.pixi
|
|
||||||
|
|
||||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
|
||||||
__pypackages__/
|
|
||||||
|
|
||||||
# Celery stuff
|
|
||||||
celerybeat-schedule
|
|
||||||
celerybeat.pid
|
|
||||||
|
|
||||||
# Redis
|
|
||||||
*.rdb
|
|
||||||
*.aof
|
|
||||||
*.pid
|
|
||||||
|
|
||||||
# RabbitMQ
|
|
||||||
mnesia/
|
|
||||||
rabbitmq/
|
|
||||||
rabbitmq-data/
|
|
||||||
|
|
||||||
# ActiveMQ
|
|
||||||
activemq-data/
|
|
||||||
|
|
||||||
# SageMath parsed files
|
|
||||||
*.sage.py
|
|
||||||
|
|
||||||
# Environments
|
|
||||||
.env
|
|
||||||
.envrc
|
|
||||||
.venv
|
|
||||||
env/
|
|
||||||
venv/
|
|
||||||
ENV/
|
|
||||||
env.bak/
|
|
||||||
venv.bak/
|
|
||||||
|
|
||||||
# Spyder project settings
|
|
||||||
.spyderproject
|
|
||||||
.spyproject
|
|
||||||
|
|
||||||
# Rope project settings
|
|
||||||
.ropeproject
|
|
||||||
|
|
||||||
# mkdocs documentation
|
|
||||||
/site
|
|
||||||
|
|
||||||
# mypy
|
|
||||||
.mypy_cache/
|
|
||||||
.dmypy.json
|
|
||||||
dmypy.json
|
|
||||||
|
|
||||||
# Pyre type checker
|
|
||||||
.pyre/
|
|
||||||
|
|
||||||
# pytype static type analyzer
|
|
||||||
.pytype/
|
|
||||||
|
|
||||||
# Cython debug symbols
|
|
||||||
cython_debug/
|
|
||||||
|
|
||||||
# PyCharm
|
|
||||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
|
||||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
|
||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
|
||||||
# .idea/
|
|
||||||
|
|
||||||
# Abstra
|
|
||||||
# Abstra is an AI-powered process automation framework.
|
|
||||||
# Ignore directories containing user credentials, local state, and settings.
|
|
||||||
# Learn more at https://abstra.io/docs
|
|
||||||
.abstra/
|
|
||||||
|
|
||||||
# Visual Studio Code
|
|
||||||
# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore
|
|
||||||
# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
|
|
||||||
# and can be added to the global gitignore or merged into this file. However, if you prefer,
|
|
||||||
# you could uncomment the following to ignore the entire vscode folder
|
|
||||||
# .vscode/
|
|
||||||
|
|
||||||
# Ruff stuff:
|
|
||||||
.ruff_cache/
|
|
||||||
|
|
||||||
# PyPI configuration file
|
|
||||||
.pypirc
|
|
||||||
|
|
||||||
# Marimo
|
|
||||||
marimo/_static/
|
|
||||||
marimo/_lsp/
|
|
||||||
__marimo__/
|
|
||||||
|
|
||||||
# Streamlit
|
|
||||||
.streamlit/secrets.toml
|
|
||||||
Binary file not shown.
|
|
@ -62,10 +62,6 @@ def settlement_prediction(business_code, cons_code):
|
||||||
|
|
||||||
# fill lists
|
# fill lists
|
||||||
for row in monitoring_record:
|
for row in monitoring_record:
|
||||||
# DB 값이 NULL(None)이면 건너뜀 (에러 방지)
|
|
||||||
if row[0] is None or row[1] is None or row[2] is None:
|
|
||||||
continue
|
|
||||||
|
|
||||||
settlement.append(float(row[0]))
|
settlement.append(float(row[0]))
|
||||||
surcharge.append(float(row[1]))
|
surcharge.append(float(row[1]))
|
||||||
time.append(float(row[2]))
|
time.append(float(row[2]))
|
||||||
|
|
|
||||||
|
|
@ -124,13 +124,8 @@ def run_settle_prediction(point_name, np_time, np_surcharge, np_settlement,
|
||||||
step_end_index_adjust.append((step_end_index[i]))
|
step_end_index_adjust.append((step_end_index[i]))
|
||||||
|
|
||||||
# 성토 시작 및 끝 인덱스 리스트 업데이트
|
# 성토 시작 및 끝 인덱스 리스트 업데이트
|
||||||
# 필터링 된 단계가 하나라도 있을 때만 업데이트 (없으면 기존 단계 유지)
|
step_start_index = step_start_index_adjust
|
||||||
if len(step_start_index_adjust) > 0:
|
step_end_index = step_end_index_adjust
|
||||||
step_start_index = step_start_index_adjust
|
|
||||||
step_end_index = step_end_index_adjust
|
|
||||||
else:
|
|
||||||
# 디버깅용 출력 (선택 사항)
|
|
||||||
print("[Warning] No valid steps found after adjustment. Using original steps.")
|
|
||||||
|
|
||||||
# 침하 예측을 수행할 단계 설정 (현재 끝에서 2단계 이용)
|
# 침하 예측을 수행할 단계 설정 (현재 끝에서 2단계 이용)
|
||||||
step_start_index = step_start_index[-2:]
|
step_start_index = step_start_index[-2:]
|
||||||
|
|
@ -159,11 +154,6 @@ def run_settle_prediction(point_name, np_time, np_surcharge, np_settlement,
|
||||||
if day > final_step_predict_end_date:
|
if day > final_step_predict_end_date:
|
||||||
final_step_predict_end_index = count - 1
|
final_step_predict_end_index = count - 1
|
||||||
break
|
break
|
||||||
|
|
||||||
# 인덱스를 찾지 못했을 경우(예: 마지막 데이터까지 모두 사용하는 경우)
|
|
||||||
# -1로 남아있으면 배열 길이 차이로 에러가 발생하므로, 전체 데이터 길이로 설정
|
|
||||||
if final_step_predict_end_index == -1:
|
|
||||||
final_step_predict_end_index = final_index
|
|
||||||
|
|
||||||
# 마지막 성토 단계, 마지막 계측 시점 인덱스 업데이트
|
# 마지막 성토 단계, 마지막 계측 시점 인덱스 업데이트
|
||||||
final_step_monitor_end_index = step_end_index[num_steps - 1]
|
final_step_monitor_end_index = step_end_index[num_steps - 1]
|
||||||
|
|
@ -282,12 +272,7 @@ def run_settle_prediction(point_name, np_time, np_surcharge, np_settlement,
|
||||||
x_hyper_nonlinear = res_lsq_hyper_nonlinear.x
|
x_hyper_nonlinear = res_lsq_hyper_nonlinear.x
|
||||||
|
|
||||||
# 가중 비선형 쌍곡선 가중치 산정
|
# 가중 비선형 쌍곡선 가중치 산정
|
||||||
# 시간 합계가 0인 경우(데이터 부족 등) 0으로 나누는 에러 방지
|
weight = tm_hyper / np.sum(tm_hyper)
|
||||||
sum_tm = np.sum(tm_hyper)
|
|
||||||
if sum_tm == 0:
|
|
||||||
weight = np.ones_like(tm_hyper) # 가중치를 모두 1로 설정
|
|
||||||
else:
|
|
||||||
weight = tm_hyper / sum_tm
|
|
||||||
|
|
||||||
# 회귀분석 시행 (가중 비선형 쌍곡선)
|
# 회귀분석 시행 (가중 비선형 쌍곡선)
|
||||||
x0 = np.ones(2)
|
x0 = np.ones(2)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue