Skip to content

Follow-up on issue #92 : seaborn-blind error #98

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
daeGULLL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Follow-up on issue #92 : seaborn-blind error #98

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion symbulate/distributions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ def plot(self, xlim=None, alpha=None, ax=None, **kwargs):
ax.set_ylim(*ylim)

# get next color in cycle
color = get_next_color(ax)

color = get_next_color()

# plot points for discrete distributions
if self.discrete:
Expand Down
10 changes: 7 additions & 3 deletions symbulate/plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@
xlim = plt.xlim
ylim = plt.ylim

color_index=0
color_cycle = [c['color'] for c in plt.rcParams['axes.prop_cycle']]

def init_color():
hex_list = [colors.rgb2hex(rgb) for rgb in plt.cm.get_cmap('tab10').colors]
plt.rcParams["axes.prop_cycle"] = cycler('color', hex_list)

def get_next_color(axes):
color_cycle = axes._get_lines.prop_cycler
color = next(color_cycle)["color"]
def get_next_color():
global color_index
color = color_cycle[color_index]
color_index = (color_index + 1) % len(color_cycle)
return color

def configure_axes(axes, xdata, ydata, xlabel = None, ylabel = None):
Expand Down
18 changes: 9 additions & 9 deletions symbulate/results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ def plot(self, type=None, alpha=None, normalize=True, jitter=False,
# initialize figure
fig = plt.gcf()
ax = plt.gca()
color = get_next_color(ax)
color = get_next_color()

if 'density' in type:
if discrete:
Expand Down Expand Up @@ -545,27 +545,27 @@ def plot(self, type=None, alpha=None, normalize=True, jitter=False,
x_lines = np.linspace(min(x), max(x), 1000)
y_lines = np.linspace(min(y), max(y), 1000)
ax_marg_x.plot(x_lines, densityX(x_lines), linewidth=2,
color=get_next_color(ax))
color=get_next_color())
ax_marg_y.plot(y_lines, densityY(y_lines), linewidth=2,
color=get_next_color(ax),
color=get_next_color(),
transform=Affine2D().rotate_deg(270) + ax_marg_y.transData)
else:
if discrete_x:
make_marginal_impulse(x_count, get_next_color(ax), ax_marg_x, alpha, 'x')
make_marginal_impulse(x_count, get_next_color(), ax_marg_x, alpha, 'x')
else:
ax_marg_x.hist(x, color=get_next_color(ax), density=normalize,
ax_marg_x.hist(x, color=get_next_color(), density=normalize,
alpha=alpha, bins=bins)
if discrete_y:
make_marginal_impulse(y_count, get_next_color(ax), ax_marg_y, alpha, 'y')
make_marginal_impulse(y_count, get_next_color(), ax_marg_y, alpha, 'y')
else:
ax_marg_y.hist(y, color=get_next_color(ax), density=normalize,
ax_marg_y.hist(y, color=get_next_color(), density=normalize,
alpha=alpha, bins=bins, orientation='horizontal')
plt.setp(ax_marg_x.get_xticklabels(), visible=False)
plt.setp(ax_marg_y.get_yticklabels(), visible=False)
else:
fig = plt.gcf()
ax = plt.gca()
color = get_next_color(ax)
color = get_next_color()

nullfmt = NullFormatter() #removes labels on fig

Expand Down Expand Up @@ -605,7 +605,7 @@ def plot(self, type=None, alpha=None, normalize=True, jitter=False,
if alpha is None:
alpha = np.log(2) / np.log(len(self) + 1)
ax = plt.gca()
color = get_next_color(ax)
color = get_next_color()
for result in self.results:
result.plot(alpha=alpha, color=color, **kwargs)
plt.xlabel("Index")