From 7a66b66513a394bbe81e99221b6431a455aeaa01 Mon Sep 17 00:00:00 2001 From: Armor00 <2654988228@qq.com> Date: Thu, 5 Sep 2024 17:27:18 +0800 Subject: [PATCH] update --- .../EngineDataProcess_DB_upload.py | 0 src/{KSP-tools => KSP_tools}/SRB_plot.py | 0 src/{KSP-tools => KSP_tools}/__init__.py | 0 .../antenna_patch_generator.py | 0 src/{KSP-tools => KSP_tools}/calculator_dv.py | 0 .../calculator_twr.py | 0 .../craft_file_analyzer.py | 0 src/{KSP-tools => KSP_tools}/data/CZ-3B.craft | 0 src/{KSP-tools => KSP_tools}/data/CZ-6.craft | 0 src/{KSP-tools => KSP_tools}/data/CZ-6A.craft | 0 src/{KSP-tools => KSP_tools}/data/CZ-7.craft | 0 src/{KSP-tools => KSP_tools}/data/CZ-7A.craft | 0 src/{KSP-tools => KSP_tools}/data/CZ-8.craft | 0 .../data/CZ-800.craft | 0 .../data/CommonResources.cfg | 0 .../data/Gravity-1.craft | 0 .../data/KIU-CZ-10.craft | 0 .../data/KIU-CZ-2F.craft | 0 .../data/KIU-CZ-3B.craft | 0 .../data/KIU-CZ-3C.craft | 0 .../data/KIU-CZ-6.craft | 0 .../data/KIU-CZ-6A.craft | 0 .../data/KIU-CZ-7.craft | 0 .../data/KIU-CZ-7A.craft | 0 .../data/KIU-CZ-7A（双星构型）.craft | 0 .../data/KIU-CZ-8.craft | 0 .../data/KIU-CZ-8Y2.craft | 0 .../data/KIU-YL-1.craft | 0 .../data/KIU-YuanZheng-3.craft | 0 .../data/Zhuque-2.craft | 0 .../data/full_config.txt | 0 .../data/thrust_curve.txt | 0 .../engine_auto_price.py | 0 .../engine_patch_generator.py | 0 .../engine_patch_loader.py | 0 .../greenhouse_simulation.py | 0 src/{KSP-tools => KSP_tools}/load_cfg.py | 0 .../load_common_resources.py | 0 src/KSP_tools/stage_performance_plot.py | 26 +++++++++++++++++++ .../vessel_simulation_advanced.py | 0 src/My_Logger/project_logger.py | 6 +++-- src/tools/auto_safe.py | 2 +- 42 files changed, 31 insertions(+), 3 deletions(-) rename src/{KSP-tools => KSP_tools}/EngineDataProcess_DB_upload.py (100%) rename src/{KSP-tools => KSP_tools}/SRB_plot.py (100%) rename src/{KSP-tools => KSP_tools}/__init__.py (100%) rename src/{KSP-tools => KSP_tools}/antenna_patch_generator.py (100%) rename src/{KSP-tools => KSP_tools}/calculator_dv.py (100%) rename src/{KSP-tools => KSP_tools}/calculator_twr.py (100%) rename src/{KSP-tools => KSP_tools}/craft_file_analyzer.py (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-3B.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-6.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-6A.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-7.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-7A.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-8.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CZ-800.craft (100%) rename src/{KSP-tools => KSP_tools}/data/CommonResources.cfg (100%) rename src/{KSP-tools => KSP_tools}/data/Gravity-1.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-10.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-2F.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-3B.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-3C.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-6.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-6A.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-7.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-7A.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-7A（双星构型）.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-8.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-CZ-8Y2.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-YL-1.craft (100%) rename src/{KSP-tools => KSP_tools}/data/KIU-YuanZheng-3.craft (100%) rename src/{KSP-tools => KSP_tools}/data/Zhuque-2.craft (100%) rename src/{KSP-tools => KSP_tools}/data/full_config.txt (100%) rename src/{KSP-tools => KSP_tools}/data/thrust_curve.txt (100%) rename src/{KSP-tools => KSP_tools}/engine_auto_price.py (100%) rename src/{KSP-tools => KSP_tools}/engine_patch_generator.py (100%) rename src/{KSP-tools => KSP_tools}/engine_patch_loader.py (100%) rename src/{KSP-tools => KSP_tools}/greenhouse_simulation.py (100%) rename src/{KSP-tools => KSP_tools}/load_cfg.py (100%) rename src/{KSP-tools => KSP_tools}/load_common_resources.py (100%) create mode 100644 src/KSP_tools/stage_performance_plot.py rename src/{KSP-tools => KSP_tools}/vessel_simulation_advanced.py (100%) diff --git a/src/KSP-tools/EngineDataProcess_DB_upload.py b/src/KSP_tools/EngineDataProcess_DB_upload.py similarity index 100% rename from src/KSP-tools/EngineDataProcess_DB_upload.py rename to src/KSP_tools/EngineDataProcess_DB_upload.py diff --git a/src/KSP-tools/SRB_plot.py b/src/KSP_tools/SRB_plot.py similarity index 100% rename from src/KSP-tools/SRB_plot.py rename to src/KSP_tools/SRB_plot.py diff --git a/src/KSP-tools/__init__.py b/src/KSP_tools/__init__.py similarity index 100% rename from src/KSP-tools/__init__.py rename to src/KSP_tools/__init__.py diff --git a/src/KSP-tools/antenna_patch_generator.py b/src/KSP_tools/antenna_patch_generator.py similarity index 100% rename from src/KSP-tools/antenna_patch_generator.py rename to src/KSP_tools/antenna_patch_generator.py diff --git a/src/KSP-tools/calculator_dv.py b/src/KSP_tools/calculator_dv.py similarity index 100% rename from src/KSP-tools/calculator_dv.py rename to src/KSP_tools/calculator_dv.py diff --git a/src/KSP-tools/calculator_twr.py b/src/KSP_tools/calculator_twr.py similarity index 100% rename from src/KSP-tools/calculator_twr.py rename to src/KSP_tools/calculator_twr.py diff --git a/src/KSP-tools/craft_file_analyzer.py b/src/KSP_tools/craft_file_analyzer.py similarity index 100% rename from src/KSP-tools/craft_file_analyzer.py rename to src/KSP_tools/craft_file_analyzer.py diff --git a/src/KSP-tools/data/CZ-3B.craft b/src/KSP_tools/data/CZ-3B.craft similarity index 100% rename from src/KSP-tools/data/CZ-3B.craft rename to src/KSP_tools/data/CZ-3B.craft diff --git a/src/KSP-tools/data/CZ-6.craft b/src/KSP_tools/data/CZ-6.craft similarity index 100% rename from src/KSP-tools/data/CZ-6.craft rename to src/KSP_tools/data/CZ-6.craft diff --git a/src/KSP-tools/data/CZ-6A.craft b/src/KSP_tools/data/CZ-6A.craft similarity index 100% rename from src/KSP-tools/data/CZ-6A.craft rename to src/KSP_tools/data/CZ-6A.craft diff --git a/src/KSP-tools/data/CZ-7.craft b/src/KSP_tools/data/CZ-7.craft similarity index 100% rename from src/KSP-tools/data/CZ-7.craft rename to src/KSP_tools/data/CZ-7.craft diff --git a/src/KSP-tools/data/CZ-7A.craft b/src/KSP_tools/data/CZ-7A.craft similarity index 100% rename from src/KSP-tools/data/CZ-7A.craft rename to src/KSP_tools/data/CZ-7A.craft diff --git a/src/KSP-tools/data/CZ-8.craft b/src/KSP_tools/data/CZ-8.craft similarity index 100% rename from src/KSP-tools/data/CZ-8.craft rename to src/KSP_tools/data/CZ-8.craft diff --git a/src/KSP-tools/data/CZ-800.craft b/src/KSP_tools/data/CZ-800.craft similarity index 100% rename from src/KSP-tools/data/CZ-800.craft rename to src/KSP_tools/data/CZ-800.craft diff --git a/src/KSP-tools/data/CommonResources.cfg b/src/KSP_tools/data/CommonResources.cfg similarity index 100% rename from src/KSP-tools/data/CommonResources.cfg rename to src/KSP_tools/data/CommonResources.cfg diff --git a/src/KSP-tools/data/Gravity-1.craft b/src/KSP_tools/data/Gravity-1.craft similarity index 100% rename from src/KSP-tools/data/Gravity-1.craft rename to src/KSP_tools/data/Gravity-1.craft diff --git a/src/KSP-tools/data/KIU-CZ-10.craft b/src/KSP_tools/data/KIU-CZ-10.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-10.craft rename to src/KSP_tools/data/KIU-CZ-10.craft diff --git a/src/KSP-tools/data/KIU-CZ-2F.craft b/src/KSP_tools/data/KIU-CZ-2F.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-2F.craft rename to src/KSP_tools/data/KIU-CZ-2F.craft diff --git a/src/KSP-tools/data/KIU-CZ-3B.craft b/src/KSP_tools/data/KIU-CZ-3B.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-3B.craft rename to src/KSP_tools/data/KIU-CZ-3B.craft diff --git a/src/KSP-tools/data/KIU-CZ-3C.craft b/src/KSP_tools/data/KIU-CZ-3C.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-3C.craft rename to src/KSP_tools/data/KIU-CZ-3C.craft diff --git a/src/KSP-tools/data/KIU-CZ-6.craft b/src/KSP_tools/data/KIU-CZ-6.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-6.craft rename to src/KSP_tools/data/KIU-CZ-6.craft diff --git a/src/KSP-tools/data/KIU-CZ-6A.craft b/src/KSP_tools/data/KIU-CZ-6A.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-6A.craft rename to src/KSP_tools/data/KIU-CZ-6A.craft diff --git a/src/KSP-tools/data/KIU-CZ-7.craft b/src/KSP_tools/data/KIU-CZ-7.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-7.craft rename to src/KSP_tools/data/KIU-CZ-7.craft diff --git a/src/KSP-tools/data/KIU-CZ-7A.craft b/src/KSP_tools/data/KIU-CZ-7A.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-7A.craft rename to src/KSP_tools/data/KIU-CZ-7A.craft diff --git a/src/KSP-tools/data/KIU-CZ-7A（双星构型）.craft b/src/KSP_tools/data/KIU-CZ-7A（双星构型）.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-7A（双星构型）.craft rename to src/KSP_tools/data/KIU-CZ-7A（双星构型）.craft diff --git a/src/KSP-tools/data/KIU-CZ-8.craft b/src/KSP_tools/data/KIU-CZ-8.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-8.craft rename to src/KSP_tools/data/KIU-CZ-8.craft diff --git a/src/KSP-tools/data/KIU-CZ-8Y2.craft b/src/KSP_tools/data/KIU-CZ-8Y2.craft similarity index 100% rename from src/KSP-tools/data/KIU-CZ-8Y2.craft rename to src/KSP_tools/data/KIU-CZ-8Y2.craft diff --git a/src/KSP-tools/data/KIU-YL-1.craft b/src/KSP_tools/data/KIU-YL-1.craft similarity index 100% rename from src/KSP-tools/data/KIU-YL-1.craft rename to src/KSP_tools/data/KIU-YL-1.craft diff --git a/src/KSP-tools/data/KIU-YuanZheng-3.craft b/src/KSP_tools/data/KIU-YuanZheng-3.craft similarity index 100% rename from src/KSP-tools/data/KIU-YuanZheng-3.craft rename to src/KSP_tools/data/KIU-YuanZheng-3.craft diff --git a/src/KSP-tools/data/Zhuque-2.craft b/src/KSP_tools/data/Zhuque-2.craft similarity index 100% rename from src/KSP-tools/data/Zhuque-2.craft rename to src/KSP_tools/data/Zhuque-2.craft diff --git a/src/KSP-tools/data/full_config.txt b/src/KSP_tools/data/full_config.txt similarity index 100% rename from src/KSP-tools/data/full_config.txt rename to src/KSP_tools/data/full_config.txt diff --git a/src/KSP-tools/data/thrust_curve.txt b/src/KSP_tools/data/thrust_curve.txt similarity index 100% rename from src/KSP-tools/data/thrust_curve.txt rename to src/KSP_tools/data/thrust_curve.txt diff --git a/src/KSP-tools/engine_auto_price.py b/src/KSP_tools/engine_auto_price.py similarity index 100% rename from src/KSP-tools/engine_auto_price.py rename to src/KSP_tools/engine_auto_price.py diff --git a/src/KSP-tools/engine_patch_generator.py b/src/KSP_tools/engine_patch_generator.py similarity index 100% rename from src/KSP-tools/engine_patch_generator.py rename to src/KSP_tools/engine_patch_generator.py diff --git a/src/KSP-tools/engine_patch_loader.py b/src/KSP_tools/engine_patch_loader.py similarity index 100% rename from src/KSP-tools/engine_patch_loader.py rename to src/KSP_tools/engine_patch_loader.py diff --git a/src/KSP-tools/greenhouse_simulation.py b/src/KSP_tools/greenhouse_simulation.py similarity index 100% rename from src/KSP-tools/greenhouse_simulation.py rename to src/KSP_tools/greenhouse_simulation.py diff --git a/src/KSP-tools/load_cfg.py b/src/KSP_tools/load_cfg.py similarity index 100% rename from src/KSP-tools/load_cfg.py rename to src/KSP_tools/load_cfg.py diff --git a/src/KSP-tools/load_common_resources.py b/src/KSP_tools/load_common_resources.py similarity index 100% rename from src/KSP-tools/load_common_resources.py rename to src/KSP_tools/load_common_resources.py diff --git a/src/KSP_tools/stage_performance_plot.py b/src/KSP_tools/stage_performance_plot.py new file mode 100644 index 0000000..262c512 --- /dev/null +++ b/src/KSP_tools/stage_performance_plot.py @@ -0,0 +1,26 @@ +import matplotlib.pyplot as plt + +from src.KSP_tools.calculator_dv import cal_dv + +centaur_isp = 450.5 +centaur_gross_mass = 20830 + 2247 +centaur_dry_mass = 2247 + +lm_isp = 438 +lm_gross_mass = 21000 +lm_dry_mass = 2800 + +lmh_isp = 450 +lmh_gross_mass = 23500 + 3000 +lmh_dry_mass = 3000 + +payload_list = [i for i in range(0, 10000, 100)] +centaur_performance = [cal_dv(centaur_isp, centaur_dry_mass + i, centaur_gross_mass + i) for i in payload_list] +lm_performance = [cal_dv(lm_isp, lm_dry_mass + i, lm_gross_mass + i) for i in payload_list] +lmh_performance = [cal_dv(lmh_isp, lmh_dry_mass + i, lmh_gross_mass + i) for i in payload_list] + +plt.plot(centaur_performance, label='Centaur') +plt.plot(lm_performance, label='Long March') +plt.plot(lmh_performance, label='Long March 3.35') +plt.legend() +plt.show() diff --git a/src/KSP-tools/vessel_simulation_advanced.py b/src/KSP_tools/vessel_simulation_advanced.py similarity index 100% rename from src/KSP-tools/vessel_simulation_advanced.py rename to src/KSP_tools/vessel_simulation_advanced.py diff --git a/src/My_Logger/project_logger.py b/src/My_Logger/project_logger.py index 33f463c..4fdd8e5 100644 --- a/src/My_Logger/project_logger.py +++ b/src/My_Logger/project_logger.py @@ -43,8 +43,10 @@ class LoggerClass: # 返回控制器 return file_handler - def get_log(self, level, log_file_path=log_path): - logger = logging.getLogger() + def get_log(self, level, log_file_path=log_path, name=None): + if not name or not isinstance(name, str): + name = 'project_logger' + logger = logging.getLogger(name=name) logger.setLevel(level) # 日志器中添加控制台处理器 logger.addHandler(self.console_handler(level)) diff --git a/src/tools/auto_safe.py b/src/tools/auto_safe.py index e9ea845..0d3b6b4 100644 --- a/src/tools/auto_safe.py +++ b/src/tools/auto_safe.py @@ -10,7 +10,7 @@ def ping_ip(ip_address, request_nums): :param request_nums: 请求次数 :return: 丢包率loss和统计结果res """ - ping = Ping(ip_address, 22, 3) + ping = Ping(ip_address, 2077, 3) ping.ping(request_nums) res = ping.result.table ret = ping.result.raw