scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-11-02 02:57:52 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity
1,193 Commits 10 Branches 30 Tags
d201ec26bf114f960b0a06afcdb6dce53bf5b866
Commit Graph

30 Commits

Author SHA1 Message Date
AndreaDAmico
9a7f94a391 cleaning: minor changes and specific numpy imports in utils and science_utils. 
Change-Id: I57cd9075dd0a523a90131fbd8747519cf6554900
 2020-11-19 14:57:57 +00:00
Alessio Ferrari
06d59a5834 Introduce polarization mode dispersion (PMD) 
Change-Id: I687591df4662884b734ec945e9968713019ea0fc
 2020-06-12 09:08:22 +02:00
Alessio Ferrari
94949d955b Introduce computation of the chromatic dispersion 
Change-Id: I3ee039154568d4255444fa8db5e89945851010f4
 2020-06-12 08:45:46 +02:00
Jan Kundrát
0823f8de46 Move automatic_nch, automatic_fmax into utils 
I think that gnpy/core/equipment.py should contain only stuff which
prepares the equipment_config, not anything "lower level" that is reused
from other places.

Change-Id: I0cd593fd3e5558178ddd0ad8fff5c596e022894a
 2020-05-23 13:08:24 +02:00
Jan Kundrát
46f89aa770 coding style: autopep8 in an aggressive mode (-aaaaaaaaaa) 
I decided to skip the following chunk of the diff because I think that
it would actually made the code a bit harder to read:

diff --git gnpy/core/service_sheet.py gnpy/core/service_sheet.py
index 9965840..9834111 100644
--- gnpy/core/service_sheet.py
+++ gnpy/core/service_sheet.py
@@ -41,8 +41,22 @@ logger = getLogger(__name__)

 class Request(namedtuple('Request', 'request_id source destination trx_type mode \
     spacing power nb_channel disjoint_from nodes_list is_loose path_bandwidth')):
-    def __new__(cls, request_id, source, destination, trx_type,  mode=None, spacing=None, power=None, nb_channel=None, disjoint_from='',  nodes_list=None, is_loose='', path_bandwidth=None):
-        return super().__new__(cls, request_id, source, destination, trx_type, mode, spacing, power, nb_channel, disjoint_from,  nodes_list, is_loose, path_bandwidth)
+    def __new__(
+            cls,
+            request_id,
+            source,
+            destination,
+            trx_type,
+            mode=None,
+            spacing=None,
+            power=None,
+            nb_channel=None,
+            disjoint_from='',
+            nodes_list=None,
+            is_loose='',
+            path_bandwidth=None):
+        return super().__new__(cls, request_id, source, destination, trx_type, mode, spacing,
+                               power, nb_channel, disjoint_from, nodes_list, is_loose, path_bandwidth)

 # Type for output data:  // from dutc

diff --git tests/test_automaticmodefeature.py tests/test_automaticmodefeature.py
index 0e5f633..5ba5881 100644
--- tests/test_automaticmodefeature.py
+++ tests/test_automaticmodefeature.py
@@ -32,7 +32,26 @@ eqpt_library_name = Path(__file__).parent.parent / 'tests/data/eqpt_config.json'
 @pytest.mark.parametrize("net", [network_file_name])
 @pytest.mark.parametrize("eqpt", [eqpt_library_name])
 @pytest.mark.parametrize("serv", [service_file_name])
-@pytest.mark.parametrize("expected_mode", [['16QAM', 'PS_SP64_1', 'PS_SP64_1', 'PS_SP64_1', 'mode 2 - fake', 'mode 2', 'PS_SP64_1', 'mode 3', 'PS_SP64_1', 'PS_SP64_1', '16QAM', 'mode 1', 'PS_SP64_1', 'PS_SP64_1', 'mode 1', 'mode 2', 'mode 1', 'mode 2', 'nok']])
+@pytest.mark.parametrize("expected_mode",
+                         [['16QAM',
+                           'PS_SP64_1',
+                           'PS_SP64_1',
+                           'PS_SP64_1',
+                           'mode 2 - fake',
+                           'mode 2',
+                           'PS_SP64_1',
+                           'mode 3',
+                           'PS_SP64_1',
+                           'PS_SP64_1',
+                           '16QAM',
+                           'mode 1',
+                           'PS_SP64_1',
+                           'PS_SP64_1',
+                           'mode 1',
+                           'mode 2',
+                           'mode 1',
+                           'mode 2',
+                           'nok']])
 def test_automaticmodefeature(net, eqpt, serv, expected_mode):
     equipment = load_equipment(eqpt)
     network = load_network(net, equipment)

Change-Id: I522c45c079b3a9540568657e2ae0a4bfc5fb1272
 2020-05-19 12:53:11 +02:00
Jan Kundrát
3548ed74e2 coding style: autopep --in-place --recursive --jobs 4 --max-line-length 120 gnpy/ tests/ 
Change-Id: I2f0fca5aa1314f9bb546a3e6dc712a42580cd562
 2020-05-19 12:40:00 +02:00
Jan Kundrát
5af195bd2b Remove unused imports 
Change-Id: I66174048a9eaab0f79ba4c3b1d31ef4dc9c2009b
 2020-04-30 17:30:55 +02:00
Jan Kundrát
0aec47ddeb tests: remove dead code 
Change-Id: Id8bc0cae7d91b2a80032890b2e30c70be566d052
 2020-04-30 17:30:55 +02:00
Jan Kundrát
cd234a909b Remove unimplemented and unused code 2019-08-06 11:22:56 +02:00
Jan Kundrát
c249f44ea1 Remove property aliases 
For some reason, the code allowed using "convenience names" for
accessing properties since commit 58ac717f. To me, this looks like an
obvious anti-pattern because accessing a single property via three
different names only makes the code less readable. Let's kill this
"feature".

