aboutsummaryrefslogtreecommitdiff
path: root/src/consensus/consensus-simulation.py.in
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-10 21:17:39 +0100
committerHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-10 21:17:39 +0100
commit1b292596c1cbb211c22542607f6f5d15f2dc0465 (patch)
treeae4d64f525c43bb81ad601f1e76287d383ba1b31 /src/consensus/consensus-simulation.py.in
parent3d6ba937a5a5046b3d531c17691d5d1155daae71 (diff)
downloadgnunet-1b292596c1cbb211c22542607f6f5d15f2dc0465.tar.gz
gnunet-1b292596c1cbb211c22542607f6f5d15f2dc0465.zip
Fix Python code: remove imports from `python-future`.
I missed in 3d6ba937a5a5046b3d531c17691d5d1155daae71 that `future` also provides the modules `past` and `builtins`. Imports of `builtins` can simply be removed for Python-3-only code. `past.old_div` had to be replaces by the "old" div-operatot `//`, while `past.xrange` was unused.
Diffstat (limited to 'src/consensus/consensus-simulation.py.in')
-rw-r--r--src/consensus/consensus-simulation.py.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in
index 23639b195..39daf81c6 100644
--- a/src/consensus/consensus-simulation.py.in
+++ b/src/consensus/consensus-simulation.py.in
@@ -17,13 +17,9 @@
17# 17#
18# SPDX-License-Identifier: AGPL3.0-or-later 18# SPDX-License-Identifier: AGPL3.0-or-later
19 19
20from builtins import str
21from builtins import range
22from past.utils import old_div
23import argparse 20import argparse
24import random 21import random
25from math import ceil, log, floor 22from math import ceil, log, floor
26from past.builtins import xrange
27 23
28 24
29def bsc(n): 25def bsc(n):
@@ -40,7 +36,7 @@ def bsc(n):
40 36
41def simulate(k, n, verbose): 37def simulate(k, n, verbose):
42 assert k < n 38 assert k < n
43 largest_arc = old_div(int(2**ceil(log(n, 2))), 2) 39 largest_arc = int(2**ceil(log(n, 2))) // 2
44 num_ghosts = (2 * largest_arc) - n 40 num_ghosts = (2 * largest_arc) - n
45 if verbose: 41 if verbose:
46 print("we have", num_ghosts, "ghost peers") 42 print("we have", num_ghosts, "ghost peers")
@@ -106,4 +102,4 @@ if __name__ == "__main__":
106 sum = 0.0 102 sum = 0.0
107 for n in range(0, args.r): 103 for n in range(0, args.r):
108 sum += simulate(args.k, args.n, args.verbose) 104 sum += simulate(args.k, args.n, args.verbose)
109 print(old_div(sum, args.r)) 105 print(sum // args.r)