commit 664742c40fa82d0f907b63e5c7c2157a03859993 Author: Georg Koppen gk@torproject.org Date: Mon Mar 22 10:45:12 2021 +0000

fix: doc: Clarify Torflow aggregation

Closes #40082. --- docs/source/torflow_aggr.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/torflow_aggr.rst b/docs/source/torflow_aggr.rst index a79c3c8..a45dac8 100644 --- a/docs/source/torflow_aggr.rst +++ b/docs/source/torflow_aggr.rst @@ -305,7 +305,7 @@ In Torflow's `aggregate.py`_ code::

So::

- n.ratio = max(sbw_ratio, n.fbw_ratio) + n.ratio = max(n.sbw_ratio, n.fbw_ratio)

This is also expressed in pseudocode in the `bandwidth file spec`_, section B.4 step 2 and 3. @@ -329,7 +329,7 @@ So::

n.new_bw = ( min(bandwidth-avg, bandwidth-observed) or 1 \ - * max(bwstrm_i / bwstrm, bwfilt_i / bwfilt_i) + * max(bwstrm_i / bwstrm, bwfilt_i / bwfilt) )

This is also expressed in pseudocode in the `bandwidth file spec`_, section B.4