- indicate which request has incorrect tsp type or mode
- correct wrong reading from excel : if string values contain only a number
xlrd interprets as a float eg 1 -> 1.0 . A function is used to correct this
when filling the Request class
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
- adding cost in every config files including tests files,
- correcting wrong usage reactions (if value is not correct)
- correction of orthograph
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
- correction of json to csv function
- small correction on disjunction format to avoid double (double crash the program)
- adding time stamp to measure perf
- demands with all the same disjunction can be aggregated
- a new set of disjunction list is created to avoid inconsistancy
with the aggregated request-ids
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
adding the counting feature on standard output
adding tsp nb in csv + small bug fixes
small fixes to improve stdout and csv printing
small bug fixes on service aggregation and automatic correction of names
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
if mode is not given, the program automatically choses the first mode of the tsp
that has the highest bitrate and baudrate
- propagation for each loop on baudrate, no proppag in the loop on the mode
(same propoagation applies for identical baudrate)
- starts with the highest baudrate
- Make power and nb-channel optional fields
- power uses defaulf power in SI
- nb channel computed based on min max frequency and spacing
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
- add bitrate in the json service file and enable to support both with and without bitrate
- change mode to optional
- add an aggregation function that groups identical demands (except for id and bitrate)
TODO : check which mode can satisfy the request or how many transponders -> going towards
dimensionning
- Correcting some bug on loose parameter: hop-type attribute was forced to be always 'loose'
-> now reads the excel entry
- service sheets checks on header if field names are corrects, but any order is
now feasible.
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
- re-changing to to \u2192 in convert.py to comply with test files
- changing route constraint in data file : the constraint had a too ambiguous
naming in the service file
- test on None was incorrect in convert_sheet
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
correct loose or strict constraint in the new function correct_route_list
correct test to find the name with existing uids
remove the \u2192 char that was not well supported with excel reading
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
- normal way is usually to apply the design optical power for all channels.
This change uses the default power (same power as used for design) but enables to
force an arbitrary power if needed. TODO : introduce spectral power density
to apply power depending on baudrate.
- definition of min max frequency and spacing define the nb of channels:
uses min max frequencies and spacing to determine nb-channels. It is possible
to force a different spacing for the request. TODO: check that the value is
consistant with baudrate and min max values.
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
- Implementing a conflict table for path disjoint choices
- adding disjunction in the parser and json (read and write)
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
