dedebenui/scgenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc

Browse Source
This commit is contained in:
Benoît Sierro
2021-09-23 09:59:19 +02:00
parent 98445271b8
commit 370d26a4ea
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scgenerator/__init__.py
View File

@@ -4,5 +4,5 @@ from .physics import fiber, materials, pulse, simulate, units
from .physics.simulate import RK4IP, parallel_RK4IP, run_simulation from .physics.simulate import RK4IP, parallel_RK4IP, run_simulation
from .plotting import mean_values_plot, plot_spectrogram, propagation_plot, single_position_plot from .plotting import mean_values_plot, plot_spectrogram, propagation_plot, single_position_plot
from .spectra import Pulse, Spectrum from .spectra import Pulse, Spectrum
from .utils import Paths, open_config from .utils import Paths, open_config, parameter
from .utils.parameter import Configuration, Parameters, PlotRange from .utils.parameter import Configuration, Parameters, PlotRange

2
src/scgenerator/utils/__init__.py
View File

@@ -116,7 +116,7 @@ def open_config(path: os.PathLike):
dico.setdefault("variable", {}) dico.setdefault("variable", {})
for key in {"simulation", "fiber", "gas", "pulse"} & dico.keys(): for key in {"simulation", "fiber", "gas", "pulse"} & dico.keys():
section = dico.pop(key, {}) section = dico.pop(key)
dico["variable"].update(section.pop("variable", {})) dico["variable"].update(section.pop("variable", {}))
dico.update(section) dico.update(section)
if len(dico["variable"]) == 0: if len(dico["variable"]) == 0:

14
src/scgenerator/utils/parameter.py
View File

@@ -1227,11 +1227,21 @@ def format_variable_list(l: list[tuple[str, Any]], add_iden=False) -> str:
tmp_name = PARAM_SEPARATOR.join(str_list) tmp_name = PARAM_SEPARATOR.join(str_list)
if not add_iden: if not add_iden:
return tmp_name return tmp_name
unique_id = "u_" + utils.to_62(hash(str(l))) unique_id = unique_identifier(l)
branch_id = "b_" + utils.to_62(hash(str([el for el in l if el[0] != "num"]))) branch_id = branch_identifier(l)
return unique_id + PARAM_SEPARATOR + branch_id + PARAM_SEPARATOR + tmp_name return unique_id + PARAM_SEPARATOR + branch_id + PARAM_SEPARATOR + tmp_name
def branch_identifier(l):
branch_id = "b_" + utils.to_62(hash(str([el for el in l if el[0] != "num"])))
return branch_id
def unique_identifier(l):
unique_id = "u_" + utils.to_62(hash(str(l)))
return unique_id
def format_value(name: str, value) -> str: def format_value(name: str, value) -> str:
if value is True or value is False: if value is True or value is False:
return str(value) return str(value)