Commit 36d96da7 authored by juga's avatar juga
Browse files

Merge branch 'bug_40082' into 'maint-1.1' 

fix: doc: Clarify Torflow aggregation

Closes #40082

See merge request tpo/network-health/sbws!80
parents 37d5c0ab 664742c4

docs/source/torflow_aggr.rst

+2 −2
Original line number Diff line number Diff line
@@ -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