Merge changes from topic "mixed-rate"

* changes:
  Change saturation verification to total input power
  Prepare for Pref definition
  Add utilities

.docker-travis.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-IMAGE_NAME=telecominfraproject/oopt-gnpy
-IMAGE_TAG=$(git describe --tags)
-
-ALREADY_FOUND=0
-docker pull ${IMAGE_NAME}:${IMAGE_TAG} && ALREADY_FOUND=1
-
-if [[ $ALREADY_FOUND == 0 ]]; then
-  docker build . -t ${IMAGE_NAME}
-  docker tag ${IMAGE_NAME} ${IMAGE_NAME}:${IMAGE_TAG}
-
-  # shared directory setup: do not clobber the real data
-  mkdir trash
-  cd trash
-  docker run -it --rm --volume $(pwd):/shared ${IMAGE_NAME} gnpy-transmission-example
-else
-  echo "Image ${IMAGE_NAME}:${IMAGE_TAG} already available, will just update the other tags"
-fi
-
-docker images
-
-do_docker_login() {
-  echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
-}
-
-if [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
-  if [[ "${TRAVIS_BRANCH}" == "develop" || "${TRAVIS_BRANCH}" == "docker" ]]; then
-    echo "Publishing latest"
-    docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest
-    do_docker_login
-    if [[ $ALREADY_FOUND == 0 ]]; then
-      docker push ${IMAGE_NAME}:${IMAGE_TAG}
-    fi
-    docker push ${IMAGE_NAME}:latest
-  elif [[ "${TRAVIS_BRANCH}" == "master" ]]; then
-    echo "Publishing stable"
-    docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:stable
-    do_docker_login
-    if [[ $ALREADY_FOUND == 0 ]]; then
-      docker push ${IMAGE_NAME}:${IMAGE_TAG}
-    fi
-    docker push ${IMAGE_NAME}:stable
-  fi
-fi

.github/workflows/main.yml

@@ -23,6 +23,7 @@ jobs:
         with:
           files: ${{ github.workspace }}/cover/coverage.xml
     strategy:
+      fail-fast: false
       matrix:
         tox_env:
           - py38
@@ -92,9 +93,9 @@ jobs:
             telecominfraproject/oopt-gnpy:${{ steps.extract_tag_name.outputs.GIT_DESC }}
             telecominfraproject/oopt-gnpy:latest
 
-  windows:
+  other-platforms:
-    name: Tests on Windows
+    name: Tests on other platforms
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -103,10 +104,14 @@ jobs:
         with:
           python-version: ${{ matrix.python_version }}
       - run: |
+          pip install -r tests/requirements.txt
           pip install --editable .
-          pip install 'pytest>=6.2.5,<7'
           pytest -vv
     strategy:
+      fail-fast: false
       matrix:
-        python_version:
+        include:
-          - "3.10"
+          - os: windows-2019
+            python_version: "3.10"
+          - os: macos-12
+            python_version: "3.10"

.travis.yml

@@ -1,27 +0,0 @@
-dist: focal
-os: linux
-language: python
-services: docker
-python:
-  - "3.8"
-  - "3.9"
-before_install:
-  - sudo apt-get -y install graphviz
-install: skip
-script:
-  - pip install --editable .
-  - pip install pytest-cov rstcheck
-  - pytest --cov-report=xml --cov=gnpy -v
-  - pip install -r docs/requirements.txt
-  - rstcheck --ignore-roles cite *.rst
-  - sphinx-build -W --keep-going docs/ x-throwaway-location
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-jobs:
-  include:
-    - stage: test
-      name: Docker image
-      script:
-        - git fetch --unshallow
-        - ./.docker-travis.sh
-        - docker images

README.md

@@ -26,4 +26,6 @@ This example demonstrates how GNPy can be used to check the expected SNR at the
 ![Running a simple simulation example](https://telecominfraproject.github.io/oopt-gnpy/docs/images/transmission_main_example.svg)
 
 GNPy can do much more, including acting as a Path Computation Engine, tracking bandwidth requests, or advising the SDN controller about a best possible path through a large DWDM network.
-Learn more about this [in the documentation](https://gnpy.readthedocs.io/).
+Learn more about this [in the documentation](https://gnpy.readthedocs.io/), or give it a [try online at `gnpy.app`](https://gnpy.app/):
+
+[![Path propagation at gnpy.app](docs/images/2022-04-12-gnpy-app.png)](https://gnpy.app/)

docs/concepts.rst

@@ -29,7 +29,7 @@ This path is directional, and all "GNPy elements" along the path match the unidi
 
 The network topology contains not just the physical topology of the network, but also references to the :ref:`equipment library<concepts-equipment>` and a set of *operating parameters* for each entity.
 These parameters include the **fiber length** of each fiber, the connector **attenutation losses**, or an amplifier's specific **gain setting**.
-The topology is specified via :ref:`XLS files<excel>` or via :ref:`JSON<json>`.
+The topology is specified via :ref:`XLS files<excel>` or via :ref:`JSON<legacy-json>`.
 
 .. _complete-vs-incomplete:
 

docs/extending.rst

@@ -100,10 +100,10 @@ Raman Amplifiers
 
 An accurate simulation of Raman amplification requires knowledge of:
 
-- the *power* and *wavelength* of all Raman pumping lasers,
+* the *power* and *wavelength* of all Raman pumping lasers,
-- the *direction*, whether it is co-propagating or counter-propagating,
+* the *direction*, whether it is co-propagating or counter-propagating,
-- the Raman efficiency of the fiber,
+* the Raman efficiency of the fiber,
-- the fiber temperature.
+* the fiber temperature.
 
 Under certain scenarios it is useful to be able to run a simulation without an accurate Raman description.
 For these purposes, it is possible to approximate a Raman amplifier via a fixed-gain EDFA with the :ref:`polynomial NF<ext-nf-model-polynomial-NF>` model using :math:`\text{a} = \text{b} = \text{c} = 0`, and a desired effective :math:`\text{d} = NF`.

docs/json.rst

@@ -1,4 +1,4 @@
-.. _json:
+.. _legacy-json:
 
 JSON Input Files
 ================

gnpy/core/elements.py

@@ -26,7 +26,7 @@ from scipy.constants import h, c
 from scipy.interpolate import interp1d
 from collections import namedtuple
 
-from gnpy.core.utils import lin2db, db2lin, arrange_frequencies, snr_sum
+from gnpy.core.utils import lin2db, db2lin, arrange_frequencies, snr_sum, watt2dbm
 from gnpy.core.parameters import RoadmParams, FusedParams, FiberParams, PumpParams, EdfaParams, EdfaOperational
 from gnpy.core.science_utils import NliSolver, RamanSolver
 from gnpy.core.info import SpectralInformation
@@ -216,21 +216,21 @@ class Roadm(_Node):
         if not params:
             params = {}
         super().__init__(*args, params=RoadmParams(**params), **kwargs)
-        self.pch_out_db = self.params.target_pch_out_db
+        self.ref_pch_out_dbm = self.params.target_pch_out_db
         self.loss = 0  # auto-design interest
         self.effective_loss = None
         self.passive = True
         self.restrictions = self.params.restrictions
-        self.per_degree_pch_out_db = self.params.per_degree_pch_out_db
+        self.per_degree_pch_out_dbm = self.params.per_degree_pch_out_db
 
     @property
     def to_json(self):
         return {'uid': self.uid,
                 'type': type(self).__name__,
                 'params': {
-                    'target_pch_out_db': self.pch_out_db,
+                    'target_pch_out_db': self.ref_pch_out_dbm,
                     'restrictions': self.restrictions,
-                    'per_degree_pch_out_db': self.per_degree_pch_out_db
+                    'per_degree_pch_out_db': self.per_degree_pch_out_dbm
                     },
                 'metadata': {
                     'location': self.metadata['location']._asdict()
@@ -246,7 +246,7 @@ class Roadm(_Node):
 
         return '\n'.join([f'{type(self).__name__} {self.uid}',
                           f'  effective loss (dB):  {self.effective_loss:.2f}',
-                          f'  pch out (dBm):        {self.pch_out_db:.2f}'])
+                          f'  pch out (dBm):        {self.ref_pch_out_dbm:.2f}'])
 
     def propagate(self, spectral_info, degree):
         # pin_target and loss are read from eqpt_config.json['Roadm']
@@ -258,10 +258,17 @@ class Roadm(_Node):
         # if the input power is lower than the target one, use the input power instead because
         # a ROADM doesn't amplify, it can only attenuate
         # TODO maybe add a minimum loss for the ROADM
-        per_degree_pch = self.per_degree_pch_out_db[degree] \
+        per_degree_pch = self.per_degree_pch_out_dbm.get(degree, self.ref_pch_out_dbm)
-            if degree in self.per_degree_pch_out_db else self.pch_out_db
+        # Definition of ref_pch_out_dbm for the reference channel:
-        self.pch_out_db = min(spectral_info.pref.p_spani, per_degree_pch)
+        # Depending on propagation upstream from this ROADM, the input power (p_spani) might be smaller than
-        self.effective_loss = spectral_info.pref.p_spani - self.pch_out_db
+        # the target power out configured for this ROADM degree's egress. Since ROADM does not amplify,
+        # the power out of the ROADM for the ref channel is the min value between target power and input power.
+        # (TODO add a minimum loss for the ROADM crossing)
+        self.ref_pch_out_dbm = min(spectral_info.pref.p_spani, per_degree_pch)
+        # Definition of effective_loss:
+        # Optical power of carriers are equalized by the ROADM, so that the experienced loss is not the same for
+        # different carriers. effective_loss records the loss for a reference carrier.
+        self.effective_loss = spectral_info.pref.p_spani - self.ref_pch_out_dbm
         input_power = spectral_info.signal + spectral_info.nli + spectral_info.ase
         min_power = min(lin2db(input_power * 1e3))
         per_degree_pch = per_degree_pch if per_degree_pch < min_power else min_power
@@ -271,7 +278,8 @@ class Roadm(_Node):
         spectral_info.pdl = sqrt(spectral_info.pdl ** 2 + self.params.pdl ** 2)
 
     def update_pref(self, spectral_info):
-        spectral_info.pref = spectral_info.pref._replace(p_span0=spectral_info.pref.p_span0, p_spani=self.pch_out_db)
+        spectral_info.pref = spectral_info.pref._replace(p_span0=spectral_info.pref.p_span0,
+                                                         p_spani=self.ref_pch_out_dbm)
 
     def __call__(self, spectral_info, degree):
         self.propagate(spectral_info, degree=degree)
@@ -639,7 +647,7 @@ class Edfa(_Node):
 
         self.nch = spectral_info.number_of_channels
         pin = spectral_info.signal + spectral_info.ase + spectral_info.nli
-        self.pin_db = lin2db(sum(pin * 1e3))
+        self.pin_db = watt2dbm(sum(pin))
         # The following should be changed when we have the new spectral information including slot widths.
         # For now, with homogeneous spectrum, we can calculate it as the difference between neighbouring channels.
         self.slot_width = self.channel_freq[1] - self.channel_freq[0]
@@ -652,15 +660,14 @@ class Edfa(_Node):
             self.effective_gain = self.target_pch_out_db - pref.p_spani
 
         """check power saturation and correct effective gain & power accordingly:"""
+        # Compute the saturation accounting for actual power at the input of the amp
         self.effective_gain = min(
             self.effective_gain,
-            self.params.p_max - (pref.p_spani + pref.neq_ch)
+            self.params.p_max - self.pin_db
         )
-        #print(self.uid, self.effective_gain, self.operational.gain_target)
         self.effective_pch_out_db = round(pref.p_spani + self.effective_gain, 2)
 
         """check power saturation and correct target_gain accordingly:"""
-        #print(self.uid, self.effective_gain, self.pin_db, pref.p_spani)
         self.nf = self._calc_nf()
         self.gprofile = self._gain_profile(pin)
 

gnpy/core/network.py

@@ -238,7 +238,7 @@ def set_egress_amplifier(network, this_node, equipment, pref_ch_db, pref_total_d
     """
     power_mode = equipment['Span']['default'].power_mode
     next_oms = (n for n in network.successors(this_node) if not isinstance(n, elements.Transceiver))
-    this_node_degree = {k: v for k, v in this_node.per_degree_pch_out_db.items()} if hasattr(this_node, 'per_degree_pch_out_db') else {}
+    this_node_degree = getattr(this_node, 'per_degree_pch_out_dbm', {})
     for oms in next_oms:
         # go through all the OMS departing from the ROADM
         prev_node = this_node
@@ -334,7 +334,7 @@ def set_egress_amplifier(network, this_node, equipment, pref_ch_db, pref_total_d
             # print(f'{node.uid}')
 
     if isinstance(this_node, elements.Roadm):
-        this_node.per_degree_pch_out_db = {k: v for k, v in this_node_degree.items()}
+        this_node.per_degree_pch_out_dbm = {k: v for k, v in this_node_degree.items()}
 
 
 def add_roadm_booster(network, roadm):

gnpy/core/science_utils.py

@@ -10,7 +10,7 @@ Solver definitions to calculate the Raman effect and the nonlinear interference
 The solvers take as input instances of the spectral information, the fiber and the simulation parameters
 """
 
-from numpy import interp, pi, zeros, shape, where, cos, array, append, ones, exp, arange, sqrt, empty, trapz, arcsinh, \
+from numpy import interp, pi, zeros, shape, where, cos, array, append, ones, exp, arange, sqrt, trapz, arcsinh, \
     clip, abs, sum, concatenate, flip, outer, inner, transpose, max, format_float_scientific, diag, prod, argwhere, \
     unique, argsort, cumprod
 from logging import getLogger
@@ -131,20 +131,20 @@ class RamanSolver:
                 cnt_frequency = array([pump.frequency for pump in fiber.raman_pumps
                                        if pump.propagation_direction == 'counterprop'])
                 # Co-propagating profile initialization
-                co_power_profile = empty([co_frequency.size, z.size])
+                co_power_profile = zeros([co_frequency.size, z.size])
                 if co_frequency.size:
                     co_cr = fiber.cr(co_frequency)
                     co_alpha = fiber.alpha(co_frequency)
                     co_power_profile = \
                         RamanSolver.first_order_derivative_solution(co_power, co_alpha, co_cr, z, lumped_losses)
                 # Counter-propagating profile initialization
-                cnt_power_profile = empty([co_frequency.size, z.size])
+                cnt_power_profile = zeros([cnt_frequency.size, z.size])
                 if cnt_frequency.size:
                     cnt_cr = fiber.cr(cnt_frequency)
                     cnt_alpha = fiber.alpha(cnt_frequency)
                     cnt_power_profile = \
                         flip(RamanSolver.first_order_derivative_solution(cnt_power, cnt_alpha, cnt_cr,
-                                                                         z[-1] - flip(z), flip(lumped_losses)))
+                                                                         z[-1] - flip(z), flip(lumped_losses)), axis=1)
                 # Co-propagating and Counter-propagating Profile Computation
                 if co_frequency.size and cnt_frequency.size:
                     co_power_profile, cnt_power_profile = \

gnpy/core/utils.py

@@ -106,6 +106,69 @@ def db2lin(value):
     return 10**(value / 10)
 
 
+def watt2dbm(value):
+    """Convert Watt units to dBm
+
+    >>> round(watt2dbm(0.001), 1)
+    0.0
+    >>> round(watt2dbm(0.02), 1)
+    13.0
+    """
+    return lin2db(value * 1e3)
+
+
+def dbm2watt(value):
+    """Convert dBm units to Watt
+
+    >>> round(dbm2watt(0), 4)
+    0.001
+    >>> round(dbm2watt(-3), 4)
+    0.0005
+    >>> round(dbm2watt(13), 4)
+    0.02
+    """
+    return db2lin(value) * 1e-3
+
+
+def psd2powerdbm(psd_mwperghz, baudrate_baud):
+    """computes power in dBm based on baudrate in bauds and psd in mW/GHz
+
+    >>> round(psd2powerdbm(0.031176, 64e9),3)
+    3.0
+    >>> round(psd2powerdbm(0.062352, 32e9),3)
+    3.0
+    >>> round(psd2powerdbm(0.015625, 64e9),3)
+    0.0
+    """
+    return lin2db(baudrate_baud * psd_mwperghz * 1e-9)
+
+
+def power_dbm_to_psd_mw_ghz(power_dbm, baudrate_baud):
+    """computes power spectral density in  mW/GHz based on baudrate in bauds and power in dBm
+
+    >>> power_dbm_to_psd_mw_ghz(0, 64e9)
+    0.015625
+    >>> round(power_dbm_to_psd_mw_ghz(3, 64e9), 6)
+    0.031176
+    >>> round(power_dbm_to_psd_mw_ghz(3, 32e9), 6)
+    0.062352
+    """
+    return db2lin(power_dbm) / (baudrate_baud * 1e-9)
+
+
+def psd_mw_per_ghz(power_watt, baudrate_baud):
+    """computes power spectral density in  mW/GHz based on baudrate in bauds and power in W
+
+    >>> psd_mw_per_ghz(2e-3, 32e9)
+    0.0625
+    >>> psd_mw_per_ghz(1e-3, 64e9)
+    0.015625
+    >>> psd_mw_per_ghz(0.5e-3, 32e9)
+    0.015625
+    """
+    return power_watt * 1e3 / (baudrate_baud * 1e-9)
+
+
 def round2float(number, step):
     """Round a floating point number so that its "resolution" is not bigger than 'step'
 

gnpy/topology/request.py

@@ -1142,6 +1142,7 @@ def compute_path_with_disjunction(network, equipment, pathreqlist, pathlist):
                         pathreq.OSNR = mode['OSNR']
                         pathreq.tx_osnr = mode['tx_osnr']
                         pathreq.bit_rate = mode['bit_rate']
+                        pathreq.penalties = mode['penalties']
                     # other blocking reason should not appear at this point
                 except AttributeError:
                     pathreq.baud_rate = mode['baud_rate']
@@ -1150,6 +1151,7 @@ def compute_path_with_disjunction(network, equipment, pathreqlist, pathlist):
                     pathreq.OSNR = mode['OSNR']
                     pathreq.tx_osnr = mode['tx_osnr']
                     pathreq.bit_rate = mode['bit_rate']
+                    pathreq.penalties = mode['penalties']
 
             # reversed path is needed for correct spectrum assignment
             reversed_path = find_reversed_path(pathlist[i])

tests/data/default_edfa_config.json

@@ -196,101 +196,101 @@
         0.0
     ],
     "dgt": [
-        2.714526681131686,
+        1.0,
-        2.705443819238505,
-        2.6947834587664494,
-        2.6841217449620203,
-        2.6681935771243177,
-        2.6521732021128046,
-        2.630396440815385,
-        2.602860350286428,
-        2.5696460593920065,
-        2.5364027376452056,
-        2.499446286796604,
-        2.4587748041127506,
-        2.414398437185221,
-        2.3699990328716107,
-        2.322373696229342,
-        2.271520771371253,
-        2.2174389328192197,
-        2.16337565384239,
-        2.1183028432496016,
-        2.082225099873648,
-        2.055100772005235,
-        2.0279625371819305,
-        2.0008103857988204,
-        1.9736443063300082,
-        1.9482128147680253,
-        1.9245345552113182,
-        1.9026104247588487,
-        1.8806927939516411,
-        1.862235672444246,
-        1.847275503201129,
-        1.835814081380705,
-        1.824381436842932,
-        1.8139629377087627,
-        1.8045606557581335,
-        1.7961751115773796,
-        1.7877868031023945,
-        1.7793941781790852,
-        1.7709972329654864,
-        1.7625959636196327,
-        1.7541903672600494,
-        1.7459181197626403,
-        1.737780757913635,
-        1.7297783508684146,
-        1.7217732861435076,
-        1.7137640932265894,
-        1.7057507692361864,
-        1.6918150918099673,
-        1.6719047669939942,
-        1.6460167077689267,
-        1.6201194134191075,
-        1.5986915141218316,
-        1.5817353179379183,
-        1.569199764184379,
-        1.5566577309558969,
-        1.545374152761467,
-        1.5353620432989845,
-        1.5266220576235803,
-        1.5178910621476225,
-        1.5097346239790443,
-        1.502153039909686,
-        1.495145456062699,
-        1.488134243479226,
-        1.48111939735681,
-        1.474100442252211,
-        1.4670307626366115,
-        1.4599103316162523,
-        1.45273959485914,
-        1.445565137158368,
-        1.4340878115214444,
-        1.418273806730323,
-        1.3981208704326855,
-        1.3779439775587023,
-        1.3598972673004606,
-        1.3439818461440451,
-        1.3301807335621048,
-        1.316383926863083,
-        1.3040618749785347,
-        1.2932153453410835,
-        1.2838336236692311,
-        1.2744470198196236,
-        1.2650555289898042,
-        1.2556591482982988,
-        1.2428104897182262,
-        1.2264996957264114,
-        1.2067249615595257,
-        1.1869318618366975,
-        1.1672278304018044,
-        1.1476135933863398,
-        1.1280891949729075,
-        1.108555289615659,
-        1.0895983485572227,
-        1.0712204022764056,
-        1.0534217504465226,
-        1.0356155337864215,
         1.017807767853702,
-        1.0
+        1.0356155337864215,
+        1.0534217504465226,
+        1.0712204022764056,
+        1.0895983485572227,
+        1.108555289615659,
+        1.1280891949729075,
+        1.1476135933863398,
+        1.1672278304018044,
+        1.1869318618366975,
+        1.2067249615595257,
+        1.2264996957264114,
+        1.2428104897182262,
+        1.2556591482982988,
+        1.2650555289898042,
+        1.2744470198196236,
+        1.2838336236692311,
+        1.2932153453410835,
+        1.3040618749785347,
+        1.316383926863083,
+        1.3301807335621048,
+        1.3439818461440451,
+        1.3598972673004606,
+        1.3779439775587023,
+        1.3981208704326855,
+        1.418273806730323,
+        1.4340878115214444,
+        1.445565137158368,
+        1.45273959485914,
+        1.4599103316162523,
+        1.4670307626366115,
+        1.474100442252211,
+        1.48111939735681,
+        1.488134243479226,
+        1.495145456062699,
+        1.502153039909686,
+        1.5097346239790443,
+        1.5178910621476225,
+        1.5266220576235803,
+        1.5353620432989845,
+        1.545374152761467,
+        1.5566577309558969,
+        1.569199764184379,
+        1.5817353179379183,
+        1.5986915141218316,
+        1.6201194134191075,
+        1.6460167077689267,
+        1.6719047669939942,
+        1.6918150918099673,
+        1.7057507692361864,
+        1.7137640932265894,
+        1.7217732861435076,
+        1.7297783508684146,
+        1.737780757913635,
+        1.7459181197626403,
+        1.7541903672600494,
+        1.7625959636196327,
+        1.7709972329654864,
+        1.7793941781790852,
+        1.7877868031023945,
+        1.7961751115773796,
+        1.8045606557581335,
+        1.8139629377087627,
+        1.824381436842932,
+        1.835814081380705,
+        1.847275503201129,
+        1.862235672444246,
+        1.8806927939516411,
+        1.9026104247588487,
+        1.9245345552113182,
+        1.9482128147680253,
+        1.9736443063300082,
+        2.0008103857988204,
+        2.0279625371819305,
+        2.055100772005235,
+        2.082225099873648,
+        2.1183028432496016,
+        2.16337565384239,
+        2.2174389328192197,
+        2.271520771371253,
+        2.322373696229342,
+        2.3699990328716107,
+        2.414398437185221,
+        2.4587748041127506,
+        2.499446286796604,
+        2.5364027376452056,
+        2.5696460593920065,
+        2.602860350286428,
+        2.630396440815385,
+        2.6521732021128046,
+        2.6681935771243177,
+        2.6841217449620203,
+        2.6947834587664494,
+        2.705443819238505,
+        2.714526681131686
     ]
 }

tests/data/testTopology_response.json

@@ -1258,7 +1258,7 @@
           },
           {
             "metric-type": "SNR-0.1nm",
-            "accumulative-value": 28.77
+            "accumulative-value": 28.78
           },
           {
             "metric-type": "OSNR-bandwidth",

tests/data/testTopology_response_expected.csv

@@ -3,5 +3,5 @@ response-id,source,destination,path_bandwidth,Pass?,nb of tsp pairs,total cost,t
 1,trx Brest_KLA,trx Vannes_KBE,10.0,True,1,1,Voyager,mode 1,22.65,22.11,18.03,32.0,1.0,trx Brest_KLA | roadm Brest_KLA | east edfa in Brest_KLA to Morlaix | fiber (Brest_KLA → Morlaix)-F060 | east fused spans in Morlaix | fiber (Morlaix → Lannion_CAS)-F059 | west edfa in Lannion_CAS to Morlaix | roadm Lannion_CAS | east edfa in Lannion_CAS to Corlay | fiber (Lannion_CAS → Corlay)-F061 | west fused spans in Corlay | fiber (Corlay → Loudeac)-F010 | west fused spans in Loudeac | fiber (Loudeac → Lorient_KMA)-F054 | west edfa in Lorient_KMA to Loudeac | roadm Lorient_KMA | east edfa in Lorient_KMA to Vannes_KBE | fiber (Lorient_KMA → Vannes_KBE)-F055 | west edfa in Vannes_KBE to Lorient_KMA | roadm Vannes_KBE | trx Vannes_KBE,"-276, 4",,,
 3,trx Lannion_CAS,trx Rennes_STA,60.0,True,1,1,vendorA_trx-type1,mode 1,28.29,25.85,21.77,32.0,1.0,trx Lannion_CAS | roadm Lannion_CAS | east edfa in Lannion_CAS to Stbrieuc | fiber (Lannion_CAS → Stbrieuc)-F056 | east edfa in Stbrieuc to Rennes_STA | fiber (Stbrieuc → Rennes_STA)-F057 | west edfa in Rennes_STA to Stbrieuc | roadm Rennes_STA | trx Rennes_STA,"-284, 4",,,
 4,trx Rennes_STA,trx Lannion_CAS,150.0,True,1,1,vendorA_trx-type1,mode 2,22.27,22.15,15.05,64.0,0.0,trx Rennes_STA | roadm Rennes_STA | east edfa in Rennes_STA to Ploermel | fiber (Rennes_STA → Ploermel)- | east edfa in Ploermel to Vannes_KBE | fiber (Ploermel → Vannes_KBE)- | west edfa in Vannes_KBE to Ploermel | roadm Vannes_KBE | east edfa in Vannes_KBE to Lorient_KMA | fiber (Vannes_KBE → Lorient_KMA)-F055 | west edfa in Lorient_KMA to Vannes_KBE | roadm Lorient_KMA | east edfa in Lorient_KMA to Loudeac | fiber (Lorient_KMA → Loudeac)-F054 | east fused spans in Loudeac | fiber (Loudeac → Corlay)-F010 | east fused spans in Corlay | fiber (Corlay → Lannion_CAS)-F061 | west edfa in Lannion_CAS to Corlay | roadm Lannion_CAS | trx Lannion_CAS,"-266, 6",,,
-5,trx Rennes_STA,trx Lannion_CAS,20.0,True,1,1,vendorA_trx-type1,mode 2,30.79,28.77,21.68,64.0,3.0,trx Rennes_STA | roadm Rennes_STA | east edfa in Rennes_STA to Stbrieuc | fiber (Rennes_STA → Stbrieuc)-F057 | west edfa in Stbrieuc to Rennes_STA | fiber (Stbrieuc → Lannion_CAS)-F056 | west edfa in Lannion_CAS to Stbrieuc | roadm Lannion_CAS | trx Lannion_CAS,"-274, 6",,,
+5,trx Rennes_STA,trx Lannion_CAS,20.0,True,1,1,vendorA_trx-type1,mode 2,30.79,28.78,21.68,64.0,3.0,trx Rennes_STA | roadm Rennes_STA | east edfa in Rennes_STA to Stbrieuc | fiber (Rennes_STA → Stbrieuc)-F057 | west edfa in Stbrieuc to Rennes_STA | fiber (Stbrieuc → Lannion_CAS)-F056 | west edfa in Lannion_CAS to Stbrieuc | roadm Lannion_CAS | trx Lannion_CAS,"-274, 6",,,
 6,,,,NO_PATH,,,,,,,,,,,,,,

tests/data/test_lumped_losses_raman_fiber.csv

@@ -1,98 +1,98 @@
-1.000000000000000021e-03,6.059428294303585358e-04,4.124436878765448634e-04,2.874462507798667202e-04,2.103923932407651741e-04,1.678414792051835720e-04,1.547359756068614396e-04,1.816771264024174659e-04,3.223716208702616772e-04
+1.000000000000000021e-03,6.059596816131984903e-04,4.124540545641951000e-04,2.874328952539468305e-04,2.103398919772851445e-04,1.677242405549142946e-04,1.544863001982801454e-04,1.810521006745035243e-04,3.200643516934312716e-04
-1.000000000000000021e-03,6.053134417926274479e-04,4.117055522849718272e-04,2.867345754340725936e-04,2.097129658661858059e-04,1.671408382188599656e-04,1.538980727463440737e-04,1.804148897825019347e-04,3.196786917797407482e-04
+1.000000000000000021e-03,6.053276391419512917e-04,4.117105797931639192e-04,2.867132476380170980e-04,2.096494018677202108e-04,1.670078900317705016e-04,1.536235748319029191e-04,1.797412011853683042e-04,3.172302656811062894e-04
-1.000000000000000021e-03,6.046849734433535663e-04,4.109690875237402238e-04,2.860250085842350751e-04,2.090360511584246736e-04,1.664434237997556567e-04,1.530650313352837862e-04,1.791618737991747007e-04,3.170092948646618079e-04
+1.000000000000000021e-03,6.046965215788322606e-04,4.109687952835336887e-04,2.859957486816950244e-04,2.089614974033423851e-04,1.662949011112697126e-04,1.527659914515381017e-04,1.784402430016445015e-04,3.144223032044235564e-04
-1.000000000000000021e-03,6.040574211994215528e-04,4.102342878398261821e-04,2.853175420730359193e-04,2.083616379079277403e-04,1.657492189637676920e-04,1.522368203677859210e-04,1.779180061767344980e-04,3.143632101370558260e-04
+1.000000000000000021e-03,6.040663257237133005e-04,4.102286952029449651e-04,2.852803900268787471e-04,2.082761669373014350e-04,1.655852558250782110e-04,1.519135165004971508e-04,1.771491455864908956e-04,3.116402083285431824e-04
-1.000000000000000021e-03,6.034068048547004811e-04,4.094522032835132145e-04,2.845379038962591819e-04,2.075849237814657072e-04,1.649065028354379026e-04,1.511673145690444625e-04,1.761800891032866087e-04,3.101696013411107001e-04
+1.000000000000000021e-03,6.034134049131552151e-04,4.094420572177277762e-04,2.844940684888993296e-04,2.074903534701979157e-04,1.647299311261353841e-04,1.508247978694524506e-04,1.753757648572244786e-04,3.073546770239318966e-04
-1.000000000000000021e-03,6.027571485450614400e-04,4.086719523190792173e-04,2.837607352174946669e-04,2.068114158243908936e-04,1.640683639230874002e-04,1.501056331894667201e-04,1.744595725998800725e-04,3.060328853710948794e-04
+1.000000000000000021e-03,6.027614491955140619e-04,4.086572704905903084e-04,2.837102537033676193e-04,2.067078158689920062e-04,1.638793172508614261e-04,1.497441922066543145e-04,1.736205593148946460e-04,3.031290170068882115e-04
-1.000000000000000021e-03,6.021084488423111532e-04,4.078935283235860985e-04,2.829860258399657913e-04,2.060410983394430761e-04,1.632347745793864737e-04,1.490517152618393740e-04,1.727562758069566841e-04,3.019522704750103072e-04
+1.000000000000000021e-03,6.021104551256277167e-04,4.078743283205443272e-04,2.829289352705667755e-04,2.059285379676389937e-04,1.630333854029286287e-04,1.486716352337672398e-04,1.718833358612950819e-04,2.989623714008152688e-04
-1.000000000000000021e-03,6.014584946769776846e-04,4.071145901524401327e-04,2.822117789926256531e-04,2.052723360542508288e-04,1.624043320606193702e-04,1.480041851535097400e-04,1.710684425093964716e-04,2.979241342510260699e-04
+1.000000000000000021e-03,6.014582116574243619e-04,4.070908897338878368e-04,2.821481168500803620e-04,2.051508852341138217e-04,1.621907338278938133e-04,1.476057520309239507e-04,1.701623353591907634e-04,2.948510854465446421e-04
-1.000000000000000021e-03,6.008072907871274187e-04,4.063351463691671850e-04,2.814380028310788616e-04,2.045051334722086352e-04,1.615770319309204608e-04,1.469630126571907884e-04,1.693959447695294284e-04,2.939478272988644745e-04
+1.000000000000000021e-03,6.008047235362061304e-04,4.063069632907822604e-04,2.813678065291968134e-04,2.043748619094956848e-04,1.613513572535205565e-04,1.465465096091600223e-04,1.684574188261711764e-04,2.907944492354505236e-04
-1.000000000000000021e-03,6.001497788207915121e-04,4.055445944921290597e-04,2.806482406689155018e-04,2.037157793952982566e-04,1.607178158735042268e-04,1.458699426620449350e-04,1.676159912510077627e-04,2.896237141368235984e-04
+1.000000000000000021e-03,6.001451360530016092e-04,4.055123728737173791e-04,2.805722092000019225e-04,2.035777116783122080e-04,1.604816172174310248e-04,1.454380432794140279e-04,1.666509749540511247e-04,2.864106919229302104e-04
-1.000000000000000021e-03,5.994910374944025042e-04,4.047535948218318100e-04,2.798590565363265966e-04,2.029281739019909579e-04,1.598620980598530251e-04,1.447840125437445142e-04,1.658536074234625343e-04,2.853613427461420497e-04
+1.000000000000000021e-03,5.994843238884264500e-04,4.047173509812383436e-04,2.797772242168449484e-04,2.027823739011739494e-04,1.596154967418240479e-04,1.443369747762361644e-04,1.648627759919576703e-04,2.820911717580149220e-04
-1.000000000000000021e-03,5.988260139740232213e-04,4.039566207302157830e-04,2.790656268334378021e-04,2.021383019157014865e-04,1.590064003284783227e-04,1.437018088215471850e-04,1.641044980680633682e-04,2.811520890672289147e-04
+1.000000000000000021e-03,5.988172342183890103e-04,4.039163714190686103e-04,2.789780293498389497e-04,2.019848363041463460e-04,1.587495225986212185e-04,1.432398991427229250e-04,1.630885426393815433e-04,2.778273023594395367e-04
-1.000000000000000021e-03,5.981547295973556680e-04,4.031537149116132062e-04,2.782680029999613086e-04,2.013462168991827844e-04,1.581507747250400562e-04,1.426233730149128554e-04,1.623686402996199669e-04,2.769954674673250896e-04
+1.000000000000000021e-03,5.981438884479926745e-04,4.031094770638417378e-04,2.781746763026650849e-04,2.011851525894453846e-04,1.578837467363927922e-04,1.421468562989037501e-04,1.613282432889087106e-04,2.736185440612619660e-04
-1.000000000000000021e-03,5.974772058480589884e-04,4.023449202032754039e-04,2.774662364916018848e-04,2.005519721420980883e-04,1.572952728586730247e-04,1.415487458023807841e-04,1.606460099014084351e-04,2.728909933446289080e-04
+1.000000000000000021e-03,5.974643081279905951e-04,4.022967109333065402e-04,2.773672167904255525e-04,2.003833762773818070e-04,1.570182206524130687e-04,1.410578853054891162e-04,1.595818450324428667e-04,2.694643589605560702e-04
-1.000000000000000021e-03,5.967924602151245417e-04,4.015280354275974962e-04,2.766567170422079059e-04,1.997501120648868605e-04,1.564314572956195643e-04,1.404632320601022135e-04,1.589039550526354799e-04,2.687258582080010155e-04
+1.000000000000000021e-03,5.967776135628261383e-04,4.014760835454474729e-04,2.765523639715266420e-04,1.995745107850170087e-04,1.561451751437292214e-04,1.399593838969533089e-04,1.578189695554256631e-04,2.652593622585595239e-04
-1.000000000000000021e-03,5.961015210291329552e-04,4.007053572943599577e-04,2.758431797434220318e-04,1.989462429758611403e-04,1.555679612182393453e-04,1.393818318435550562e-04,1.571757793000612348e-04,2.646152969711955188e-04
+1.000000000000000021e-03,5.960847301704033955e-04,4.006496794462583626e-04,2.757335282633677394e-04,1.987637005805311633e-04,1.552725686595443394e-04,1.388652425906941482e-04,1.560705931497471889e-04,2.611111091988240428e-04
-1.000000000000000021e-03,5.954044103428367566e-04,3.998769294251378363e-04,2.750256766566040972e-04,1.981404183299118591e-04,1.547048355449558708e-04,1.383045830163869136e-04,1.554614480121203164e-04,2.605587686095252363e-04
+1.000000000000000021e-03,5.953856800664869900e-04,3.998175424230218200e-04,2.749107619574642008e-04,1.979509993037016505e-04,1.544004519462355480e-04,1.377754975907092790e-04,1.543366727366940775e-04,2.570190084729973012e-04
-1.000000000000000021e-03,5.947013777400173224e-04,3.990430339362700481e-04,2.742044609070656662e-04,1.973328535702731791e-04,1.538422664307762401e-04,1.372316495983985922e-04,1.537610729441031576e-04,2.565559887984316962e-04
+1.000000000000000021e-03,5.946807128856675898e-04,3.989799547069150759e-04,2.740843182982303974e-04,1.971366223883773178e-04,1.535290106655841792e-04,1.366903106980890768e-04,1.526173104925201149e-04,2.529827224768709296e-04
-1.000000000000000021e-03,5.939924446448691022e-04,3.982037130272156897e-04,2.733795825341983144e-04,1.965235995659166514e-04,1.529803013963573505e-04,1.361630645638145173e-04,1.520746117923915490e-04,2.526064078268458078e-04
+1.000000000000000021e-03,5.939698501124463306e-04,3.981369586533569987e-04,2.732542475356756692e-04,1.963206208562686219e-04,1.526582921179318820e-04,1.356097131673934353e-04,1.509124557001679569e-04,2.490016526370400561e-04
-1.000000000000000021e-03,5.932708072008613994e-04,3.973448313523968048e-04,2.725292879585060313e-04,1.956816407574392804e-04,1.520737532268283138e-04,1.350253536692922732e-04,1.502520417395671493e-04,2.482429369311983419e-04
+1.000000000000000021e-03,5.932465626846949178e-04,3.972749900655482406e-04,2.723996767755988246e-04,1.954732420440092287e-04,1.517449722599865122e-04,1.344633353162260421e-04,1.490787207039270096e-04,2.446311790608478916e-04
-1.000000000000000021e-03,5.925433291275937313e-04,3.964806700993557770e-04,2.716755655440644093e-04,1.948383564731119815e-04,1.511684275731327428e-04,1.338932464840604031e-04,1.484467502756363724e-04,2.439468427807235304e-04
+1.000000000000000021e-03,5.925174390191371033e-04,3.964077570693368959e-04,2.715417094444828503e-04,1.946245940839898595e-04,1.508329769024341859e-04,1.333227635443309334e-04,1.472627410071646460e-04,2.403295419535726046e-04
-1.000000000000000021e-03,5.918101288584805405e-04,3.956113769664689763e-04,2.708185566039283476e-04,1.939938721213093850e-04,1.502644330979066827e-04,1.327668256867655240e-04,1.466587172007617287e-04,2.397173806066686273e-04
+1.000000000000000021e-03,5.917825975966207411e-04,3.955354074700222146e-04,2.706804869652218665e-04,1.937748023716854423e-04,1.499224142400159925e-04,1.321880784683747445e-04,1.454644877205459041e-04,2.360959501695517580e-04
-1.000000000000000021e-03,5.910712282476807177e-04,3.947369945531709078e-04,2.699583111402765676e-04,1.931482375169864133e-04,1.493618135415682949e-04,1.316461114156967569e-04,1.448878476419733323e-04,2.355536787532183434e-04
+1.000000000000000021e-03,5.910420603206251872e-04,3.946579839875351422e-04,2.698160594859791645e-04,1.929239167799043884e-04,1.490133276731937860e-04,1.310592984163628486e-04,1.436838579350653566e-04,2.319294885748935905e-04
-1.000000000000000021e-03,5.903266492974269808e-04,3.938575655934699066e-04,2.690948791496987824e-04,1.923015022699072797e-04,1.484606121781560119e-04,1.305311230155930472e-04,1.431340460611192763e-04,2.314548735305102924e-04
+1.000000000000000021e-03,5.902958492424382119e-04,3.937755294749108723e-04,2.689484771457827648e-04,1.920719869699086713e-04,1.481057601269397369e-04,1.299364409184113305e-04,1.419207481479104003e-04,2.278292508796841368e-04
-1.000000000000000021e-03,5.895916361077759233e-04,3.930015889157450278e-04,2.682679585446747167e-04,1.915046725018171748e-04,1.476265343831741983e-04,1.295122987364192039e-04,1.415403000102364922e-04,2.277048762028301403e-04
+1.000000000000000021e-03,5.895598685634120817e-04,3.929178479527316910e-04,2.681193531438139815e-04,1.912726116179633686e-04,1.472689584526509451e-04,1.289152165190126341e-04,1.403276367723939690e-04,2.241040180807166735e-04
-1.000000000000000021e-03,5.888509505821538188e-04,3.921405251235485093e-04,2.674377005486313469e-04,1.907064029438769275e-04,1.467931904457939435e-04,1.284977589807231727e-04,1.399600943498011466e-04,2.240084844157824847e-04
+1.000000000000000021e-03,5.888182184446727908e-04,3.920550888852155800e-04,2.672869104586279658e-04,1.904718280301954622e-04,1.464329431074320987e-04,1.278983689606465277e-04,1.387482416027983217e-04,2.204326648641897243e-04
-1.000000000000000021e-03,5.881046147353881284e-04,3.912744162777674595e-04,2.666041537474170709e-04,1.899067416692393098e-04,1.459606238177286390e-04,1.274875313353729649e-04,1.383933775516596422e-04,2.203650745808937968e-04
+1.000000000000000021e-03,5.880709209312291698e-04,3.911872944022057189e-04,2.664511977530461032e-04,1.896696843025943828e-04,1.455977573633372962e-04,1.268859249854523304e-04,1.371825077963339959e-04,2.168145532732365665e-04
-1.000000000000000021e-03,5.873535041835053691e-04,3.904041908037584924e-04,2.657681073335506784e-04,1.891063272435359547e-04,1.451293640595985746e-04,1.264820875947550167e-04,1.368405966876043531e-04,2.167748460671411873e-04
+1.000000000000000021e-03,5.873188516038330012e-04,3.903153927531259398e-04,2.656130037940035156e-04,1.888668181821939697e-04,1.447639292589146184e-04,1.258783532658409540e-04,1.356308744741794301e-04,2.132498546822566535e-04
-1.000000000000000021e-03,5.865976375297720377e-04,3.895298843642901903e-04,2.649296021207307814e-04,1.883051991594097421e-04,1.442994447916011967e-04,1.254814426573682665e-04,1.353016807452276011e-04,2.132371421364682767e-04
+1.000000000000000021e-03,5.865620290918570692e-04,3.894394196579139384e-04,2.647723694527710347e-04,1.880632691586897262e-04,1.439314922056974795e-04,1.248756678383702303e-04,1.340932673985179111e-04,2.097378989636096219e-04
-1.000000000000000021e-03,5.858370334908887412e-04,3.886515327161476187e-04,2.640886789067201177e-04,1.875033967487228748e-04,1.434708992929061271e-04,1.244856108614830043e-04,1.337765582492128895e-04,2.097513117892475961e-04
+1.000000000000000021e-03,5.858004721379563712e-04,3.885594109297237520e-04,2.639293355828808605e-04,1.872590765580118600e-04,1.431004792703304354e-04,1.238778821782577646e-04,1.325696118981003829e-04,2.062780220293337398e-04
-1.000000000000000021e-03,5.850717109173866415e-04,3.877691717638952012e-04,2.632453785571107932e-04,1.867009592919541521e-04,1.426437606415217971e-04,1.234946061839636009e-04,1.322651576281378186e-04,2.063167108712882474e-04
+1.000000000000000021e-03,5.850341996176138979e-04,3.876754025264287241e-04,2.630839431003643525e-04,1.864542796470906004e-04,1.422709233084495310e-04,1.228850093894619591e-04,1.310598332174379369e-04,2.028695668674851068e-04
-1.000000000000000021e-03,5.843017841779564719e-04,3.868829399849727933e-04,2.623998297381095117e-04,1.858979973489535589e-04,1.418181214209275826e-04,1.225084976697060233e-04,1.307674705482058720e-04,2.029328092689827875e-04
+1.000000000000000021e-03,5.842633259194077947e-04,3.867875329548579075e-04,2.622363206668650243e-04,1.856489888735660490e-04,1.414429165168560936e-04,1.218971173595769875e-04,1.295639192660443006e-04,1.995119889022209966e-04
-1.000000000000000021e-03,5.835272719783185817e-04,3.859928727352694559e-04,2.615520723807220407e-04,1.850945488934469029e-04,1.409940129261724197e-04,1.215272967897141737e-04,1.292834223062770812e-04,1.995989685833853672e-04
+1.000000000000000021e-03,5.834878697730810785e-04,3.858958376209294626e-04,2.613865082576556967e-04,1.848432421885319707e-04,1.406164899573639974e-04,1.209142166826000190e-04,1.280817922197122173e-04,1.962046375108947760e-04
-1.000000000000000021e-03,5.827481931390192209e-04,3.850990054645316799e-04,2.607021463995574332e-04,1.842906517410432266e-04,1.401714661235729505e-04,1.205510144929276286e-04,1.278129378421479238e-04,1.963145562589016025e-04
+1.000000000000000021e-03,5.827078500230523962e-04,3.850003520236475163e-04,2.605345458299026889e-04,1.840370773822073991e-04,1.397916743597008157e-04,1.199363174304283899e-04,1.266133739282210172e-04,1.929468682039042694e-04
-1.000000000000000021e-03,5.819741190680906414e-04,3.842186528659996786e-04,2.598733678747139103e-04,1.835150990942780922e-04,1.393856353878371876e-04,1.196241043053028848e-04,1.264157249384978508e-04,1.931533527071859933e-04
+1.000000000000000021e-03,5.819334261621241173e-04,3.841195496874485939e-04,2.597054450234843122e-04,1.832615752361228063e-04,1.390067359137023490e-04,1.190124837885568685e-04,1.252266477671892364e-04,1.898342669542842250e-04
-1.000000000000000021e-03,5.811954906857532679e-04,3.833344911530978875e-04,2.590423495637437460e-04,1.827389251971546448e-04,1.386010231640464696e-04,1.187014313463915350e-04,1.250305871218520724e-04,1.900379005692562904e-04
+1.000000000000000021e-03,5.811544494713084385e-04,3.832349425929183610e-04,2.588741118031709712e-04,1.824854619290212638e-04,1.382230274271905722e-04,1.180928923649849320e-04,1.238519429087230690e-04,1.867668194223294086e-04
-1.000000000000000021e-03,5.804123268686601621e-04,3.824465553881609072e-04,2.582091305240798466e-04,1.819621668943112273e-04,1.378176602140172575e-04,1.177830097537161525e-04,1.236574657124121280e-04,1.869676369318762604e-04
+1.000000000000000021e-03,5.803709388350691226e-04,3.823465658113372784e-04,2.580405852181276633e-04,1.817087742555892370e-04,1.374405795299253087e-04,1.171775570200931022e-04,1.224892004036316632e-04,1.837439681062861012e-04
-1.000000000000000021e-03,5.796261981805348861e-04,3.815564763513873891e-04,2.573750710547324729e-04,1.811859034357266680e-04,1.370364232713841633e-04,1.168696105278517803e-04,1.222971239749574140e-04,1.839432835829867073e-04
+1.000000000000000021e-03,5.795844646861092117e-04,3.814560496353979662e-04,2.572062245701910057e-04,1.809325897993571621e-04,1.366602663048694689e-04,1.162672443199922736e-04,1.211391750652958171e-04,1.807664171209839225e-04
-1.000000000000000021e-03,5.788371166298537929e-04,3.806642767897665215e-04,2.565401959245502722e-04,1.804101566728638260e-04,1.362573268495191094e-04,1.159612279572367423e-04,1.209494737333099285e-04,1.809642226433420603e-04
+1.000000000000000021e-03,5.787950390386191295e-04,3.805634168176052199e-04,2.563710546191050039e-04,1.801569303693986560e-04,1.358821021611104744e-04,1.153619483579342790e-04,1.198017787120210541e-04,1.778335550584487373e-04
-1.000000000000000021e-03,5.780450942923127944e-04,3.797699794962239458e-04,2.557045298790712744e-04,1.796349483543752492e-04,1.354803852765658562e-04,1.150578560981921263e-04,1.196144270262388971e-04,1.780298433107154344e-04
+1.000000000000000021e-03,5.780026739739645147e-04,3.796686901561970007e-04,2.555351001009416268e-04,1.793818176715784992e-04,1.351061013224604760e-04,1.144616629966290335e-04,1.184769233829579004e-04,1.749447775426769835e-04
-1.000000000000000021e-03,5.772501433097143196e-04,3.788736073065085246e-04,2.548680976361037374e-04,1.788603001211915217e-04,1.347056126906417029e-04,1.141594887707218423e-04,1.182918961012392148e-04,1.751395417672447184e-04
+1.000000000000000021e-03,5.772073816396077655e-04,3.787718924921195112e-04,2.546983857238086673e-04,1.786072733038042632e-04,1.343322778228697451e-04,1.135663818643436025e-04,1.171645213323757931e-04,1.720994871389106646e-04
-1.000000000000000021e-03,5.764543993312114430e-04,3.779774418763772749e-04,2.540328419678222955e-04,1.780877776040980329e-04,1.339342982068885400e-04,1.132672798320007770e-04,1.169830787460522149e-04,1.722947974180976999e-04
+1.000000000000000021e-03,5.764112975619451167e-04,3.778753049229251356e-04,2.538628529985562728e-04,1.778348606584519826e-04,1.335619170774594953e-04,1.126772524533375236e-04,1.158657577413503814e-04,1.692991320527776819e-04
-1.000000000000000021e-03,5.756578658699793754e-04,3.770814893242558957e-04,2.531987675065141240e-04,1.773173809352787060e-04,1.331664323570320042e-04,1.123811939733057949e-04,1.156878429947367658e-04,1.694949148917899182e-04
+1.000000000000000021e-03,5.756144252522814222e-04,3.769789335549947914e-04,2.530285065275222683e-04,1.770645798114452998e-04,1.327950095246515803e-04,1.117942393436846088e-04,1.145805009748875411e-04,1.665430248001372392e-04
-1.000000000000000021e-03,5.748605464740858808e-04,3.761857558021953151e-04,2.523658789003789082e-04,1.765491102506614579e-04,1.324020056947932127e-04,1.115011960644554309e-04,1.144060580710201219e-04,1.667392091004694466e-04
+1.000000000000000021e-03,5.748167682568085593e-04,3.760827845283660131e-04,2.521953509290719687e-04,1.762964308427695766e-04,1.320315456257037542e-04,1.109173072961205789e-04,1.133086205901110452e-04,1.638304880953399246e-04
-1.000000000000000021e-03,5.740605208264367093e-04,3.752860221900411030e-04,2.515274179172670150e-04,1.757730484194969538e-04,1.316262968484167275e-04,1.106031805667756002e-04,1.130890327345630944e-04,1.638824360782746060e-04
+1.000000000000000021e-03,5.740166237139158025e-04,3.751830736799844387e-04,2.513572749088919958e-04,1.755213872380331861e-04,1.312580494760662926e-04,1.100242733780145235e-04,1.120050977276823334e-04,1.610268323297459373e-04
-1.000000000000000021e-03,5.732597217139582440e-04,3.743865400085843336e-04,2.506901966657434509e-04,1.749991992264989145e-04,1.308541788026545852e-04,1.097115653341001649e-04,1.117862964715498958e-04,1.610733229285059244e-04
+1.000000000000000021e-03,5.732157063485666254e-04,3.742836154796483610e-04,2.505204393147844274e-04,1.747485543201545441e-04,1.304881340598568315e-04,1.091376023135285023e-04,1.107157077892566201e-04,1.582698947895536752e-04
-1.000000000000000021e-03,5.724581527307928295e-04,3.734873153380866809e-04,2.498542195054800734e-04,1.742275621656188764e-04,1.300856406740597557e-04,1.088263113284397853e-04,1.104977038827086933e-04,1.583110954216201049e-04
+1.000000000000000021e-03,5.724140197507473007e-04,3.733844159930685934e-04,2.496848484812796650e-04,1.739779315547772373e-04,1.297217884948703216e-04,1.082572552711356679e-04,1.094403070125688193e-04,1.555589173140119988e-04
-1.000000000000000021e-03,5.716575664778975139e-04,3.725901351223118402e-04,2.490209518882956956e-04,1.734592774731394025e-04,1.293215843757922266e-04,1.079481792373105579e-04,1.092239503861538297e-04,1.555962288273640454e-04
+1.000000000000000021e-03,5.716133163514535006e-04,3.724872615728835922e-04,2.488519667094108378e-04,1.732106573421359136e-04,1.289599119326889729e-04,1.073839886960488172e-04,1.081795839980315968e-04,1.528943685588057789e-04
-1.000000000000000021e-03,5.708579584178212615e-04,3.716949912014026899e-04,2.481903820156593069e-04,1.726943281050015661e-04,1.285619816677677630e-04,1.070771097820554131e-04,1.079648627815312081e-04,1.529279069228532445e-04
+1.000000000000000021e-03,5.708135916089464952e-04,3.715921440481619780e-04,2.480217821880964816e-04,1.724467146387093834e-04,1.282024761936270685e-04,1.065177436423506841e-04,1.069333674890963240e-04,1.502754491507743331e-04
-1.000000000000000021e-03,5.700593240595020362e-04,3.708018755033176054e-04,2.473624982033243466e-04,1.719326971657234189e-04,1.278068045492097274e-04,1.062130442456755448e-04,1.067202699871894330e-04,1.503053277730467872e-04
+1.000000000000000021e-03,5.700148410279018158e-04,3.706990553358867476e-04,2.471942832207120249e-04,1.716860865497342535e-04,1.274494533371790404e-04,1.056584617232978574e-04,1.057014883248694426e-04,1.477013737020834935e-04
-1.000000000000000021e-03,5.692616589508734098e-04,3.699107800243283187e-04,2.465372888514933574e-04,1.711743678703278799e-04,1.270560252111956913e-04,1.053559244063845252e-04,1.054900029091859618e-04,1.477277031714797602e-04
+1.000000000000000021e-03,5.692170601522963469e-04,3.698079874222007994e-04,2.463694581964103098e-04,1.709287562926333241e-04,1.267008156164750913e-04,1.048060850476081559e-04,1.044837793145218324e-04,1.451713702741069042e-04
-1.000000000000000021e-03,5.684668249800580104e-04,3.690236622787805977e-04,2.457163959794073484e-04,1.704206404911772779e-04,1.263106878677109810e-04,1.045066466916437628e-04,1.042749156168111009e-04,1.451958181660296986e-04
+1.000000000000000021e-03,5.684221107462931718e-04,3.689208973051672467e-04,2.455489480245545849e-04,1.701760222502850749e-04,1.259576042689529907e-04,1.039615052862917467e-04,1.032810864032787402e-04,1.426862118551680341e-04
-1.000000000000000021e-03,5.676748100054150635e-04,3.681404996529084395e-04,2.448997907163580324e-04,1.696714800685054925e-04,1.255707452244580493e-04,1.036651297187654374e-04,1.030748062779383314e-04,1.427088285865420875e-04
+1.000000000000000021e-03,5.676299806599446841e-04,3.680377623533836952e-04,2.447327238198633678e-04,1.694278494753442496e-04,1.252197721019686588e-04,1.031246414956518974e-04,1.020932099638295122e-04,1.402450714512258731e-04
-1.000000000000000021e-03,5.668856019606317766e-04,3.672612697075048303e-04,2.440874444423345342e-04,1.689268519744038289e-04,1.248361504800705925e-04,1.028312930702206035e-04,1.018894759794533339e-04,1.402659065748177792e-04
+1.000000000000000021e-03,5.668406578186927338e-04,3.671585601102087264e-04,2.439207569480618843e-04,1.686842033525584789e-04,1.244872724153648453e-04,1.022954136930148580e-04,1.009199532576916553e-04,1.378471380449364540e-04
-1.000000000000000021e-03,5.660978860040193896e-04,3.663833351346186431e-04,2.432754355983019401e-04,1.681813812071888568e-04,1.240994738987429935e-04,1.019939514788640786e-04,1.006986246362622330e-04,1.378144424939918523e-04
+1.000000000000000021e-03,5.660528798623399357e-04,3.662807588285737852e-04,2.431092838206291959e-04,1.679399278621275505e-04,1.237529841606189703e-04,1.014631173867882653e-04,9.974194130068655907e-05,1.354424501489320950e-04
-1.000000000000000021e-03,5.653129566917403656e-04,3.655093013788168949e-04,2.424676550876819162e-04,1.674404214250226010e-04,1.233681396595080271e-04,1.011643116013039457e-04,9.952262825359122704e-05,1.354072260989254840e-04
+1.000000000000000021e-03,5.652678887062091489e-04,3.654068578608936813e-04,2.423020363044335113e-04,1.672001557892942780e-04,1.230240193993821724e-04,1.006384714692423982e-04,9.857860748076281341e-05,1.330810886504238974e-04
-1.000000000000000021e-03,5.645308021917731225e-04,3.646391464999218838e-04,2.416640749146854532e-04,1.667039386446287719e-04,1.226421015627000995e-04,1.003422934745905857e-04,9.836128786277046102e-05,1.330434286087782230e-04
+1.000000000000000021e-03,5.644856725120149217e-04,3.645368352560149003e-04,2.414989864020476457e-04,1.664648531857207327e-04,1.223003320760450115e-04,9.982139651422967225e-05,9.742975533494338731e-05,1.307622432316707048e-04
-1.000000000000000021e-03,5.637533512715803535e-04,3.637748048842355184e-04,2.408662573039999728e-04,1.659731272165147797e-04,1.219222820499958832e-04,9.952864742131557339e-05,9.721524794079934454e-05,1.307234068834026641e-04
+1.000000000000000021e-03,5.637081598516872297e-04,3.636726247466106157e-04,2.407016951041400575e-04,1.657352124900924413e-04,1.215828418563276393e-04,9.901263879559620603e-05,9.629602344691408898e-05,1.284862679388324466e-04
-1.000000000000000021e-03,5.629805832911210584e-04,3.629162394326295588e-04,2.400741573155354143e-04,1.652479360999081315e-04,1.212086174287677493e-04,9.872327382660381703e-05,9.608428430098295324e-05,1.284463004684426848e-04
+1.000000000000000021e-03,5.629353300793490293e-04,3.628141892281135789e-04,2.399101174854294510e-04,1.650111827309744587e-04,1.208714852573268089e-04,9.821209936496322563e-05,9.517719041742417905e-05,1.262523213089875105e-04
-1.000000000000000021e-03,5.622124777547171659e-04,3.620634133660168507e-04,2.392877304473862261e-04,1.645283148026117340e-04,1.205010447638324016e-04,9.792607442008048754e-05,9.496817636981473815e-05,1.262112668660531425e-04
+1.000000000000000021e-03,5.621671626935266465e-04,3.619614919160761232e-04,2.391242090587739641e-04,1.642927134849468424e-04,1.201661995513669139e-04,9.741968060975319133e-05,9.407303841474721877e-05,1.240595794224424390e-04
-1.000000000000000021e-03,5.614490142952067260e-04,3.612162901840461500e-04,2.385069325732311319e-04,1.638142133018547766e-04,1.197995017798251111e-04,9.713695214164584071e-05,9.386670693673759554e-05,1.240174806289624668e-04
+1.000000000000000021e-03,5.614036373218869204e-04,3.611144963064036881e-04,2.383439257149278542e-04,1.635797548004748762e-04,1.194669226721670609e-04,9.663528612429730903e-05,9.298335293466474341e-05,1.219072350364201328e-04
-1.000000000000000021e-03,5.606917876274927293e-04,3.603765175920537237e-04,2.377331235014221514e-04,1.631066878653574946e-04,1.191048135885559178e-04,9.635658300529022745e-05,9.278045936752733660e-05,1.218652818497198865e-04
+1.000000000000000021e-03,5.606463485664969944e-04,3.602748496609082000e-04,2.375706263435288989e-04,1.628733614326239394e-04,1.187744774441648902e-04,9.585958850070355037e-05,9.190871230268097864e-05,1.197956257524449784e-04
-1.000000000000000021e-03,5.599407711882442139e-04,3.595440474626148916e-04,2.369662455139816704e-04,1.624056743525901679e-04,1.184169030927857740e-04,9.558485302446070387e-05,9.170919453133945438e-05,1.197538170918552259e-04
+1.000000000000000021e-03,5.598952698555576370e-04,3.594425038433207622e-04,2.368042532426757629e-04,1.621734693226255697e-04,1.180887870128607769e-04,9.509247448928166366e-05,9.084888029067286991e-05,1.177239166851852087e-04
-1.000000000000000021e-03,5.591959386362445371e-04,3.587188321446053963e-04,2.362062415256148103e-04,1.617111093879153761e-04,1.177356942042864595e-04,9.482164989506947420e-05,9.065267746151001182e-05,1.176822517560764241e-04
+1.000000000000000021e-03,5.591503748394264367e-04,3.586174111937711294e-04,2.360447493430869353e-04,1.614800151758654528e-04,1.174097755299612002e-04,9.433383251239638840e-05,8.980362478385646723e-05,1.156912913627774928e-04
-1.000000000000000021e-03,5.584679347085343051e-04,3.579204847030152616e-04,2.354801209260217886e-04,1.610571916563278928e-04,1.171042314833950021e-04,9.412413419793498636e-05,8.969710985766721223e-05,1.158171674873524301e-04
+1.000000000000000021e-03,5.584225591487143505e-04,3.578196518919505740e-04,2.353197697834314708e-04,1.608280111225492105e-04,1.167814916834832538e-04,9.364209834454310303e-05,8.886089862139266997e-05,1.138670987493162862e-04
-1.000000000000000021e-03,5.577460350040716044e-04,3.571292104088583889e-04,2.347605938090600918e-04,1.604093154405005178e-04,1.164788453357124725e-04,9.343405219685640224e-05,8.875393403591714169e-05,1.139848385910069905e-04
+1.000000000000000021e-03,5.577008468242452242e-04,3.570289620106132170e-04,2.346013750077580542e-04,1.601820316992516276e-04,1.161592518078891664e-04,9.295772679954118940e-05,8.793036528463705852e-05,1.120748093307471799e-04
-1.000000000000000021e-03,5.570302142000897652e-04,3.563449642017089015e-04,2.340476072540025119e-04,1.597674235279283352e-04,1.158594695166401697e-04,9.275131062844492946e-05,8.782296490203555085e-05,1.121846347113116888e-04
+1.000000000000000021e-03,5.569852125454166723e-04,3.562452965139748743e-04,2.338895121728417183e-04,1.595420198714332595e-04,1.155429900504064843e-04,9.228062559771084612e-05,8.701184300011380421e-05,1.103138112316197746e-04
-1.000000000000000021e-03,5.563205323021954991e-04,3.555677864531773679e-04,2.333411773810724506e-04,1.591315117132938270e-04,1.152460793074575203e-04,9.207585166649024939e-05,8.690405384945894284e-05,1.104159825692847303e-04
+1.000000000000000021e-03,5.562757163116399499e-04,3.554686957703368042e-04,2.331841974232642283e-04,1.589079715282182140e-04,1.149326819589807311e-04,9.161073769793274093e-05,8.610518609906000706e-05,1.085835484715731990e-04
-1.000000000000000021e-03,5.556169640414684949e-04,3.547976323593042547e-04,2.326412517183593022e-04,1.585015234268918286e-04,1.146386094395640093e-04,9.140758389001004606e-05,8.599702078916069998e-05,1.086782756746748250e-04
+1.000000000000000021e-03,5.555723328562507538e-04,3.546991150005096983e-04,2.324853783642831767e-04,1.582798302759657303e-04,1.143282626503791007e-04,9.094797264045832242e-05,8.521021771090780625e-05,1.068834322603653324e-04
-1.000000000000000021e-03,5.549194843577821444e-04,3.540344575531629255e-04,2.319477783590319386e-04,1.578774027587701891e-04,1.140369954748351631e-04,9.074641718074756330e-05,8.510168863112195785e-05,1.069709201912467553e-04
+1.000000000000000021e-03,5.548750371213563657e-04,3.539365098621276230e-04,2.317930031654593444e-04,1.576575403787569985e-04,1.137296680667903865e-04,9.029224125378113518e-05,8.432676390648500317e-05,1.052128860599020399e-04
-1.000000000000000021e-03,5.542280683854123842e-04,3.532782180675540329e-04,2.312607059053527040e-04,1.572590943887706505e-04,1.134411737206307899e-04,9.009226260907148270e-05,8.421788308143062266e-05,1.052933342707317640e-04
+1.000000000000000021e-03,5.541838042439771635e-04,3.531808364136874187e-04,2.311070205067102163e-04,1.570410466910287454e-04,1.131368348940622735e-04,8.964345554504144940e-05,8.345465350366406993e-05,1.035713449503019397e-04
-1.000000000000000021e-03,5.535435592528614506e-04,3.525297669260542646e-04,2.305807244353639423e-04,1.566471216497641210e-04,1.128515385449576329e-04,8.944542244330133641e-05,8.334582247054855841e-05,1.036454797753234207e-04
+1.000000000000000021e-03,5.534994772986728557e-04,3.524329474767404734e-04,2.304281200650363333e-04,1.564308719194829761e-04,1.125501566344392631e-04,8.900191672771989599e-05,8.259410426967044201e-05,1.019587783174918249e-04
-1.000000000000000021e-03,5.528659293179593237e-04,3.517890550472092793e-04,2.299077767025847687e-04,1.560414233076215052e-04,1.122680202866636689e-04,8.880580140054516926e-05,8.248532556564376009e-05,1.020267728319692934e-04
+1.000000000000000021e-03,5.528220286453137825e-04,3.516927939956549431e-04,2.297562446752235638e-04,1.558269550144645319e-04,1.119695640249353838e-04,8.836753049012398612e-05,8.174493812638424233e-05,1.003746189891791522e-04
-1.000000000000000021e-03,5.521951511907441769e-04,3.510560338657343622e-04,2.292418061160320900e-04,1.554419388795865483e-04,1.116905502099227850e-04,8.817330560855271690e-05,8.163621425685595255e-05,1.004366420798761639e-04
+1.000000000000000021e-03,5.521514308959529988e-04,3.509603274307335013e-04,2.290913378267074509e-04,1.552292356754889449e-04,1.113949887224841186e-04,8.774020391605217217e-05,8.090698006040516024e-05,9.881831191717569708e-05
-1.000000000000000021e-03,5.515357570680511773e-04,3.503384240935171457e-04,2.285926195257032088e-04,1.548599664871607589e-04,1.111316359132737570e-04,8.756139732097920178e-05,8.081143045355856274e-05,9.887558842870256459e-05
+1.000000000000000021e-03,5.514925705077818562e-04,3.502439423799475968e-04,2.284441610897542578e-04,1.546502536108915020e-04,1.108405451476827762e-04,8.713560862370903280e-05,8.009669495978734939e-05,9.729798207441842409e-05
-1.000000000000000021e-03,5.508831499695134287e-04,3.496283778737561509e-04,2.279502431225978031e-04,1.542840041018178729e-04,1.105785086338880569e-04,8.695624145470242240e-05,7.999741899881025698e-05,9.734197099681332458e-05
+1.000000000000000021e-03,5.508404954145605355e-04,3.495351144497065954e-04,2.278037808073336661e-04,1.540772565128698055e-04,1.102918428934658313e-04,8.653767235071846409e-05,7.929694151393572473e-05,9.580416231533655223e-05
-1.000000000000000021e-03,5.502373034395177318e-04,3.489258487042028742e-04,2.273146231686837553e-04,1.537139948092133693e-04,1.100311043442569531e-04,8.635775141128424154e-05,7.919401605398894981e-05,9.583525507692383649e-05
+1.000000000000000021e-03,5.501951791779016417e-04,3.488337972114359704e-04,2.271701434112839691e-04,1.535101877933933972e-04,1.097488185619751536e-04,8.594630990981442489e-05,7.850756016455258672e-05,9.433633928045583440e-05
-1.000000000000000021e-03,5.495982753581815606e-04,3.482308738101717264e-04,2.266857730549029851e-04,1.531499327576744506e-04,1.094893985055618503e-04,8.576587362490598130e-05,7.840109070036870779e-05,9.435495486246966317e-05
+1.000000000000000021e-03,5.495566796872157793e-04,3.481400279377950191e-04,2.265432624126748171e-04,1.529490418493457818e-04,1.092114481281042810e-04,8.536146896299809861e-05,7.772842391839215501e-05,9.289404738934854406e-05
-1.000000000000000021e-03,5.489660394111083985e-04,3.475434070850742167e-04,2.260636396270461598e-04,1.525917617808240120e-04,1.089533281238570496e-04,8.518052329278025009e-05,7.761848365092111231e-05,9.290055631012179708e-05
+1.000000000000000021e-03,5.489249706454161527e-04,3.474537605956091817e-04,2.259230848255512310e-04,1.523937628358645337e-04,1.086796692149487770e-04,8.478306608188779627e-05,7.695937762456762194e-05,9.147679298288125297e-05
-1.000000000000000021e-03,5.483405695169031721e-04,3.468634028939242666e-04,2.254481703234268038e-04,1.520394263837190755e-04,1.084228310216190315e-04,8.460161684084565312e-05,7.684603831721497692e-05,9.147155629123523643e-05
+1.000000000000000021e-03,5.483000259883204826e-04,3.467749496226811058e-04,2.253095582547179863e-04,1.518442955755717951e-04,1.081534202533376696e-04,8.421101904463252675e-05,7.620026875215024978e-05,9.008409282780761526e-05
-1.000000000000000021e-03,5.477218398160970184e-04,3.461908160447295835e-04,2.248393131323322177e-04,1.514928716901747189e-04,1.078978457743454979e-04,8.402907183940372035e-05,7.608360066029366266e-05,9.006746210081428210e-05
+1.000000000000000021e-03,5.476818198739591458e-04,3.461035499001802445e-04,2.247026308546789793e-04,1.513005855077949086e-04,1.076326404207925846e-04,8.364524675486820964e-05,7.545094724756280888e-05,8.871547365198851438e-05
-1.000000000000000021e-03,5.471100509830739483e-04,3.455258336641454844e-04,2.242372067336963117e-04,1.509521904405796073e-04,1.073784265457052923e-04,8.346290305268591516e-05,7.533111218717854750e-05,8.868791149478115541e-05
+1.000000000000000021e-03,5.470705529810189179e-04,3.454397485743721506e-04,2.241024413587690614e-04,1.507627254998857578e-04,1.071173841908876651e-04,8.308576484396013343e-05,7.471135773791005180e-05,8.737059031219478156e-05
-1.000000000000000021e-03,5.465051768578450733e-04,3.448684100639811626e-04,2.236417986238402995e-04,1.504173273640432558e-04,1.068645117117092864e-04,8.290302835464549746e-05,7.458842111919879593e-05,8.733242665255502488e-05
+1.000000000000000021e-03,5.464661991670638182e-04,3.447835000304132159e-04,2.235089374295866490e-04,1.502306605954647535e-04,1.066075905365267742e-04,8.253249249775968508e-05,7.398135232542971769e-05,8.604898363826276057e-05
-1.000000000000000021e-03,5.459071915129861232e-04,3.442185000233075119e-04,2.230530368831633737e-04,1.498882278486614187e-04,1.063560404456327061e-04,8.234936680962616474e-05,7.385537825478157199e-05,8.600053991717240256e-05
+1.000000000000000021e-03,5.458687325221291348e-04,3.441347591201103138e-04,2.229220673120790245e-04,1.497043364932862668e-04,1.061031992194506256e-04,8.198535007121052676e-05,7.326078561528488937e-05,8.475020417489323324e-05
-1.000000000000000021e-03,5.453277270883248422e-04,3.435968835063559607e-04,2.224987019123045480e-04,1.493989071766017103e-04,1.058939742146122178e-04,8.185283432112488435e-05,7.320083692872619591e-05,8.480120525436834187e-05
+1.000000000000000021e-03,5.452901895090844558e-04,3.435150570304173014e-04,2.223706511768525117e-04,1.492190839480494894e-04,1.056468106030715887e-04,8.149737756206330190e-05,7.262157722718122260e-05,8.358877577600780481e-05
-1.000000000000000021e-03,5.447550756300442850e-04,3.429826158632724655e-04,2.219507707465509202e-04,1.489150144895505707e-04,1.054368625228528346e-04,8.136171358212484941e-05,7.255437084770181432e-05,8.362138199130290570e-05
+1.000000000000000021e-03,5.447184570616723891e-04,3.429026954804162766e-04,2.218256219048080177e-04,1.487392297472955698e-04,1.051953246672348403e-04,8.101471604563164947e-05,7.199020130947719233e-05,8.244600742971828849e-05
-1.000000000000000021e-03,5.441892122953419404e-04,3.423756544954533452e-04,2.214091954721005766e-04,1.484365007267826825e-04,1.049846526338566485e-04,8.087593753205775274e-05,7.191586230794716592e-05,8.246071125248328093e-05
+1.000000000000000021e-03,5.441535103689846154e-04,3.422976319891982578e-04,2.212869318272295087e-04,1.482647252612499030e-04,1.047486894350850925e-04,8.053730000430466094e-05,7.136654438032706549e-05,8.132155926679031160e-05
-1.000000000000000021e-03,5.436257869834306257e-04,3.417717090501741430e-04,2.208705585733095858e-04,1.479607869104501987e-04,1.045353737048878776e-04,8.039389156994272538e-05,7.128377081045688692e-05,8.131715986317171246e-05
+1.000000000000000021e-03,5.435909997143165834e-04,3.416955774702987799e-04,2.207511658034611989e-04,1.477929951923679644e-04,1.043049394866297369e-04,8.006352324306285982e-05,7.074908147590525608e-05,8.021344078389119761e-05
-1.000000000000000021e-03,5.430647907230928004e-04,3.411707635569704330e-04,2.203348411819341208e-04,1.474878525008424264e-04,1.040890016129762040e-04,7.991554062444546221e-05,7.065802258502740848e-05,8.019045690600123673e-05
+1.000000000000000021e-03,5.430309161342643806e-04,3.410965159927432586e-04,2.202183050641030458e-04,1.473240192034464783e-04,1.038640511149413747e-04,7.959335168171117276e-05,7.013774197495506457e-05,7.912139691327875046e-05
-1.000000000000000021e-03,5.425062145452035425e-04,3.405728020832017003e-04,2.198020245085192449e-04,1.470176770797095381e-04,1.036455124224165388e-04,7.944084996986793814e-05,7.003854478529189314e-05,7.908033605497744685e-05
+1.000000000000000021e-03,5.424732506674768149e-04,3.405004316631486216e-04,2.196883309178195964e-04,1.468577770769967101e-04,1.034260007962051111e-04,7.912675157408064104e-05,6.953245613429904408e-05,7.804517686317993341e-05
-1.000000000000000021e-03,5.419500494783734655e-04,3.399778087230425684e-04,2.192720898259863408e-04,1.465502403299397984e-04,1.032048823605461293e-04,7.896978519468913008e-05,6.942526543493823701e-05,7.798653539704048551e-05
+1.000000000000000021e-03,5.419179943504857889e-04,3.399073086151600896e-04,2.191612247355960430e-04,1.463942486957527610e-04,1.029907651665082401e-04,7.866368947795671801e-05,6.893315503775990498e-05,7.698453395110452940e-05
-1.000000000000000021e-03,5.413941311127808435e-04,3.393835756573481376e-04,2.187432334857416756e-04,1.460841531649274296e-04,1.027660304092932323e-04,7.850144313387483587e-05,6.881729624423716459e-05,7.690779566810491681e-05
+1.000000000000000021e-03,5.413629828746738867e-04,3.393149394667066966e-04,2.186351838182767991e-04,1.459320465988429058e-04,1.025572658029062702e-04,7.820326658601671303e-05,6.833895931108436813e-05,7.593823716905742757e-05
-1.000000000000000021e-03,5.408384570747234218e-04,3.387900992487282684e-04,2.182154508640741402e-04,1.456194096560940569e-04,1.023289477092565169e-04,7.803580657419308998e-05,6.821458972979072498e-05,7.584390730667668775e-05
+1.000000000000000021e-03,5.408082138671730385e-04,3.387233205925343745e-04,2.181102035828516778e-04,1.454711649598321068e-04,1.021254940975202248e-04,7.774546638666711494e-05,6.774982397495531476e-05,7.490609035628451105e-05
-1.000000000000000021e-03,5.402830249660243826e-04,3.381973758275843189e-04,2.176887373150658610e-04,1.451560038709627043e-04,1.018936254270842219e-04,7.757285840469518032e-05,6.761709884283491779e-05,7.479466373034050742e-05
+1.000000000000000021e-03,5.402536849306272763e-04,3.381324483351249330e-04,2.175862794239174624e-04,1.450115979478540569e-04,1.016954414669310805e-04,7.729027246482876178e-05,6.716570445567967391e-05,7.388790009412213962e-05
-1.000000000000000021e-03,5.397131798668998448e-04,3.375789411508863902e-04,2.171273238640323091e-04,1.446496280566233409e-04,1.014059885387841374e-04,7.704415358894297196e-05,6.692941074150365747e-05,7.359880640935691578e-05
+1.000000000000000021e-03,5.396844473492076093e-04,3.375153269484326116e-04,2.170269255797531330e-04,1.445081577421817903e-04,1.012119806681102793e-04,7.676796353167371053e-05,6.648955946153636300e-05,7.272015355307609235e-05
-1.000000000000000021e-03,5.391436022217508317e-04,3.369613465901344558e-04,2.165671485747253328e-04,1.441448734692186333e-04,1.009205829600201576e-04,7.651897498112265308e-05,6.624864922679121694e-05,7.242198835523922060e-05
+1.000000000000000021e-03,5.391154759339646064e-04,3.368990409960971838e-04,2.164687998325534753e-04,1.440063199340409466e-04,1.007307157169936256e-04,7.624910690660518565e-05,6.582015362379603355e-05,7.157078178685281889e-05
-1.223599761281599736e-03,2.870574988594920204e-03,5.410558860144323162e-03,9.740321680379944794e-03,1.718226620812626088e-02,3.032327552654904765e-02,5.460894525232919822e-02,1.025522470341594938e-01,2.059999999999999887e-01
+1.174325560395078800e-03,2.755298774803674553e-03,5.194387759090383395e-03,9.354521953613973567e-03,1.651171618252517473e-02,2.916966879690554432e-02,5.262163370571950466e-02,9.910396847768351836e-02,2.000000000000000111e-01
-4.083745694274921144e-03,8.369042825128880300e-03,1.439530071705045523e-02,2.397223043565064812e-02,3.897486419880552555e-02,6.202545653148217042e-02,9.626510461383173956e-02,1.437785279168776742e-01,2.000000000000000111e-01
+4.160571131359890040e-03,8.527170824088577475e-03,1.466969461393815427e-02,2.443642414582058997e-02,3.975038656808106002e-02,6.331729118004528201e-02,9.842489957479945428e-02,1.474045868235714374e-01,2.059999999999999887e-01

tests/data/test_raman_fiber_expected_results.csv

@@ -1,97 +1,97 @@
-,signal,ase,nli
+,Unnamed: 0,signal,ase,nli
-0,0.0002866683470642085,3.455694800734997e-08,2.1767706055953313e-07
+0,0,0.00028461768874888705,3.436639817118301e-08,2.1584395398371026e-07
-1,0.0002842930902246378,3.4445260342151434e-08,2.20064716108892e-07
+1,1,0.00028211666293476406,3.423996759499589e-08,2.1809245861954257e-07
-2,0.00028193841273409963,3.4334217950641774e-08,2.2239856929822977e-07
+2,2,0.0002796385058453953,3.411427963331182e-08,2.2028548201656645e-07
-3,0.0002796041237984927,3.422381587730477e-08,2.2467937700272344e-07
+3,3,0.0002771829951915728,3.398932824433299e-08,2.224238538437057e-07
-4,0.00027589218358262,3.3956266402003705e-08,2.2576401766047814e-07
+4,4,0.00027338904730863836,3.371109366484941e-08,2.2339638015421542e-07
-5,0.0002722303444814487,3.3690926476196685e-08,2.2678094635121413e-07
+5,5,0.0002696478418176822,3.3435235312069656e-08,2.2430128879557504e-07
-6,0.00026861791294303266,3.342777134334201e-08,2.2773179097640802e-07
+6,6,0.00026595862771951147,3.316172589770091e-08,2.2514026889123164e-07
-7,0.00026505174756069215,3.316675429137828e-08,2.2861602718115889e-07
+7,7,0.0002623182345801782,3.289051654795761e-08,2.2591288176837496e-07
-8,0.0002615312775878486,3.290785186664305e-08,2.294352005376256e-07
+8,8,0.00025872603823298804,3.262158136113203e-08,2.2662073272007013e-07
-9,0.0002577007690018081,3.26092154155734e-08,2.2987401053105823e-07
+9,9,0.0002548422077504841,3.231480491053109e-08,2.269632917207947e-07
-10,0.00025392474812815994,3.231329178154223e-08,2.3024928325076607e-07
+10,10,0.0002510150800727548,3.201089350512762e-08,2.2724305184561305e-07
-11,0.0002501957390130402,3.201993265117851e-08,2.3055653947072044e-07
+11,11,0.0002472372108596339,3.1709697987730424e-08,2.274556638142854e-07
-12,0.0002465133077961936,3.172911082648897e-08,2.3079745224174315e-07
+12,12,0.0002435081184388883,3.1411188710954923e-08,2.2760284870806473e-07
-13,0.00024287702172285261,3.144079924487205e-08,2.309736700807475e-07
+13,13,0.0002398273228957255,3.1115336193393125e-08,2.2768630096746835e-07
-14,0.00023918644496802598,3.1142660565561954e-08,2.3099023972100006e-07
+14,14,0.00023610099948769217,3.081056270085416e-08,2.27617695956038e-07
-15,0.00023554415781363666,3.084719002003063e-08,2.3094533745656626e-07
+15,15,0.00023242489102440902,3.050859262250336e-08,2.274887362838919e-07
-16,0.0002319496781605366,3.0554358283826426e-08,2.3084061926161906e-07
+16,16,0.00022879847092097078,3.020939430576677e-08,2.273011122655665e-07
-17,0.000228402746264896,3.026413819712743e-08,2.306779372506828e-07
+17,17,0.00022522143236587835,2.991293825364657e-08,2.27056704831033e-07
-18,0.00022490287297566154,2.997650061885732e-08,2.2679314039447925e-07
+18,18,0.00022169324298613107,2.9619193056612953e-08,2.2315585168570266e-07
-19,0.0002210339853226993,2.9639081336421986e-08,2.225476971173533e-07
+19,19,0.0002178178461312317,2.9278097616561043e-08,2.189169855906453e-07
-20,0.00021722472675673681,2.9305156366940595e-08,2.1837424228396343e-07
+20,20,0.0002140033759047069,2.8940600865395135e-08,2.1475128288390263e-07
-21,0.00021347443350916938,2.8974683300060073e-08,2.1427183120915025e-07
+21,21,0.00021024912752446947,2.8606658136588645e-08,2.1065775386659407e-07
-22,0.00020978233224910872,2.864761802749998e-08,2.1023941353936252e-07
+22,22,0.000206554289175574,2.827622313698371e-08,2.0663530613832196e-07
-23,0.0002061476568412488,2.832391679540816e-08,2.0627595093585302e-07
+23,23,0.00020291805701626135,2.7949249962519028e-08,2.0268286030011824e-07
-24,0.0002028237056285935,2.8034565895618217e-08,2.0263423697267893e-07
+24,24,0.00019961589106178864,2.765975998385304e-08,1.9907485701921993e-07
-25,0.00019954715529254185,2.7748013284124615e-08,1.9905015325521452e-07
+25,25,0.00019636137150032674,2.7373095433009936e-08,1.9552454239910457e-07
-26,0.0001963174528000437,2.7464226779716075e-08,1.9552292765090665e-07
+26,26,0.0001931539326017224,2.7089223372231097e-08,1.9203113225618846e-07
-27,0.00019313475803109547,2.718318103861899e-08,1.920525003885138e-07
+27,27,0.00018999370973089413,2.68081175642488e-08,1.885945418493717e-07
-28,0.00018999848980183525,2.6904843987797665e-08,1.8863807494364378e-07
+28,28,0.00018688010986276862,2.6529745205109403e-08,1.8521396370161997e-07
-29,0.00018690807208013476,2.6629183784477213e-08,1.852788635171717e-07
+29,29,0.00018381254538966195,2.6254073731438793e-08,1.818885993764317e-07
-30,0.00018386293497138034,2.635616888672288e-08,1.8197408797080072e-07
+30,30,0.00018079043504395085,2.5981070886269e-08,1.78617660347401e-07
-31,0.0001808626075954048,2.608576967648626e-08,1.7872307155753016e-07
+31,31,0.00017781329518445636,2.5710706310905614e-08,1.7540045799671345e-07
-32,0.00017790652540681915,2.5817954962418864e-08,1.7552504805064169e-07
+32,32,0.00017488055045064023,2.544294811944895e-08,1.7223621637516225e-07
-33,0.00017499412908771533,2.5552693765056307e-08,1.723792598876346e-07
+33,33,0.00017199163096488036,2.5177764647772334e-08,1.691241684952796e-07
-34,0.0001721914205512116,2.529821177538242e-08,1.69350416018518e-07
+34,34,0.00016923198600435235,2.4926164244345613e-08,1.6614800249846462e-07
-35,0.00016942913344260413,2.5046172734840803e-08,1.663699885487624e-07
+35,35,0.00016651223518287261,2.4676978561810828e-08,1.632195038378843e-07
-36,0.0001667067703020692,2.4796549229968703e-08,1.6343730102750106e-07
+36,36,0.00016383188581753214,2.443018036493577e-08,1.6033800467387247e-07
-37,0.00016402494737034808,2.4549324625938814e-08,1.602954566731582e-07
+37,37,0.0001611915388800597,2.418575294396746e-08,1.5725354810318075e-07
-38,0.0001613831201060569,2.430447139995257e-08,1.5720933628441338e-07
+38,38,0.0001585906555197023,2.394366896238391e-08,1.5422386234766858e-07
-39,0.00015878075021906192,2.406196225171638e-08,1.541780421866172e-07
+39,39,0.00015602870309712287,2.3703901303924173e-08,1.5124806354481474e-07
-40,0.00015621730558753943,2.3821770097360405e-08,1.5120068940449393e-07
+40,40,0.0001535051551031788,2.3466423066629146e-08,1.4832528036973196e-07
-41,0.000153694061439545,2.3583901792213434e-08,1.4827814327673852e-07
+41,41,0.0001510212597387019,2.3231240549132765e-08,1.4545635735033158e-07
-42,0.00015121040694331307,2.3348329147104765e-08,1.4540943949658482e-07
+42,42,0.00014857641307701306,2.2998325757462813e-08,1.4264034538487909e-07
-43,0.00014876574026315321,2.3115024224465226e-08,1.425936300160931e-07
+43,43,0.00014617002011358969,2.276765094680208e-08,1.3987631140917146e-07
-44,0.00014623043935025647,2.2864250993313975e-08,1.397065102093322e-07
+44,44,0.00014368188097051016,2.252080862505795e-08,1.3704924606778587e-07
-45,0.00014373723010448477,2.2616046400344574e-08,1.3687531950007013e-07
+45,45,0.00014123500136325632,2.227648394665253e-08,1.342768563640109e-07
-46,0.0001412854316913198,2.2370377299191064e-08,1.3409901704421416e-07
+46,46,0.00013882871459443323,2.2034644371118186e-08,1.31558126246417e-07
-47,0.00013887544742801196,2.2127221340618422e-08,1.313775961274423e-07
+47,47,0.00013646341840215168,2.1795267893415555e-08,1.2889305332810146e-07
-48,0.0001365065605420479,2.1886545482453933e-08,1.2870998887773554e-07
+48,48,0.00013413841082142,2.155832207437193e-08,1.2628059500046815e-07
-49,0.00013417806673897108,2.164831702445933e-08,1.2609514810979993e-07
+49,49,0.00013185300210097483,2.132377480769977e-08,1.2371972883222934e-07
-50,0.00013188927370907155,2.1412503578881085e-08,1.2353204666803017e-07
+50,50,0.00012960651423053282,2.1091594291962705e-08,1.2120945193769904e-07
-51,0.00012964085531237725,2.117909919147538e-08,1.2102094138348867e-07
+51,51,0.00012739961074346843,2.0861774576065466e-08,1.1875002031242091e-07
-52,0.00012743207116500861,2.094807084934547e-08,1.1856076487337955e-07
+52,52,0.00012523156633255863,2.0634283235397628e-08,1.1634039147633555e-07
-53,0.0001252621950917354,2.0719385892834214e-08,1.161504721855161e-07
+53,53,0.00012310166960708747,2.0409088189365173e-08,1.1397954484148417e-07
-54,0.00012308423338164536,2.0485363383535514e-08,1.1374627006340893e-07
+54,54,0.00012096529298347188,2.0178855168888422e-08,1.1162594309222065e-07
-55,0.00012094535834842106,2.0253755300794944e-08,1.1139168040879032e-07
+55,55,0.00011886718830718708,1.9950983760858723e-08,1.093208043434055e-07
-56,0.00011884484242431182,2.0024527468430072e-08,1.0897675288127846e-07
+56,56,0.00011680664424128133,1.9725440474060072e-08,1.0695583879566178e-07
-57,0.00011678298769107047,1.9797656169961167e-08,1.0661409941810817e-07
+57,57,0.00011478396058700633,1.950220202088885e-08,1.0464196732373097e-07
-58,0.0001147590394591346,1.9573107382367898e-08,1.0430256532408603e-07
+58,58,0.00011279839933843229,1.9281235055452333e-08,1.0237806316789167e-07
-59,0.00011277225867179729,1.935084744632288e-08,1.0204102225018314e-07
+59,59,0.00011084923776207272,1.906250658388995e-08,1.0016302524437989e-07
-60,0.00011082192110664448,1.913084301808743e-08,9.982836715827351e-08
+60,60,0.00010893576763351642,1.884598391874928e-08,9.79957771514819e-08
-61,0.00010890831555726861,1.8913080844667903e-08,9.76644171489201e-08
+61,61,0.00010705827573621923,1.8631654017664683e-08,9.587614496435341e-08
-62,0.00010703069380321927,1.8697527263494167e-08,9.554805889434612e-08
+62,62,0.00010521603014069265,1.8419483867548078e-08,9.380304193213288e-08
-63,0.00010518832400867466,1.8484148971365717e-08,9.347820572370307e-08
+63,63,0.00010340831493293095,1.8209440802910146e-08,9.1775407295826e-08
-64,0.00010353027948847247,1.8300360477604286e-08,9.158630538270034e-08
+64,64,0.00010178667717264663,1.8029552937387797e-08,8.992671343771878e-08
-65,0.00010190114820620951,1.8118339508838893e-08,8.97332684173061e-08
+65,65,0.00010019319833745167,1.7851381317094802e-08,8.811583172055121e-08
-66,0.00010030037817345079,1.7938063167097722e-08,8.791826040657302e-08
+66,66,9.86273426809622e-05,1.767490377589294e-08,8.634195328719705e-08
-67,9.872746699919663e-05,1.775950920143011e-08,8.614049912759125e-08
+67,67,9.70886230248071e-05,1.7500098774413897e-08,8.460432022445385e-08
-68,9.718188342878233e-05,1.7582655209782296e-08,8.439918541238176e-08
+68,68,9.557652367577673e-05,1.7326944621204857e-08,8.290215772518696e-08
-69,9.566310719955732e-05,1.740747903977101e-08,8.269353818341506e-08
+69,69,9.409053958216297e-05,1.7155419863785074e-08,8.123470846820667e-08
-70,9.417062845393912e-05,1.7233958752991638e-08,8.102279372648069e-08
+70,70,9.263017577528553e-05,1.698550325493719e-08,7.960123192429599e-08
-71,9.27044102709892e-05,1.7062082036004708e-08,7.938660156523957e-08
+71,71,9.119540203213482e-05,1.681718296074974e-08,7.800139303615196e-08
-72,9.12639411274833e-05,1.6891826998956218e-08,7.778420731697601e-08
+72,72,8.978572151582878e-05,1.6650437769918198e-08,7.643446000507212e-08
-73,8.984872036936478e-05,1.6723171993235663e-08,7.621487408851861e-08
+73,73,8.840064792008674e-05,1.648524670194174e-08,7.489971794966337e-08
-74,8.845926525396718e-05,1.6557077218868872e-08,7.467873241780861e-08
+74,74,8.704752218385389e-05,1.6323921332107853e-08,7.340306015991841e-08
-75,8.709405706837696e-05,1.6392620086127443e-08,7.352620174175576e-08
+75,75,8.571782151670807e-05,1.616417166590195e-08,7.228178645083984e-08
-76,8.575262707251024e-05,1.6229781230847938e-08,7.239374499535451e-08
+76,76,8.441109599127084e-05,1.6005979385519616e-08,7.117988659258102e-08
-77,8.44345490553445e-05,1.6068541919248203e-08,7.128100236441453e-08
+77,77,8.312693723019766e-05,1.584932678267078e-08,7.009701621983393e-08
-78,8.313937224726923e-05,1.5908883354530017e-08,7.018759330199112e-08
+78,78,8.186491243372442e-05,1.569419608150936e-08,6.90328103730187e-08
-79,8.18666553697718e-05,1.5750787028460176e-08,6.91131452736768e-08
+79,79,8.062459786565112e-05,1.554056978222129e-08,6.798691173543069e-08
-80,8.061596620368467e-05,1.5594234699428168e-08,6.80572933931087e-08
+80,80,7.94055784447779e-05,1.538843064058219e-08,6.695897028871753e-08
-81,7.93869860927298e-05,1.54392105845737e-08,6.701976864553917e-08
+81,81,7.820755061857071e-05,1.523776381588298e-08,6.594873006137818e-08
-82,7.81792957880057e-05,1.528569691328632e-08,6.600021709431229e-08
+82,82,7.703011159024537e-05,1.5088552513719166e-08,6.495585139392737e-08
-83,7.69924848842345e-05,1.5133676199095668e-08,6.499829226870119e-08
+83,83,7.587286701386211e-05,1.494078021244127e-08,6.398000175307732e-08
-84,7.592423495462984e-05,1.5006007729453082e-08,6.40964585216171e-08
+84,84,7.483848702669918e-05,1.481852757489104e-08,6.310775801171533e-08
-85,7.487323130273564e-05,1.4879695488874347e-08,6.320918435915818e-08
+85,85,7.382059659354297e-05,1.4697575551136038e-08,6.224941913167962e-08
-86,7.383915942693816e-05,1.475473179887786e-08,6.233620427401105e-08
+86,86,7.281889798107282e-05,1.4577917663325962e-08,6.140473404853674e-08
-87,7.282024738915393e-05,1.4631093950979863e-08,6.147602236758762e-08
+87,87,7.183165666349203e-05,1.4459532716368791e-08,6.057224011868445e-08
-88,7.181625694043332e-05,1.4508775744557438e-08,6.062843750629826e-08
+88,88,7.08586484091438e-05,1.4342415672865158e-08,5.975174825816752e-08
-89,7.082695384072487e-05,1.4387771381868581e-08,5.979325194092954e-08
+89,89,6.989965271824705e-05,1.422656189652791e-08,5.8943072529944956e-08
-90,6.985210770121701e-05,1.4268075471622408e-08,5.8970271173546604e-08
+90,90,6.895445267562359e-05,1.411196715686287e-08,5.814603001970201e-08
-91,6.889061932028676e-05,1.414966436041678e-08,5.8158567240485706e-08
+91,91,6.802197391413278e-05,1.3998609279853771e-08,5.735971476442124e-08
-92,6.79423037538828e-05,1.4032534237451406e-08,5.7357984009008465e-08
+92,92,6.710204336793658e-05,1.3886485591019257e-08,5.6583980825863337e-08
-93,6.700697867481953e-05,1.3916681725635683e-08,5.656836755557654e-08
+93,93,6.619449037899918e-05,1.3775593851234834e-08,5.581868429617485e-08
-94,6.594003301527265e-05,1.3765768410137306e-08,5.5667634894222326e-08
+94,94,6.515268324911003e-05,1.3628882565600955e-08,5.494017759648076e-08
-95,6.489000516837228e-05,1.3616343300622314e-08,5.4781184522010985e-08
+95,95,6.412720169535454e-05,1.3483606920728348e-08,5.407543748332493e-08

tests/invocation/path_requests_run

@@ -146,7 +146,7 @@ req id   demand                                GSNR@bandwidth A-Z (Z-A)   GSNR@0
 0       trx Lorient_KMA to trx Vannes_KBE :             24.83                    28.92                      14                     mode 1                   100.0                      1                     (-284,4)        
 1       trx Brest_KLA to trx Vannes_KBE :               17.75                    21.83                      14                     mode 1                   200.0                      2                     (-272,8)        
 3       trx Lannion_CAS to trx Rennes_STA :             22.21                    26.29                      13                     mode 1                    60.0                      1                     (-284,4)        
-4       trx Rennes_STA to trx Lannion_CAS :             16.07                    23.29                      17                     mode 2                   150.0                      1                     (-258,6)        
+4       trx Rennes_STA to trx Lannion_CAS :             16.06                    23.29                      17                     mode 2                   150.0                      1                     (-258,6)        
 5       trx Rennes_STA to trx Lannion_CAS :             20.31                    27.54                      17                     mode 2                    20.0                      1                     (-274,6)        
 7 | 6   trx Lannion_CAS to trx Lorient_KMA :            19.52                    23.61                      14                     mode 1                   700.0                      7                    (-224,28)        
 7b      trx Lannion_CAS to trx Lorient_KMA :            19.61                    23.69                      14                     mode 1                   400.0                      4                    (-172,24)        

tests/invocation/transmission_main_example__raman

@@ -22,18 +22,18 @@ RamanFiber          Span1
   total loss (dB):             17.00
   (includes conn loss (dB) in: 0.50 out: 0.50)
   (conn loss out includes EOL margin defined in eqpt_config.json)
-  pch out (dBm): -7.71
+  pch out (dBm): -7.77
 Fused Fused1
   loss (dB): 0.00
 Edfa Edfa1
   type_variety:           std_low_gain
-  effective gain(dB):     5.71
+  effective gain(dB):     5.77
   (before att_in and before output VOA)
-  noise figure (dB):      13.29
+  noise figure (dB):      13.23
   (including att_in)
-  pad att_in (dB):        2.29
+  pad att_in (dB):        2.23
-  Power In (dBm):         11.11
+  Power In (dBm):         11.04
-  Power Out (dBm):        16.82
+  Power Out (dBm):        16.81
   Delta_P (dB):           -2.00
   target pch (dBm):       -2.00
   effective pch (dBm):    -2.00
@@ -41,8 +41,8 @@ Edfa Edfa1
 Transceiver Site_B
   GSNR (0.1nm, dB):          31.44
   GSNR (signal bw, dB):      27.36
-  OSNR ASE (0.1nm, dB):      34.22
+  OSNR ASE (0.1nm, dB):      34.21
-  OSNR ASE (signal bw, dB):  30.14
+  OSNR ASE (signal bw, dB):  30.13
   CD (ps/nm):                1336.00
   PMD (ps):                  0.36
   PDL (dB):                  0.00
@@ -52,82 +52,82 @@ Transmission result for input power = 0.00 dBm:
 
 The GSNR per channel at the end of the line is:
 Ch. #   Channel frequency (THz)       Channel power (dBm)    OSNR ASE (signal bw, dB)     SNR NLI (signal bw, dB)        GSNR (signal bw, dB)
-    1                    191.35                      0.18                       31.61                       31.43                       28.51
+    1                    191.35                      0.21                       31.62                       31.43                       28.52
-    2                    191.40                      0.14                       31.59                       31.34                       28.45
+    2                    191.40                      0.17                       31.60                       31.35                       28.46
-    3                    191.45                      0.11                       31.57                       31.26                       28.40
+    3                    191.45                      0.13                       31.58                       31.26                       28.41
-    4                    191.50                      0.07                       31.55                       31.17                       28.35
+    4                    191.50                      0.09                       31.56                       31.18                       28.36
-    5                    191.55                      0.02                       31.52                       31.09                       28.29
+    5                    191.55                      0.03                       31.53                       31.10                       28.30
-    6                    191.60                     -0.04                       31.49                       31.02                       28.24
+    6                    191.60                     -0.02                       31.50                       31.02                       28.24
-    7                    191.65                     -0.10                       31.46                       30.94                       28.18
+    7                    191.65                     -0.08                       31.46                       30.94                       28.19
-    8                    191.70                     -0.16                       31.43                       30.86                       28.13
+    8                    191.70                     -0.14                       31.43                       30.87                       28.13
-    9                    191.75                     -0.21                       31.40                       30.79                       28.07
+    9                    191.75                     -0.20                       31.40                       30.79                       28.08
-   10                    191.80                     -0.28                       31.36                       30.71                       28.02
+   10                    191.80                     -0.27                       31.37                       30.72                       28.02
-   11                    191.85                     -0.34                       31.33                       30.64                       27.96
+   11                    191.85                     -0.33                       31.33                       30.65                       27.97
-   12                    191.90                     -0.40                       31.29                       30.57                       27.91
+   12                    191.90                     -0.40                       31.29                       30.58                       27.91
-   13                    191.95                     -0.47                       31.26                       30.50                       27.85
+   13                    191.95                     -0.46                       31.26                       30.51                       27.86
-   14                    192.00                     -0.53                       31.22                       30.43                       27.80
+   14                    192.00                     -0.53                       31.22                       30.44                       27.80
-   15                    192.05                     -0.60                       31.18                       30.36                       27.74
+   15                    192.05                     -0.59                       31.18                       30.37                       27.75
    16                    192.10                     -0.66                       31.15                       30.30                       27.69
-   17                    192.15                     -0.73                       31.11                       30.23                       27.64
+   17                    192.15                     -0.73                       31.11                       30.24                       27.64
-   18                    192.20                     -0.79                       31.07                       30.16                       27.58
+   18                    192.20                     -0.80                       31.07                       30.17                       27.59
-   19                    192.25                     -0.86                       31.04                       30.17                       27.57
+   19                    192.25                     -0.86                       31.03                       30.18                       27.57
-   20                    192.30                     -0.94                       30.99                       30.18                       27.56
+   20                    192.30                     -0.94                       30.99                       30.19                       27.56
-   21                    192.35                     -1.01                       30.95                       30.19                       27.54
+   21                    192.35                     -1.02                       30.94                       30.20                       27.54
-   22                    192.40                     -1.08                       30.91                       30.20                       27.53
+   22                    192.40                     -1.09                       30.90                       30.20                       27.53
-   23                    192.45                     -1.16                       30.86                       30.20                       27.51
+   23                    192.45                     -1.17                       30.86                       30.21                       27.51
-   24                    192.50                     -1.23                       30.82                       30.21                       27.49
+   24                    192.50                     -1.24                       30.81                       30.22                       27.50
-   25                    192.55                     -1.30                       30.78                       30.22                       27.48
+   25                    192.55                     -1.31                       30.77                       30.23                       27.48
-   26                    192.60                     -1.37                       30.74                       30.23                       27.46
+   26                    192.60                     -1.38                       30.73                       30.23                       27.46
-   27                    192.65                     -1.44                       30.70                       30.23                       27.45
+   27                    192.65                     -1.45                       30.69                       30.24                       27.45
-   28                    192.70                     -1.51                       30.65                       30.24                       27.43
+   28                    192.70                     -1.52                       30.65                       30.25                       27.43
-   29                    192.75                     -1.58                       30.61                       30.25                       27.42
+   29                    192.75                     -1.59                       30.60                       30.26                       27.42
-   30                    192.80                     -1.65                       30.57                       30.26                       27.40
+   30                    192.80                     -1.67                       30.56                       30.27                       27.40
-   31                    192.85                     -1.72                       30.53                       30.27                       27.38
+   31                    192.85                     -1.74                       30.52                       30.27                       27.38
-   32                    192.90                     -1.79                       30.48                       30.27                       27.37
+   32                    192.90                     -1.81                       30.47                       30.28                       27.37
-   33                    192.95                     -1.86                       30.44                       30.28                       27.35
+   33                    192.95                     -1.88                       30.43                       30.29                       27.35
-   34                    193.00                     -1.93                       30.40                       30.29                       27.33
+   34                    193.00                     -1.95                       30.39                       30.30                       27.33
-   35                    193.05                     -2.00                       30.35                       30.30                       27.32
+   35                    193.05                     -2.02                       30.34                       30.30                       27.31
-   36                    193.10                     -2.07                       30.31                       30.30                       27.30
+   36                    193.10                     -2.08                       30.30                       30.31                       27.30
-   37                    193.15                     -2.14                       30.27                       30.31                       27.28
+   37                    193.15                     -2.15                       30.26                       30.32                       27.28
-   38                    193.20                     -2.20                       30.22                       30.33                       27.27
+   38                    193.20                     -2.22                       30.21                       30.34                       27.26
-   39                    193.25                     -2.27                       30.18                       30.35                       27.25
+   39                    193.25                     -2.29                       30.17                       30.36                       27.25
-   40                    193.30                     -2.34                       30.14                       30.37                       27.24
+   40                    193.30                     -2.36                       30.13                       30.37                       27.24
-   41                    193.35                     -2.41                       30.09                       30.38                       27.23
+   41                    193.35                     -2.43                       30.08                       30.39                       27.22
-   42                    193.40                     -2.48                       30.05                       30.40                       27.21
+   42                    193.40                     -2.50                       30.04                       30.41                       27.21
-   43                    193.45                     -2.55                       30.00                       30.42                       27.20
+   43                    193.45                     -2.56                       29.99                       30.43                       27.19
-   44                    193.50                     -2.61                       29.96                       30.44                       27.18
+   44                    193.50                     -2.63                       29.95                       30.44                       27.18
-   45                    193.55                     -2.69                       29.91                       30.46                       27.16
+   45                    193.55                     -2.70                       29.90                       30.46                       27.16
-   46                    193.60                     -2.76                       29.86                       30.47                       27.15
+   46                    193.60                     -2.78                       29.85                       30.48                       27.15
-   47                    193.65                     -2.83                       29.82                       30.49                       27.13
+   47                    193.65                     -2.85                       29.80                       30.50                       27.13
-   48                    193.70                     -2.90                       29.77                       30.51                       27.11
+   48                    193.70                     -2.92                       29.76                       30.52                       27.11
-   49                    193.75                     -2.98                       29.72                       30.53                       27.10
+   49                    193.75                     -2.99                       29.71                       30.54                       27.09
-   50                    193.80                     -3.05                       29.67                       30.55                       27.08
+   50                    193.80                     -3.06                       29.66                       30.55                       27.07
-   51                    193.85                     -3.12                       29.62                       30.57                       27.06
+   51                    193.85                     -3.14                       29.61                       30.57                       27.06
-   52                    193.90                     -3.19                       29.58                       30.58                       27.04
+   52                    193.90                     -3.21                       29.56                       30.59                       27.04
-   53                    193.95                     -3.26                       29.53                       30.60                       27.02
+   53                    193.95                     -3.28                       29.52                       30.61                       27.02
-   54                    194.00                     -3.33                       29.48                       30.62                       27.00
+   54                    194.00                     -3.35                       29.47                       30.63                       27.00
-   55                    194.05                     -3.41                       29.43                       30.64                       26.98
+   55                    194.05                     -3.42                       29.42                       30.65                       26.98
-   56                    194.10                     -3.48                       29.38                       30.66                       26.96
+   56                    194.10                     -3.50                       29.37                       30.67                       26.96
-   57                    194.15                     -3.55                       29.33                       30.72                       26.96
+   57                    194.15                     -3.57                       29.32                       30.72                       26.95
-   58                    194.20                     -3.63                       29.28                       30.78                       26.95
+   58                    194.20                     -3.64                       29.26                       30.78                       26.95
-   59                    194.25                     -3.70                       29.23                       30.83                       26.95
+   59                    194.25                     -3.72                       29.21                       30.84                       26.94
-   60                    194.30                     -3.77                       29.18                       30.89                       26.94
+   60                    194.30                     -3.79                       29.16                       30.90                       26.94
-   61                    194.35                     -3.85                       29.12                       30.96                       26.93
+   61                    194.35                     -3.86                       29.11                       30.96                       26.93
-   62                    194.40                     -3.92                       29.07                       31.02                       26.93
+   62                    194.40                     -3.93                       29.06                       31.02                       26.92
-   63                    194.45                     -3.99                       29.02                       31.08                       26.92
+   63                    194.45                     -4.01                       29.01                       31.09                       26.91
-   64                    194.50                     -4.06                       28.97                       31.14                       26.91
+   64                    194.50                     -4.08                       28.96                       31.15                       26.91
-   65                    194.55                     -4.13                       28.92                       31.21                       26.91
+   65                    194.55                     -4.14                       28.91                       31.21                       26.90
-   66                    194.60                     -4.19                       28.88                       31.27                       26.90
+   66                    194.60                     -4.21                       28.86                       31.28                       26.90
-   67                    194.65                     -4.26                       28.83                       31.34                       26.89
+   67                    194.65                     -4.27                       28.82                       31.34                       26.89
-   68                    194.70                     -4.33                       28.78                       31.41                       26.89
+   68                    194.70                     -4.34                       28.77                       31.41                       26.88
-   69                    194.75                     -4.39                       28.73                       31.47                       26.88
+   69                    194.75                     -4.41                       28.72                       31.48                       26.88
-   70                    194.80                     -4.46                       28.68                       31.54                       26.87
+   70                    194.80                     -4.47                       28.67                       31.55                       26.87
-   71                    194.85                     -4.52                       28.64                       31.61                       26.86
+   71                    194.85                     -4.54                       28.63                       31.62                       26.86
-   72                    194.90                     -4.59                       28.59                       31.68                       26.86
+   72                    194.90                     -4.60                       28.58                       31.69                       26.85
-   73                    194.95                     -4.65                       28.54                       31.76                       26.85
+   73                    194.95                     -4.67                       28.53                       31.76                       26.84
-   74                    195.00                     -4.72                       28.49                       31.83                       26.84
+   74                    195.00                     -4.73                       28.48                       31.84                       26.83
-   75                    195.05                     -4.78                       28.44                       31.91                       26.83
+   75                    195.05                     -4.80                       28.43                       31.91                       26.82
-   76                    195.10                     -4.85                       28.39                       31.91                       26.79
+   76                    195.10                     -4.86                       28.38                       31.91                       26.79
 
 (No source node specified: picked Site_A)
 

tests/invocation/transmission_saturated

@@ -297,19 +297,19 @@ Fiber          fiber (Loudeac → Lorient_KMA)-F054
   pch out (dBm): -26.82
 Edfa west edfa in Lorient_KMA to Loudeac
   type_variety:           test
-  effective gain(dB):     28.00
+  effective gain(dB):     27.99
   (before att_in and before output VOA)
   noise figure (dB):      5.76
   (including att_in)
   pad att_in (dB):        0.00
   Power In (dBm):         -6.99
-  Power Out (dBm):        21.04
+  Power Out (dBm):        21.03
   Delta_P (dB):           -1.82
   target pch (dBm):       1.18
-  effective pch (dBm):    1.18
+  effective pch (dBm):    1.17
   output VOA (dB):        0.00
 Roadm roadm Lorient_KMA
-  effective loss (dB):  21.18
+  effective loss (dB):  21.17
   pch out (dBm):        -20.00
 Transceiver trx Lorient_KMA
   GSNR (0.1nm, dB):          23.94

tests/requirements.txt

@@ -0,0 +1 @@
+pytest>=6.2.5,<7

tests/test_roadm_restrictions.py

@@ -271,14 +271,14 @@ def test_roadm_target_power(prev_node_type, effective_pch_out_db, power_dbm):
                 if prev_node_type == 'edfa':
                     # edfa prev_node sets input power to roadm to a high enough value:
                     # check that target power is correctly set in the ROADM
-                    assert_allclose(el.pch_out_db, effective_pch_out_db, rtol=1e-3)
+                    assert_allclose(el.ref_pch_out_dbm, effective_pch_out_db, rtol=1e-3)
                     # Check that egress power of roadm is equal to target power
                     assert_allclose(power_out_roadm, db2lin(effective_pch_out_db - 30), rtol=1e-3)
                 elif prev_node_type == 'fused':
                     # fused prev_node does reamplfy power after fiber propagation, so input power
                     # to roadm is low.
                     # check that target power correctly reports power_dbm from previous propagation
-                    assert_allclose(el.pch_out_db, effective_pch_out_db + power_dbm, rtol=1e-3)
+                    assert_allclose(el.ref_pch_out_dbm, effective_pch_out_db + power_dbm, rtol=1e-3)
                     # Check that egress power of roadm is equalized to the min carrier input power.
                     assert_allclose(power_out_roadm, min_power_in_roadm, rtol=1e-3)
         else:

tox.ini

@@ -4,7 +4,7 @@ skipsdist = True
 [testenv]
 deps =
 	-r{toxinidir}/requirements.txt
-	pytest>=6.2.5,<7
+	-r{toxinidir}/tests/requirements.txt
 	cover: pytest-cov
 	linters: flake8
 	linters: pep8-naming