From bf948099c2d0559e54146a46cd1ab1959fcac4c1 Mon Sep 17 00:00:00 2001 From: sanginnwoo Date: Fri, 26 Aug 2022 17:46:11 +0900 Subject: [PATCH] Minor change From SW's lab --- 1_S-12.csv => data/1_S-12.csv | 0 1_SP-11.csv => data/1_SP-11.csv | 0 1_SP-17.csv => data/1_SP-17.csv | 0 1_SP-23.csv => data/1_SP-23.csv | 0 3_SP3-65.csv => data/3_SP3-65.csv | 0 3_SP3-68.csv => data/3_SP3-68.csv | 0 main.py | 2 +- .../1_S-12.csv 20 percent (PNG).png | Bin .../1_S-12.csv 20 percent (SVG).svg | 0 .../1_S-12.csv 40 percent (PNG).png | Bin .../1_S-12.csv 40 percent (SVG).svg | 0 .../1_S-12.csv 60 percent (PNG).png | Bin .../1_S-12.csv 60 percent (SVG).svg | 0 .../1_S-12.csv 80 percent (PNG).png | Bin .../1_S-12.csv 80 percent (SVG).svg | 0 .../1_SP-11.csv 20 percent (PNG).png | Bin .../1_SP-11.csv 20 percent (SVG).svg | 0 .../1_SP-11.csv 40 percent (PNG).png | Bin .../1_SP-11.csv 40 percent (SVG).svg | 0 .../1_SP-11.csv 60 percent (PNG).png | Bin .../1_SP-11.csv 60 percent (SVG).svg | 0 .../1_SP-11.csv 80 percent (PNG).png | Bin .../1_SP-11.csv 80 percent (SVG).svg | 0 .../1_SP-17.csv 20 percent (PNG).png | Bin .../1_SP-17.csv 20 percent (SVG).svg | 0 .../1_SP-17.csv 40 percent (PNG).png | Bin .../1_SP-17.csv 40 percent (SVG).svg | 0 .../1_SP-17.csv 60 percent (PNG).png | Bin .../1_SP-17.csv 60 percent (SVG).svg | 0 .../1_SP-17.csv 80 percent (PNG).png | Bin .../1_SP-17.csv 80 percent (SVG).svg | 0 .../1_SP-23.csv 20 percent (PNG).png | Bin .../1_SP-23.csv 20 percent (SVG).svg | 0 .../1_SP-23.csv 40 percent (PNG).png | Bin .../1_SP-23.csv 40 percent (SVG).svg | 0 .../1_SP-23.csv 60 percent (PNG).png | Bin .../1_SP-23.csv 60 percent (SVG).svg | 0 .../1_SP-23.csv 80 percent (PNG).png | Bin .../1_SP-23.csv 80 percent (SVG).svg | 0 .../3_SP3-65.csv 20 percent (PNG).png | Bin .../3_SP3-65.csv 20 percent (SVG).svg | 0 .../3_SP3-65.csv 40 percent (PNG).png | Bin .../3_SP3-65.csv 40 percent (SVG).svg | 0 .../3_SP3-65.csv 60 percent (PNG).png | Bin .../3_SP3-65.csv 60 percent (SVG).svg | 0 .../3_SP3-65.csv 80 percent (PNG).png | Bin .../3_SP3-65.csv 80 percent (SVG).svg | 0 .../3_SP3-68.csv 20 percent (PNG).png | Bin .../3_SP3-68.csv 20 percent (SVG).svg | 0 .../3_SP3-68.csv 40 percent (PNG).png | Bin .../3_SP3-68.csv 40 percent (SVG).svg | 0 .../3_SP3-68.csv 60 percent (PNG).png | Bin .../3_SP3-68.csv 60 percent (SVG).svg | 0 .../3_SP3-68.csv 80 percent (PNG).png | Bin .../3_SP3-68.csv 80 percent (SVG).svg | 0 .../4_S-11.csv 20 percent (PNG).png | Bin .../4_S-11.csv 20 percent (SVG).svg | 0 .../4_S-11.csv 40 percent (PNG).png | Bin .../4_S-11.csv 40 percent (SVG).svg | 0 .../4_S-11.csv 60 percent (PNG).png | Bin .../4_S-11.csv 60 percent (SVG).svg | 0 .../4_S-11.csv 80 percent (PNG).png | Bin .../4_S-11.csv 80 percent (SVG).svg | 0 ...est_test_2_5_No_54.csv 20 percent (PNG).png | Bin ...est_test_2_5_No_54.csv 20 percent (SVG).svg | 0 ...est_test_2_5_No_54.csv 40 percent (PNG).png | Bin ...est_test_2_5_No_54.csv 40 percent (SVG).svg | 0 ...est_test_2_5_No_54.csv 60 percent (PNG).png | Bin ...est_test_2_5_No_54.csv 60 percent (SVG).svg | 0 ...est_test_2_5_No_54.csv 80 percent (PNG).png | Bin ...est_test_2_5_No_54.csv 80 percent (SVG).svg | 0 ...est_test_2_5_No_54.csv 99 percent (PNG).png | Bin ...est_test_2_5_No_54.csv 99 percent (SVG).svg | 0 settle_prediction_steps_no_touch.py | 17 +++++++++-------- 74 files changed, 10 insertions(+), 9 deletions(-) rename 1_S-12.csv => data/1_S-12.csv (100%) rename 1_SP-11.csv => data/1_SP-11.csv (100%) rename 1_SP-17.csv => data/1_SP-17.csv (100%) rename 1_SP-23.csv => data/1_SP-23.csv (100%) rename 3_SP3-65.csv => data/3_SP3-65.csv (100%) rename 3_SP3-68.csv => data/3_SP3-68.csv (100%) rename 1_S-12.csv 20 percent (PNG).png => output/1_S-12.csv 20 percent (PNG).png (100%) rename 1_S-12.csv 20 percent (SVG).svg => output/1_S-12.csv 20 percent (SVG).svg (100%) rename 1_S-12.csv 40 percent (PNG).png => output/1_S-12.csv 40 percent (PNG).png (100%) rename 1_S-12.csv 40 percent (SVG).svg => output/1_S-12.csv 40 percent (SVG).svg (100%) rename 1_S-12.csv 60 percent (PNG).png => output/1_S-12.csv 60 percent (PNG).png (100%) rename 1_S-12.csv 60 percent (SVG).svg => output/1_S-12.csv 60 percent (SVG).svg (100%) rename 1_S-12.csv 80 percent (PNG).png => output/1_S-12.csv 80 percent (PNG).png (100%) rename 1_S-12.csv 80 percent (SVG).svg => output/1_S-12.csv 80 percent (SVG).svg (100%) rename 1_SP-11.csv 20 percent (PNG).png => output/1_SP-11.csv 20 percent (PNG).png (100%) rename 1_SP-11.csv 20 percent (SVG).svg => output/1_SP-11.csv 20 percent (SVG).svg (100%) rename 1_SP-11.csv 40 percent (PNG).png => output/1_SP-11.csv 40 percent (PNG).png (100%) rename 1_SP-11.csv 40 percent (SVG).svg => output/1_SP-11.csv 40 percent (SVG).svg (100%) rename 1_SP-11.csv 60 percent (PNG).png => output/1_SP-11.csv 60 percent (PNG).png (100%) rename 1_SP-11.csv 60 percent (SVG).svg => output/1_SP-11.csv 60 percent (SVG).svg (100%) rename 1_SP-11.csv 80 percent (PNG).png => output/1_SP-11.csv 80 percent (PNG).png (100%) rename 1_SP-11.csv 80 percent (SVG).svg => output/1_SP-11.csv 80 percent (SVG).svg (100%) rename 1_SP-17.csv 20 percent (PNG).png => output/1_SP-17.csv 20 percent (PNG).png (100%) rename 1_SP-17.csv 20 percent (SVG).svg => output/1_SP-17.csv 20 percent (SVG).svg (100%) rename 1_SP-17.csv 40 percent (PNG).png => output/1_SP-17.csv 40 percent (PNG).png (100%) rename 1_SP-17.csv 40 percent (SVG).svg => output/1_SP-17.csv 40 percent (SVG).svg (100%) rename 1_SP-17.csv 60 percent (PNG).png => output/1_SP-17.csv 60 percent (PNG).png (100%) rename 1_SP-17.csv 60 percent (SVG).svg => output/1_SP-17.csv 60 percent (SVG).svg (100%) rename 1_SP-17.csv 80 percent (PNG).png => output/1_SP-17.csv 80 percent (PNG).png (100%) rename 1_SP-17.csv 80 percent (SVG).svg => output/1_SP-17.csv 80 percent (SVG).svg (100%) rename 1_SP-23.csv 20 percent (PNG).png => output/1_SP-23.csv 20 percent (PNG).png (100%) rename 1_SP-23.csv 20 percent (SVG).svg => output/1_SP-23.csv 20 percent (SVG).svg (100%) rename 1_SP-23.csv 40 percent (PNG).png => output/1_SP-23.csv 40 percent (PNG).png (100%) rename 1_SP-23.csv 40 percent (SVG).svg => output/1_SP-23.csv 40 percent (SVG).svg (100%) rename 1_SP-23.csv 60 percent (PNG).png => output/1_SP-23.csv 60 percent (PNG).png (100%) rename 1_SP-23.csv 60 percent (SVG).svg => output/1_SP-23.csv 60 percent (SVG).svg (100%) rename 1_SP-23.csv 80 percent (PNG).png => output/1_SP-23.csv 80 percent (PNG).png (100%) rename 1_SP-23.csv 80 percent (SVG).svg => output/1_SP-23.csv 80 percent (SVG).svg (100%) rename 3_SP3-65.csv 20 percent (PNG).png => output/3_SP3-65.csv 20 percent (PNG).png (100%) rename 3_SP3-65.csv 20 percent (SVG).svg => output/3_SP3-65.csv 20 percent (SVG).svg (100%) rename 3_SP3-65.csv 40 percent (PNG).png => output/3_SP3-65.csv 40 percent (PNG).png (100%) rename 3_SP3-65.csv 40 percent (SVG).svg => output/3_SP3-65.csv 40 percent (SVG).svg (100%) rename 3_SP3-65.csv 60 percent (PNG).png => output/3_SP3-65.csv 60 percent (PNG).png (100%) rename 3_SP3-65.csv 60 percent (SVG).svg => output/3_SP3-65.csv 60 percent (SVG).svg (100%) rename 3_SP3-65.csv 80 percent (PNG).png => output/3_SP3-65.csv 80 percent (PNG).png (100%) rename 3_SP3-65.csv 80 percent (SVG).svg => output/3_SP3-65.csv 80 percent (SVG).svg (100%) rename 3_SP3-68.csv 20 percent (PNG).png => output/3_SP3-68.csv 20 percent (PNG).png (100%) rename 3_SP3-68.csv 20 percent (SVG).svg => output/3_SP3-68.csv 20 percent (SVG).svg (100%) rename 3_SP3-68.csv 40 percent (PNG).png => output/3_SP3-68.csv 40 percent (PNG).png (100%) rename 3_SP3-68.csv 40 percent (SVG).svg => output/3_SP3-68.csv 40 percent (SVG).svg (100%) rename 3_SP3-68.csv 60 percent (PNG).png => output/3_SP3-68.csv 60 percent (PNG).png (100%) rename 3_SP3-68.csv 60 percent (SVG).svg => output/3_SP3-68.csv 60 percent (SVG).svg (100%) rename 3_SP3-68.csv 80 percent (PNG).png => output/3_SP3-68.csv 80 percent (PNG).png (100%) rename 3_SP3-68.csv 80 percent (SVG).svg => output/3_SP3-68.csv 80 percent (SVG).svg (100%) rename 4_S-11.csv 20 percent (PNG).png => output/4_S-11.csv 20 percent (PNG).png (100%) rename 4_S-11.csv 20 percent (SVG).svg => output/4_S-11.csv 20 percent (SVG).svg (100%) rename 4_S-11.csv 40 percent (PNG).png => output/4_S-11.csv 40 percent (PNG).png (100%) rename 4_S-11.csv 40 percent (SVG).svg => output/4_S-11.csv 40 percent (SVG).svg (100%) rename 4_S-11.csv 60 percent (PNG).png => output/4_S-11.csv 60 percent (PNG).png (100%) rename 4_S-11.csv 60 percent (SVG).svg => output/4_S-11.csv 60 percent (SVG).svg (100%) rename 4_S-11.csv 80 percent (PNG).png => output/4_S-11.csv 80 percent (PNG).png (100%) rename 4_S-11.csv 80 percent (SVG).svg => output/4_S-11.csv 80 percent (SVG).svg (100%) rename west_test_2_5_No_54.csv 20 percent (PNG).png => output/west_test_2_5_No_54.csv 20 percent (PNG).png (100%) rename west_test_2_5_No_54.csv 20 percent (SVG).svg => output/west_test_2_5_No_54.csv 20 percent (SVG).svg (100%) rename west_test_2_5_No_54.csv 40 percent (PNG).png => output/west_test_2_5_No_54.csv 40 percent (PNG).png (100%) rename west_test_2_5_No_54.csv 40 percent (SVG).svg => output/west_test_2_5_No_54.csv 40 percent (SVG).svg (100%) rename west_test_2_5_No_54.csv 60 percent (PNG).png => output/west_test_2_5_No_54.csv 60 percent (PNG).png (100%) rename west_test_2_5_No_54.csv 60 percent (SVG).svg => output/west_test_2_5_No_54.csv 60 percent (SVG).svg (100%) rename west_test_2_5_No_54.csv 80 percent (PNG).png => output/west_test_2_5_No_54.csv 80 percent (PNG).png (100%) rename west_test_2_5_No_54.csv 80 percent (SVG).svg => output/west_test_2_5_No_54.csv 80 percent (SVG).svg (100%) rename west_test_2_5_No_54.csv 99 percent (PNG).png => output/west_test_2_5_No_54.csv 99 percent (PNG).png (100%) rename west_test_2_5_No_54.csv 99 percent (SVG).svg => output/west_test_2_5_No_54.csv 99 percent (SVG).svg (100%) diff --git a/1_S-12.csv b/data/1_S-12.csv similarity index 100% rename from 1_S-12.csv rename to data/1_S-12.csv diff --git a/1_SP-11.csv b/data/1_SP-11.csv similarity index 100% rename from 1_SP-11.csv rename to data/1_SP-11.csv diff --git a/1_SP-17.csv b/data/1_SP-17.csv similarity index 100% rename from 1_SP-17.csv rename to data/1_SP-17.csv diff --git a/1_SP-23.csv b/data/1_SP-23.csv similarity index 100% rename from 1_SP-23.csv rename to data/1_SP-23.csv diff --git a/3_SP3-65.csv b/data/3_SP3-65.csv similarity index 100% rename from 3_SP3-65.csv rename to data/3_SP3-65.csv diff --git a/3_SP3-68.csv b/data/3_SP3-68.csv similarity index 100% rename from 3_SP3-68.csv rename to data/3_SP3-68.csv diff --git a/main.py b/main.py index ea87a7d..541d622 100644 --- a/main.py +++ b/main.py @@ -42,7 +42,7 @@ def fun_step_prediction_correction(m2, p2): # 파일 읽기, 리스트 설정 # Read .csv file using pandas -data = pd.read_csv("1_SP-11.csv") +data = pd.read_csv("data/1_SP-11.csv") # Set arrays for time and settlement time = data['Time'].to_numpy() diff --git a/1_S-12.csv 20 percent (PNG).png b/output/1_S-12.csv 20 percent (PNG).png similarity index 100% rename from 1_S-12.csv 20 percent (PNG).png rename to output/1_S-12.csv 20 percent (PNG).png diff --git a/1_S-12.csv 20 percent (SVG).svg b/output/1_S-12.csv 20 percent (SVG).svg similarity index 100% rename from 1_S-12.csv 20 percent (SVG).svg rename to output/1_S-12.csv 20 percent (SVG).svg diff --git a/1_S-12.csv 40 percent (PNG).png b/output/1_S-12.csv 40 percent (PNG).png similarity index 100% rename from 1_S-12.csv 40 percent (PNG).png rename to output/1_S-12.csv 40 percent (PNG).png diff --git a/1_S-12.csv 40 percent (SVG).svg b/output/1_S-12.csv 40 percent (SVG).svg similarity index 100% rename from 1_S-12.csv 40 percent (SVG).svg rename to output/1_S-12.csv 40 percent (SVG).svg diff --git a/1_S-12.csv 60 percent (PNG).png b/output/1_S-12.csv 60 percent (PNG).png similarity index 100% rename from 1_S-12.csv 60 percent (PNG).png rename to output/1_S-12.csv 60 percent (PNG).png diff --git a/1_S-12.csv 60 percent (SVG).svg b/output/1_S-12.csv 60 percent (SVG).svg similarity index 100% rename from 1_S-12.csv 60 percent (SVG).svg rename to output/1_S-12.csv 60 percent (SVG).svg diff --git a/1_S-12.csv 80 percent (PNG).png b/output/1_S-12.csv 80 percent (PNG).png similarity index 100% rename from 1_S-12.csv 80 percent (PNG).png rename to output/1_S-12.csv 80 percent (PNG).png diff --git a/1_S-12.csv 80 percent (SVG).svg b/output/1_S-12.csv 80 percent (SVG).svg similarity index 100% rename from 1_S-12.csv 80 percent (SVG).svg rename to output/1_S-12.csv 80 percent (SVG).svg diff --git a/1_SP-11.csv 20 percent (PNG).png b/output/1_SP-11.csv 20 percent (PNG).png similarity index 100% rename from 1_SP-11.csv 20 percent (PNG).png rename to output/1_SP-11.csv 20 percent (PNG).png diff --git a/1_SP-11.csv 20 percent (SVG).svg b/output/1_SP-11.csv 20 percent (SVG).svg similarity index 100% rename from 1_SP-11.csv 20 percent (SVG).svg rename to output/1_SP-11.csv 20 percent (SVG).svg diff --git a/1_SP-11.csv 40 percent (PNG).png b/output/1_SP-11.csv 40 percent (PNG).png similarity index 100% rename from 1_SP-11.csv 40 percent (PNG).png rename to output/1_SP-11.csv 40 percent (PNG).png diff --git a/1_SP-11.csv 40 percent (SVG).svg b/output/1_SP-11.csv 40 percent (SVG).svg similarity index 100% rename from 1_SP-11.csv 40 percent (SVG).svg rename to output/1_SP-11.csv 40 percent (SVG).svg diff --git a/1_SP-11.csv 60 percent (PNG).png b/output/1_SP-11.csv 60 percent (PNG).png similarity index 100% rename from 1_SP-11.csv 60 percent (PNG).png rename to output/1_SP-11.csv 60 percent (PNG).png diff --git a/1_SP-11.csv 60 percent (SVG).svg b/output/1_SP-11.csv 60 percent (SVG).svg similarity index 100% rename from 1_SP-11.csv 60 percent (SVG).svg rename to output/1_SP-11.csv 60 percent (SVG).svg diff --git a/1_SP-11.csv 80 percent (PNG).png b/output/1_SP-11.csv 80 percent (PNG).png similarity index 100% rename from 1_SP-11.csv 80 percent (PNG).png rename to output/1_SP-11.csv 80 percent (PNG).png diff --git a/1_SP-11.csv 80 percent (SVG).svg b/output/1_SP-11.csv 80 percent (SVG).svg similarity index 100% rename from 1_SP-11.csv 80 percent (SVG).svg rename to output/1_SP-11.csv 80 percent (SVG).svg diff --git a/1_SP-17.csv 20 percent (PNG).png b/output/1_SP-17.csv 20 percent (PNG).png similarity index 100% rename from 1_SP-17.csv 20 percent (PNG).png rename to output/1_SP-17.csv 20 percent (PNG).png diff --git a/1_SP-17.csv 20 percent (SVG).svg b/output/1_SP-17.csv 20 percent (SVG).svg similarity index 100% rename from 1_SP-17.csv 20 percent (SVG).svg rename to output/1_SP-17.csv 20 percent (SVG).svg diff --git a/1_SP-17.csv 40 percent (PNG).png b/output/1_SP-17.csv 40 percent (PNG).png similarity index 100% rename from 1_SP-17.csv 40 percent (PNG).png rename to output/1_SP-17.csv 40 percent (PNG).png diff --git a/1_SP-17.csv 40 percent (SVG).svg b/output/1_SP-17.csv 40 percent (SVG).svg similarity index 100% rename from 1_SP-17.csv 40 percent (SVG).svg rename to output/1_SP-17.csv 40 percent (SVG).svg diff --git a/1_SP-17.csv 60 percent (PNG).png b/output/1_SP-17.csv 60 percent (PNG).png similarity index 100% rename from 1_SP-17.csv 60 percent (PNG).png rename to output/1_SP-17.csv 60 percent (PNG).png diff --git a/1_SP-17.csv 60 percent (SVG).svg b/output/1_SP-17.csv 60 percent (SVG).svg similarity index 100% rename from 1_SP-17.csv 60 percent (SVG).svg rename to output/1_SP-17.csv 60 percent (SVG).svg diff --git a/1_SP-17.csv 80 percent (PNG).png b/output/1_SP-17.csv 80 percent (PNG).png similarity index 100% rename from 1_SP-17.csv 80 percent (PNG).png rename to output/1_SP-17.csv 80 percent (PNG).png diff --git a/1_SP-17.csv 80 percent (SVG).svg b/output/1_SP-17.csv 80 percent (SVG).svg similarity index 100% rename from 1_SP-17.csv 80 percent (SVG).svg rename to output/1_SP-17.csv 80 percent (SVG).svg diff --git a/1_SP-23.csv 20 percent (PNG).png b/output/1_SP-23.csv 20 percent (PNG).png similarity index 100% rename from 1_SP-23.csv 20 percent (PNG).png rename to output/1_SP-23.csv 20 percent (PNG).png diff --git a/1_SP-23.csv 20 percent (SVG).svg b/output/1_SP-23.csv 20 percent (SVG).svg similarity index 100% rename from 1_SP-23.csv 20 percent (SVG).svg rename to output/1_SP-23.csv 20 percent (SVG).svg diff --git a/1_SP-23.csv 40 percent (PNG).png b/output/1_SP-23.csv 40 percent (PNG).png similarity index 100% rename from 1_SP-23.csv 40 percent (PNG).png rename to output/1_SP-23.csv 40 percent (PNG).png diff --git a/1_SP-23.csv 40 percent (SVG).svg b/output/1_SP-23.csv 40 percent (SVG).svg similarity index 100% rename from 1_SP-23.csv 40 percent (SVG).svg rename to output/1_SP-23.csv 40 percent (SVG).svg diff --git a/1_SP-23.csv 60 percent (PNG).png b/output/1_SP-23.csv 60 percent (PNG).png similarity index 100% rename from 1_SP-23.csv 60 percent (PNG).png rename to output/1_SP-23.csv 60 percent (PNG).png diff --git a/1_SP-23.csv 60 percent (SVG).svg b/output/1_SP-23.csv 60 percent (SVG).svg similarity index 100% rename from 1_SP-23.csv 60 percent (SVG).svg rename to output/1_SP-23.csv 60 percent (SVG).svg diff --git a/1_SP-23.csv 80 percent (PNG).png b/output/1_SP-23.csv 80 percent (PNG).png similarity index 100% rename from 1_SP-23.csv 80 percent (PNG).png rename to output/1_SP-23.csv 80 percent (PNG).png diff --git a/1_SP-23.csv 80 percent (SVG).svg b/output/1_SP-23.csv 80 percent (SVG).svg similarity index 100% rename from 1_SP-23.csv 80 percent (SVG).svg rename to output/1_SP-23.csv 80 percent (SVG).svg diff --git a/3_SP3-65.csv 20 percent (PNG).png b/output/3_SP3-65.csv 20 percent (PNG).png similarity index 100% rename from 3_SP3-65.csv 20 percent (PNG).png rename to output/3_SP3-65.csv 20 percent (PNG).png diff --git a/3_SP3-65.csv 20 percent (SVG).svg b/output/3_SP3-65.csv 20 percent (SVG).svg similarity index 100% rename from 3_SP3-65.csv 20 percent (SVG).svg rename to output/3_SP3-65.csv 20 percent (SVG).svg diff --git a/3_SP3-65.csv 40 percent (PNG).png b/output/3_SP3-65.csv 40 percent (PNG).png similarity index 100% rename from 3_SP3-65.csv 40 percent (PNG).png rename to output/3_SP3-65.csv 40 percent (PNG).png diff --git a/3_SP3-65.csv 40 percent (SVG).svg b/output/3_SP3-65.csv 40 percent (SVG).svg similarity index 100% rename from 3_SP3-65.csv 40 percent (SVG).svg rename to output/3_SP3-65.csv 40 percent (SVG).svg diff --git a/3_SP3-65.csv 60 percent (PNG).png b/output/3_SP3-65.csv 60 percent (PNG).png similarity index 100% rename from 3_SP3-65.csv 60 percent (PNG).png rename to output/3_SP3-65.csv 60 percent (PNG).png diff --git a/3_SP3-65.csv 60 percent (SVG).svg b/output/3_SP3-65.csv 60 percent (SVG).svg similarity index 100% rename from 3_SP3-65.csv 60 percent (SVG).svg rename to output/3_SP3-65.csv 60 percent (SVG).svg diff --git a/3_SP3-65.csv 80 percent (PNG).png b/output/3_SP3-65.csv 80 percent (PNG).png similarity index 100% rename from 3_SP3-65.csv 80 percent (PNG).png rename to output/3_SP3-65.csv 80 percent (PNG).png diff --git a/3_SP3-65.csv 80 percent (SVG).svg b/output/3_SP3-65.csv 80 percent (SVG).svg similarity index 100% rename from 3_SP3-65.csv 80 percent (SVG).svg rename to output/3_SP3-65.csv 80 percent (SVG).svg diff --git a/3_SP3-68.csv 20 percent (PNG).png b/output/3_SP3-68.csv 20 percent (PNG).png similarity index 100% rename from 3_SP3-68.csv 20 percent (PNG).png rename to output/3_SP3-68.csv 20 percent (PNG).png diff --git a/3_SP3-68.csv 20 percent (SVG).svg b/output/3_SP3-68.csv 20 percent (SVG).svg similarity index 100% rename from 3_SP3-68.csv 20 percent (SVG).svg rename to output/3_SP3-68.csv 20 percent (SVG).svg diff --git a/3_SP3-68.csv 40 percent (PNG).png b/output/3_SP3-68.csv 40 percent (PNG).png similarity index 100% rename from 3_SP3-68.csv 40 percent (PNG).png rename to output/3_SP3-68.csv 40 percent (PNG).png diff --git a/3_SP3-68.csv 40 percent (SVG).svg b/output/3_SP3-68.csv 40 percent (SVG).svg similarity index 100% rename from 3_SP3-68.csv 40 percent (SVG).svg rename to output/3_SP3-68.csv 40 percent (SVG).svg diff --git a/3_SP3-68.csv 60 percent (PNG).png b/output/3_SP3-68.csv 60 percent (PNG).png similarity index 100% rename from 3_SP3-68.csv 60 percent (PNG).png rename to output/3_SP3-68.csv 60 percent (PNG).png diff --git a/3_SP3-68.csv 60 percent (SVG).svg b/output/3_SP3-68.csv 60 percent (SVG).svg similarity index 100% rename from 3_SP3-68.csv 60 percent (SVG).svg rename to output/3_SP3-68.csv 60 percent (SVG).svg diff --git a/3_SP3-68.csv 80 percent (PNG).png b/output/3_SP3-68.csv 80 percent (PNG).png similarity index 100% rename from 3_SP3-68.csv 80 percent (PNG).png rename to output/3_SP3-68.csv 80 percent (PNG).png diff --git a/3_SP3-68.csv 80 percent (SVG).svg b/output/3_SP3-68.csv 80 percent (SVG).svg similarity index 100% rename from 3_SP3-68.csv 80 percent (SVG).svg rename to output/3_SP3-68.csv 80 percent (SVG).svg diff --git a/4_S-11.csv 20 percent (PNG).png b/output/4_S-11.csv 20 percent (PNG).png similarity index 100% rename from 4_S-11.csv 20 percent (PNG).png rename to output/4_S-11.csv 20 percent (PNG).png diff --git a/4_S-11.csv 20 percent (SVG).svg b/output/4_S-11.csv 20 percent (SVG).svg similarity index 100% rename from 4_S-11.csv 20 percent (SVG).svg rename to output/4_S-11.csv 20 percent (SVG).svg diff --git a/4_S-11.csv 40 percent (PNG).png b/output/4_S-11.csv 40 percent (PNG).png similarity index 100% rename from 4_S-11.csv 40 percent (PNG).png rename to output/4_S-11.csv 40 percent (PNG).png diff --git a/4_S-11.csv 40 percent (SVG).svg b/output/4_S-11.csv 40 percent (SVG).svg similarity index 100% rename from 4_S-11.csv 40 percent (SVG).svg rename to output/4_S-11.csv 40 percent (SVG).svg diff --git a/4_S-11.csv 60 percent (PNG).png b/output/4_S-11.csv 60 percent (PNG).png similarity index 100% rename from 4_S-11.csv 60 percent (PNG).png rename to output/4_S-11.csv 60 percent (PNG).png diff --git a/4_S-11.csv 60 percent (SVG).svg b/output/4_S-11.csv 60 percent (SVG).svg similarity index 100% rename from 4_S-11.csv 60 percent (SVG).svg rename to output/4_S-11.csv 60 percent (SVG).svg diff --git a/4_S-11.csv 80 percent (PNG).png b/output/4_S-11.csv 80 percent (PNG).png similarity index 100% rename from 4_S-11.csv 80 percent (PNG).png rename to output/4_S-11.csv 80 percent (PNG).png diff --git a/4_S-11.csv 80 percent (SVG).svg b/output/4_S-11.csv 80 percent (SVG).svg similarity index 100% rename from 4_S-11.csv 80 percent (SVG).svg rename to output/4_S-11.csv 80 percent (SVG).svg diff --git a/west_test_2_5_No_54.csv 20 percent (PNG).png b/output/west_test_2_5_No_54.csv 20 percent (PNG).png similarity index 100% rename from west_test_2_5_No_54.csv 20 percent (PNG).png rename to output/west_test_2_5_No_54.csv 20 percent (PNG).png diff --git a/west_test_2_5_No_54.csv 20 percent (SVG).svg b/output/west_test_2_5_No_54.csv 20 percent (SVG).svg similarity index 100% rename from west_test_2_5_No_54.csv 20 percent (SVG).svg rename to output/west_test_2_5_No_54.csv 20 percent (SVG).svg diff --git a/west_test_2_5_No_54.csv 40 percent (PNG).png b/output/west_test_2_5_No_54.csv 40 percent (PNG).png similarity index 100% rename from west_test_2_5_No_54.csv 40 percent (PNG).png rename to output/west_test_2_5_No_54.csv 40 percent (PNG).png diff --git a/west_test_2_5_No_54.csv 40 percent (SVG).svg b/output/west_test_2_5_No_54.csv 40 percent (SVG).svg similarity index 100% rename from west_test_2_5_No_54.csv 40 percent (SVG).svg rename to output/west_test_2_5_No_54.csv 40 percent (SVG).svg diff --git a/west_test_2_5_No_54.csv 60 percent (PNG).png b/output/west_test_2_5_No_54.csv 60 percent (PNG).png similarity index 100% rename from west_test_2_5_No_54.csv 60 percent (PNG).png rename to output/west_test_2_5_No_54.csv 60 percent (PNG).png diff --git a/west_test_2_5_No_54.csv 60 percent (SVG).svg b/output/west_test_2_5_No_54.csv 60 percent (SVG).svg similarity index 100% rename from west_test_2_5_No_54.csv 60 percent (SVG).svg rename to output/west_test_2_5_No_54.csv 60 percent (SVG).svg diff --git a/west_test_2_5_No_54.csv 80 percent (PNG).png b/output/west_test_2_5_No_54.csv 80 percent (PNG).png similarity index 100% rename from west_test_2_5_No_54.csv 80 percent (PNG).png rename to output/west_test_2_5_No_54.csv 80 percent (PNG).png diff --git a/west_test_2_5_No_54.csv 80 percent (SVG).svg b/output/west_test_2_5_No_54.csv 80 percent (SVG).svg similarity index 100% rename from west_test_2_5_No_54.csv 80 percent (SVG).svg rename to output/west_test_2_5_No_54.csv 80 percent (SVG).svg diff --git a/west_test_2_5_No_54.csv 99 percent (PNG).png b/output/west_test_2_5_No_54.csv 99 percent (PNG).png similarity index 100% rename from west_test_2_5_No_54.csv 99 percent (PNG).png rename to output/west_test_2_5_No_54.csv 99 percent (PNG).png diff --git a/west_test_2_5_No_54.csv 99 percent (SVG).svg b/output/west_test_2_5_No_54.csv 99 percent (SVG).svg similarity index 100% rename from west_test_2_5_No_54.csv 99 percent (SVG).svg rename to output/west_test_2_5_No_54.csv 99 percent (SVG).svg diff --git a/settle_prediction_steps_no_touch.py b/settle_prediction_steps_no_touch.py index 0399950..d7274b8 100644 --- a/settle_prediction_steps_no_touch.py +++ b/settle_prediction_steps_no_touch.py @@ -49,14 +49,15 @@ def fun_rmse(py1, py2): # ================= # 파일명 설정 : 임시 -#filename = "1_S-12.csv" -#filename = "1_SP-11.csv" -#filename = "1_SP-17.csv" -#filename = "1_SP-23.csv" -#filename = "3_SP3-65.csv" -#filename = "3_SP3-68.csv" -filename = "4_S-11.csv" -#filename = "west_test_2_5_No_54.csv" +filename = "data\" +#filename += "1_S-12.csv" +#filename += "1_SP-11.csv" +#filename += "1_SP-17.csv" +#filename += "1_SP-23.csv" +#filename += "3_SP3-65.csv" +#filename += "3_SP3-68.csv" +filename += "4_S-11.csv" +#filename += "west_test_2_5_No_54.csv" # 최종 성토 단계의 데이터 사용 퍼센트 설정 : 사용자 입력값 final_step_predict_percent = 20