Skip to content

add standard deviation to histogram summary #35

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

Closed
sboysel wants to merge 15 commits into from
Closed

add standard deviation to histogram summary #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1517bf9
Improves the setting of xlims in the scatter plot
GregoryAshton Oct 7, 2015
7c4c566
Initial commit on adding color support to scatter-plot
GregoryAshton Oct 7, 2015
27e28cc
add standard deviation to histogram summary
sboysel Jan 4, 2016
a30c8ad
Merge remote-tracking branch 'ga7g08/Adds-color-support-to-scatter-plot'
sboysel Jan 10, 2016
f25053a
allow colour input file
sboysel Jan 10, 2016
00d393d
Update version
Jan 17, 2016
366dd33
packages
Jan 17, 2016
da36d24
packages
Jan 17, 2016
ea5e87f
updates build
Jan 17, 2016
9dde899
re-write scatter plot, update docs
Jan 17, 2016
4525778
ignore Mac dump files
Jan 17, 2016
80d6c7a
Support custom print function take str as input
Jan 17, 2016
d7fd699
Stable, add bar plot
Jan 17, 2016
387bb58
Not always return str
Jan 17, 2016
40ff90b
add barplot
Jan 17, 2016
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
Prev Previous commit
Next Next commit
Support custom print function take str as input
  • Loading branch information
TrungNT committed Jan 17, 2016
commit 80d6c7a827588b5bcceac0c028297dbd9763b1c1
39 changes: 21 additions & 18 deletions bashplotlib/histogram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ def run_demo():
plot_hist(demo_file, height=35.0, bincount=40)


def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="default", title="", xlab=None, showSummary=False, regular=False):
def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o",
colour="default", title="", xlab=None, showSummary=False,
regular=False, print_func=print):
''' Plot histogram.
1801| oo
1681| oo
Expand Down Expand Up @@ -121,7 +123,8 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
whether or not to display a summary
regular : boolean
whether or not to start y-labels at 0

print_func : callable
custom print function
'''
if pch is None:
pch = "o"
Expand Down Expand Up @@ -178,8 +181,8 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
nlen = max(len(str(min_y)), len(str(max_y))) + 1

if title:
print(box_text(title, max(len(hist) * 2, len(title)), nlen))
print()
print_func(box_text(title, max(len(hist) * 2, len(title)), nlen))
print_func()

used_labs = set()
for y in ys:
Expand All @@ -190,47 +193,47 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
used_labs.add(ylab)
ylab = " " * (nlen - len(ylab)) + ylab + "|"

print(ylab, end=' ')
print_func(ylab, end=' ')

for i in range(len(hist)):
if int(y) <= hist[i]:
printcolour(pch, True, colour)
printcolour(pch, True, colour, print_func)
else:
printcolour(" ", True, colour)
print('')
printcolour(" ", True, colour, print_func)
print_func('')
xs = hist.keys()

print(" " * (nlen + 1) + "-" * len(xs))
print_func(" " * (nlen + 1) + "-" * len(xs))

if xlab:
xlen = len(str(float((max_y) / height) + max_y))
for i in range(0, xlen):
printcolour(" " * (nlen + 1), True, colour)
printcolour(" " * (nlen + 1), True, colour, print_func)
for x in range(0, len(hist)):
num = str(bins[x])
if x % 2 != 0:
pass
elif i < len(num):
print(num[i], end=' ')
print_func(num[i], end=' ')
else:
print(" ", end=' ')
print('')
print_func(" ", end=' ')
print_func('')

center = max(map(len, map(str, [n, min_val, mean, max_val])))
center += 15

if showSummary:
print()
print("-" * (2 + center))
print("|" + "Summary".center(center) + "|")
print("-" * (2 + center))
print_func()
print_func("-" * (2 + center))
print_func("|" + "Summary".center(center) + "|")
print_func("-" * (2 + center))
summary = "|" + ("observations: %d" % n).center(center) + "|\n"
summary += "|" + ("min value: %f" % min_val).center(center) + "|\n"
summary += "|" + ("mean : %f" % mean).center(center) + "|\n"
summary += "|" + ("sd : %f" % sd).center(center) + "|\n"
summary += "|" + ("max value: %f" % max_val).center(center) + "|\n"
summary += "-" * (2 + center)
print(summary)
print_func(summary)


def main():
Expand Down
2 changes: 1 addition & 1 deletion bashplotlib/scatterplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def plot_scatter(xs, ys, size=None, pch='o', colour='red', title=None, print_fun
plotted.add((xp, yp))
if isinstance(cs, list):
colour = cs[i]
printcolour(point, True, colour)
printcolour(point, True, colour, print_func)
print_func(" |")
print_func("-" * (2 * len(get_scale(xs, False, size)) + 2))

Expand Down
9 changes: 6 additions & 3 deletions bashplotlib/utils/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
Various helpful function for bashplotlib
"""

from __future__ import print_function
import sys

isiterable = lambda x: hasattr(x, '__iter__') or hasattr(x, '__getitem__')
Expand Down Expand Up @@ -32,15 +32,18 @@ def get_colour(colour):
return bcolours.get(colour, bcolours['ENDC'])


def printcolour(text, sameline=False, colour=get_colour("ENDC")):
def printcolour(text, sameline=False, colour=get_colour("ENDC"), print_func=print):
"""
Print color text using escape codes
"""
if sameline:
sep = ''
else:
sep = '\n'
sys.stdout.write(get_colour(colour) + text + bcolours["ENDC"] + sep)
if print_function == print:
sys.stdout.write(get_colour(colour) + text + bcolours["ENDC"] + sep)
else:
print_func(get_colour(colour) + text + bcolours["ENDC"] + sep)


def drange(start, stop, step=1.0, include_stop=False):
Expand Down