In case of the `Power` class, the code used "ase" and "nli" on the
majority of places, so let's use these abbreviations instead of their
spelt-out variants.

SpectralInformation was "clean" already, but there were calls to the
`update()` wrapper around the `namedtuple._replace`.  Given that there
were no property aliases, it's safe to just call `_replace()` directly.

In case of the `Pref` class, once again always use `p_span0`, `p_spani`
instead of `p0` and `pi` -- it's a trivial change.
 2019-08-06 11:14:28 +02:00
Jan Kundrát
c3499142b0 doc: hyperlinks++ 2019-06-06 23:47:52 +02:00
Jean-Luc Auge
a0f6380f90 improve power mode and gain mode 
power mode no longer reads operational_gain:
	now reads operational.dp_db
	or calculate optimum dp_db from next span loss
gain_mode:
	reads operational.gain_target
	or use gain_from_dp

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

squash to dp

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2019-04-03 14:08:34 +02:00
Jean-Luc Auge
3e55a5526a improve power saturation handling 
fix issue with low power level (after very long spans) where signal gian
was depleted

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2019-04-03 14:08:34 +02:00
Jean-Luc Auge
0338ccb08f restore SI basic parameters f_min f_max & spacing 
remove unnecessary SI parameters in eqpt config.json:
-rx osnr
-bit rate
-min spacing
-cost
remove nb_channel parameter when calling SI

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2019-01-22 18:05:19 +01:00
Jonas Mårtensson
f51061d650 Add support for Tx OSNR. 2018-12-11 16:59:05 +01:00
James Powell
2be616411f fix headers 2018-10-14 20:55:00 -04:00
James Powell
83444b329e strip whitespace 2018-10-14 20:54:22 -04:00
EstherLerouzic
29c4134f60 Add roll of factor in transponders library 
roll_off is a characteristic of a given mode of a transponder: it is now
integrated in the Transceiver library in eqpt_config.json. Default value is
provided in the SI field if no specific transponder type is input

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
 2018-07-16 18:11:02 +01:00
EstherLerouzic
a6157f328d Work contnued on fixing dutc merge with power feature of jla 
- adding relevant call in path_request_run
- unifying variable name: baudrat -> baud_rate
- correcting test with the new power features
- unifying naming of variables n_ch-> nb_channel, sink -> destination (this
  follows the usual naming in yang path computation models)
- bug fix in novel trx_mode_params function , use of the function in
  path_requests_un
- TODO : place roll-off in the tsp lib instead of SI

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
 2018-07-16 17:43:56 +01:00
Jean-Luc Auge
4a756bf2a9 Read trx parameters and find channel spacing&count 
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2018-07-13 13:45:05 +02:00
James Powell
7aba40cd5b fixed merge conflicts; added default pref value for SI 2018-07-10 10:35:42 -04:00
EstherLerouzic
6d49769df9 Refactor path_request_run and integration of functions to transmission 
- use load_equipment instead of load_SI
- integrate the pathrequest class into transmission main

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
 2018-07-05 18:33:04 +01:00
Jean-Luc Auge
0333e9d094 update amplifier test 
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2018-07-05 19:21:48 +02:00
EstherLerouzic
b9518ca987 Starting: adding path_requests_run functions to the "core" package 
- Path_request class is updated to be more generic and reuseable
  in transmission main example. json processing linked to the yang
  modelling is kept in the pat_request_run, while path_request class
  only contains useful attributes
- adding functions in info and request python files in core directory

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
 2018-07-05 15:48:11 +01:00
Jean-Luc Auge
b810cf84c2 Power mode implementation 
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2018-07-05 12:50:23 +02:00
Jean-Luc Auge
4f5325acac small fixes 
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2018-06-21 16:14:25 +02:00
Jean-Luc Auge
25cfc375bc Amplifier selection 
network design when no amplifiers are input in the json file
select_edfa chose the best amplifier in equipment list _from
eqpt_config.json_ wiht the following criteria in order:
1-amplifier wih sufficient gain
2-amplifier wiht sufficient power TODO
3-best NF amplifier staisfying 1 & 2

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2018-06-07 11:39:09 +02:00
James Powell
a6265c1b8d document modules 2018-03-20 21:32:02 -04:00
Jean-Luc Augé
0d3a86f1d8 code wrap up and edfa model augmentation v2 (#30) 
* JSON file based on Orange operator typical input
Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

* update of the standalone edfa model

creation of a new amlifier2.py = v2
creation of a json parser build_oa_json.py
the parser takes OA.json as input and newOA.json as output
creation of a pytest verification module amplifier_pytest.py

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

* put the code together and transmission example script

-basic dijkstra propagation
-ase noise propagation based on amplifier model
-fake nli noise propagation
-integration of the amplifier model
-interpolation function in the edfa class
-code cleaning and units harmonization

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

* mv transmission_main_example and rm _main__

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>

* 2nd edfa model and build_oa_json file

add a dual coil stages edfa model in case the nf polynomial fit is not known
add a build_oa_json file that convert the input files in
edfa_config.json file and pre-calculate the nf_model nf1, nf2 and
delta_p parameters
adding power violation check and input padding (below minimum gain) in the edfa model
class

Signed-off-by: Jean-Luc Auge <jeanluc.auge@orange.com>
 2018-02-20 12:51:53 -05:00
Gilad Goldfarb
a7d3c00e5b setup.py for package (#21) 2018-01-30 11:49:59 -05:00