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

Merge "Fix #353 - String representation of network elements" into develop

Browse Source
This commit is contained in:
Jan Kundrát
2020-04-30 15:29:07 +00:00
committed by Gerrit Code Review
parent efa05f0653 c87be89e07
commit 04544d41f6
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gnpy/core/elements.py
View File

@@ -147,6 +147,9 @@ class Roadm(Node):
return f'{type(self).__name__}(uid={self.uid!r}, loss={self.loss!r})' return f'{type(self).__name__}(uid={self.uid!r}, loss={self.loss!r})'
def __str__(self): def __str__(self):
if self.effective_loss is None:
return f'{type(self).__name__} {self.uid}'
return '\n'.join([f'{type(self).__name__} {self.uid}', return '\n'.join([f'{type(self).__name__} {self.uid}',
f' effective loss (dB): {self.effective_loss:.2f}', f' effective loss (dB): {self.effective_loss:.2f}',
f' pch out (dBm): {self.effective_pch_out_db!r}']) f' pch out (dBm): {self.effective_pch_out_db!r}'])
@@ -233,6 +236,7 @@ class Fiber(Node):
super().__init__(*args, params=FiberParams(**params), **kwargs) super().__init__(*args, params=FiberParams(**params), **kwargs)
self.carriers_in = None self.carriers_in = None
self.carriers_out = None self.carriers_out = None
self.pch_out_db = None
self.nli_solver = NliSolver(self) self.nli_solver = NliSolver(self)
@property @property
@@ -260,6 +264,9 @@ class Fiber(Node):
f'loss={round(self.loss,1)!r}dB)' f'loss={round(self.loss,1)!r}dB)'
def __str__(self): def __str__(self):
if self.pch_out_db is None:
return f'{type(self).__name__} {self.uid}'
return '\n'.join([f'{type(self).__name__} {self.uid}', return '\n'.join([f'{type(self).__name__} {self.uid}',
f' type_variety: {self.type_variety}', f' type_variety: {self.type_variety}',
f' length (km): ' f' length (km): '