scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-10-30 01:32:21 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

auto-design: relax min_gain restriction

Browse Source 
tolerate 3dB below min gain in amplifier selection
this is to allow selection of high power amps even if they are below min
gain

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
This commit is contained in:
Jean-Luc Auge
2019-02-14 17:05:46 +01:00
parent c3e00eea2c
commit 00ad542a11
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gnpy/core/network.py
View File

@@ -107,7 +107,7 @@ def select_edfa(raman_allowed, gain_target, power_target, equipment, uid):
)
-power_target,
gain_min=
gain_target
gain_target+3
-edfa.gain_min,
nf=edfa_nf(gain_target, edfa_variety, equipment)) \
for edfa_variety, edfa in edfa_dict.items()
@@ -116,6 +116,8 @@ def select_edfa(raman_allowed, gain_target, power_target, equipment, uid):
#filter on raman restriction
raman_filter = lambda edfa: (edfa.raman and raman_allowed) or not edfa.raman
edfa_list = list(filter(raman_filter, edfa_list))
#print(f'\n{uid}, gain {gain_target}, {power_target}')
#print('edfa',edfa_list)
#filter on min gain limitation:
acceptable_gain_min_list = \
@@ -131,6 +133,7 @@ def select_edfa(raman_allowed, gain_target, power_target, equipment, uid):
)
else:
edfa_list = acceptable_gain_min_list
#print('gain_min', acceptable_gain_min_list)
#filter on max power limitation:
acceptable_power_list = \
@@ -141,6 +144,7 @@ def select_edfa(raman_allowed, gain_target, power_target, equipment, uid):
#pick up all amplifiers that share this max gain:
acceptable_power_list = \
list(filter(lambda x : x.power-power_max>-0.3, edfa_list))
#print('power', acceptable_power_list)
# debug:
# print(gain_target, power_target, '=>\n',acceptable_power_list)