Skip to content

improve runtime around float numbers #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uvidal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

improve runtime around float numbers #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions cli/xraycli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@ class NoNodesError(Exception):


def humanize_number(value, fraction_point=1):
powers = [10 ** x for x in (12, 9, 6, 3, 0)]
# [10^12, 10^9, 10^6, 10^3, 10^0)]
powers = (1000000000000.0, 1000000000.0, 1000000.0, 1000.0, 1.0)
human_powers = ('T', 'B', 'M', 'K', '')
is_negative = False
return_value = 0

if not isinstance(value, float):
value = float(value)
if value < 0:
if value < 0.0:
is_negative = True
value = abs(value)
value *= -1
for i, p in enumerate(powers):
if value >= p:
return_value = str(round(value / (p / (10.0 ** fraction_point))) /
Expand All @@ -50,8 +49,7 @@ class XrayCli(object):
try:
nodes = os.listdir(self.XRAY_NODES_PATH)
nodes = [[node] for node in nodes]
nodes.insert(0, ["nodes"])
return nodes
return [["nodes"]] + nodes
except OSError:
return [["NODE"], []]

Expand All @@ -68,7 +66,7 @@ class XrayCli(object):
return self.nodes[node_name].send_recv(node_xpath, fmt)

def humanize_column(self, column):
return [humanize_number(int(value)) for value in column]
return [humanize_number(float(value)) for value in column]

def huminify_rates(self, df):
columns = df.columns
Expand Down