diff options
author | Vratko Polak <vrpolak@cisco.com> | 2021-03-22 17:11:21 +0100 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2021-03-22 17:11:21 +0100 |
commit | b6fbffad32515ccf94404680cb5280c2cb561af5 (patch) | |
tree | 6f16569781e3e3627589c6fff0d7a5be0410d3f3 /resources/libraries/python/MLRsearch/ProgressState.py | |
parent | adf5f13886e8bdd4fb224f12f10d731cadf698f3 (diff) |
MLRsearch: Support other than just two ratios
+ Change some method names and argument types:
+ Do not mention NDR and PDR, except as examples.
+ Return list of ReceiveRateInterval instead of NdrPdrResult.
+ The resulting intervals can be degenerate when hitting min/max rate.
+ Rename quantity name parts from "fraction" to "ratio".
+ Intervals are no longer tracked for each target ratio.
+ They are found dynamically from known results.
+ Add effective_loss_ratio field to avoid loss inversion effects.
+ Move some functions to separate files.
+ Bound search logic moved to MeasurementDatabase.py
+ ProgressState moved to its file.
+ WidthArithmetics.py holds small computation functions.
+ Use parameter expansion_coefficient instead of "doublings".
+ Do uneven bisect to save time when width is not power of two times goal.
+ Timeout now correctly tracked for the whole search,
not just the current phase.
+ Make logging (debug) function pluggable.
+ Added debug log messages for initial phase.
+ Do not mark as subclass if contructor signature differs.
+ Avoid re-measure on scale-limited (ASTF) profiles.
+ Remove outdated comments.
+ Bump copyright years.
Change-Id: I93f693b4f186f59030ee5ac21b78acc890109813
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/python/MLRsearch/ProgressState.py')
-rw-r--r-- | resources/libraries/python/MLRsearch/ProgressState.py | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/resources/libraries/python/MLRsearch/ProgressState.py b/resources/libraries/python/MLRsearch/ProgressState.py new file mode 100644 index 0000000000..3610638990 --- /dev/null +++ b/resources/libraries/python/MLRsearch/ProgressState.py @@ -0,0 +1,60 @@ +# Copyright (c) 2021 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Module defining ProgressState class.""" + + +class ProgressState: + """Structure containing data to be passed around in recursion. + + This is basically a private class of MultipleRatioSearch, + but keeping it in a separate file makes things more readable. + """ + + def __init__( + self, database, phases, duration, width_goal, packet_loss_ratios, + min_rate, max_rate, stop_time): + """Convert and store the argument values. + + Also initializa the stored width for external search. + + :param result: Structure containing measured results. + :param phases: How many intermediate phases to perform + before the current one. + :param duration: Trial duration to use in the current phase [s]. + :param width_goal: The goal relative width for the curreent phase. + :param packet_loss_ratios: List of ratios for the current search. + :param min_rate: Minimal target transmit rate available + for the current search [tps]. + :param max_rate: Maximal target transmit rate available + for the current search [tps]. + :param stop_time: Monotonic time [s] when we should fail on timeout. + :type result: MeasurementDatabase + :type phases: int + :type duration: float + :type width_goal: float + :type packet_loss_ratios: Iterable[float] + :type min_rate: float + :type max_rate: float + :type stop_time: float + """ + self.database = database + self.phases = int(phases) + self.duration = float(duration) + self.width_goal = float(width_goal) + self.packet_loss_ratios = [ + float(ratio) for ratio in packet_loss_ratios + ] + self.min_rate = float(min_rate) + self.max_rate = float(max_rate) + self.stop_time = float(stop_time) |