Enable plotting functionality
This commit is contained in:
parent
ca9212a1fd
commit
04c8251d08
|
@ -2,6 +2,7 @@
|
|||
import typer
|
||||
|
||||
# Project Imports
|
||||
from src.plotter.run_plotter import run_plotter
|
||||
from src.simulation_runner.runner import run_simulation
|
||||
from src.utilities.files.json.simulation_config_parser import SimulationConfigParser
|
||||
|
||||
|
@ -16,11 +17,10 @@ def main(
|
|||
if run_type == "simulation":
|
||||
run_simulation(arguments_config, simulation_config)
|
||||
elif run_type == "plotter":
|
||||
# run_plotter()
|
||||
pass
|
||||
run_plotter(arguments_config, plotter_config)
|
||||
else:
|
||||
run_simulation()
|
||||
# run_plotter()
|
||||
run_plotter()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
@ -16,17 +16,16 @@ class SimulationConfigParser:
|
|||
# Split two parts
|
||||
arguments_config = json_configuration["arguments"]
|
||||
simulation_config = json_configuration["simulation"]
|
||||
# plotter_config = json_configuration["plotter"]
|
||||
plotter_config = json_configuration["plotter"]
|
||||
|
||||
# Retrieve valid schemas
|
||||
arguments_json_schema = read_json(env_variables.ARGUMENTS_SCHEMA_PATH)
|
||||
config_json_schema = read_json(env_variables.CONFIGURATION_SCHEMA_PATH)
|
||||
# plotter_json_schema = read_json(env_variables.plotter_schema_path)
|
||||
# plotter_json_schema = read_json(env_variables.plotter_schema_path) todo uncomment
|
||||
|
||||
# Validate
|
||||
validate_json(arguments_config, arguments_json_schema)
|
||||
validate_json(simulation_config, config_json_schema)
|
||||
# validate_json(plotter_config, plotter_json_schema)
|
||||
# validate_json(plotter_config, plotter_json_schema) todo uncomment
|
||||
|
||||
# return simulation_config, plotter_config
|
||||
return arguments_config, simulation_config, {}
|
||||
return arguments_config, simulation_config, plotter_config
|
||||
|
|
Loading…
Reference in New Issue