Merge remote-tracking branch 'gitlab/merge-requests/22' into maint-1.1

1adce87c · Georg Koppen · e4433c79 · f075a645 · 1adce87c · 1adce87c
Commit 1adce87c authored Aug 11, 2020 by Georg Koppen
Showing with 237 additions and 3 deletions

docs/source/classes_original.puml docs/source/classes_original.puml +2 -2

docs/source/images/classes_original.svg docs/source/images/classes_original.svg +233 -1

sbws/lib/v3bwfile.py sbws/lib/v3bwfile.py +2 -0

No files found.
--- a/docs/source/classes_original.puml
+++ b/docs/source/classes_original.puml
@@ -30,7 +30,7 @@ class Relay {
  int @p average_bandwidth
  int @p burst_bandwidth
  int @p consensus_bandwidth
-  int @p consensus_bandwidth_is_unmeasured
+  bool @p consensus_bandwidth_is_unmeasured
  obj _from_ns(attr)
  obj _from_desc(attr)
  bool can_exit_to_port(int port)
@@ -217,4 +217,4 @@ class State {
  get()
 }

-@enduml
\ No newline at end of file
+@enduml
--- a/docs/source/images/classes_original.svg
+++ b/docs/source/images/classes_original.svg
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -260,6 +260,8 @@ BWLINE_INT_KEYS = (
    + BWLINE_KEYS_V1_2
    + BWLINE_KEYS_V1_4
 )
+# This is boolean, not int.
+BWLINE_INT_KEYS.remove('consensus_bandwidth_is_unmeasured')


 def round_sig_dig(n, digits=PROP276_ROUND_DIG):