Re-write of colour fix code #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukashergt
reviewed
Jul 11, 2019
| if xmin is not None and (min(d) - xmin)/(max(d)-min(d)) > 1e-2: | ||
| xmin = None | ||
| if xmax is not None and (xmax - max(d))/(max(d)-min(d)) > 1e-2: | ||
| xmax = None |
There was a problem hiding this comment.
I'm getting this error now:
---------------------------------------------------------------------------
AttributeError Traceback (most recent call last)
<ipython-input-26-3db102adf145> in <module>()
----> 1 fig, axes= pc_lcdm.plot_2d(['A_s', 'n_s', 'r'], label='LCDM')
/scratch/.virtualenvs/py27env/lib/python2.7/site-packages/anesthetic/samples.pyc in plot_2d(self, axes, *args, **kwargs)
278 ax_ = ax.twin if x == y else ax
279 self.plot(ax_, x, y, plot_type=types[pos], *args,
--> 280 **local_kwargs[pos])
281
282 return fig, axes
/scratch/.virtualenvs/py27env/lib/python2.7/site-packages/anesthetic/samples.pyc in plot(self, ax, paramname_x, paramname_y, *args, **kwargs)
155
156 return plot(ax, x, y, xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax,
--> 157 *args, **kwargs)
158
159 def plot_1d(self, axes, *args, **kwargs):
/scratch/.virtualenvs/py27env/lib/python2.7/site-packages/anesthetic/plot.pyc in contour_plot_2d(ax, data_x, data_y, *args, **kwargs)
351
352 x, y, pdf = kde_2d(data_x, data_y,
--> 353 xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax)
354 pdf /= pdf.max()
355 p = sorted(pdf.flatten())
/scratch/.virtualenvs/py27env/lib/python2.7/site-packages/anesthetic/kde.pyc in kde_2d(d_x, d_y, xmin, xmax, ymin, ymax)
79 f = [xmax is None or xmin is None,
80 ymax is None or ymin is None]
---> 81 d_x_, d_y_ = mirror_2d(d_x, d_y, xmin, xmax, ymin, ymax)
82
83 with warnings.catch_warnings():
/scratch/.virtualenvs/py27env/lib/python2.7/site-packages/anesthetic/utils.pyc in mirror_2d(d_x_, d_y_, xmin, xmax, ymin, ymax)
79 def mirror_2d(d_x_, d_y_, xmin=None, xmax=None, ymin=None, ymax=None):
80 """If necessary apply reflecting boundary conditions."""
---> 81 d_x = d_x_.copy()
82 d_y = d_y_.copy()
83
AttributeError: 'list' object has no attribute 'copy'There was a problem hiding this comment.
How easy would it be to add a failing test which shows this error?
There was a problem hiding this comment.
Test added.
The test for samples.plot_2d didn't check for 1d lists as input.
Codecov Report
@@ Coverage Diff @@
## master #21 +/- ##
=========================================
+ Coverage 87% 87.3% +0.29%
=========================================
Files 15 15
Lines 1093 1095 +2
=========================================
+ Hits 951 956 +5
+ Misses 142 139 -3
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## master #21 +/- ##
=========================================
+ Coverage 87% 87.3% +0.29%
=========================================
Files 15 15
Lines 1093 1095 +2
=========================================
+ Hits 951 956 +5
+ Misses 142 139 -3
Continue to review full report at Codecov.
|
* At the moment `test_different_parameters` only tests for `plot_2d` with 2d input for `axes`, i.e. `[params_x, params_y]` as input. Ordinary triangle plots are generated with 1d input though, i.e. `params_x` as input. * This is particularly important here, when `params_x` has more parameters than the model tested which is failing at the moment. Changes to be committed: * modified: tests/test_samples.py
…andley/anesthetic into rewrite_colour_fix
|
@lukashergt I believe this is now fixed, although would be good to check that you don't get any further issues arising on your system. |
lukashergt
approved these changes
Jul 12, 2019
lukashergt
pushed a commit
to lukashergt/anesthetic
that referenced
this pull request
Jul 14, 2019
* In handley-lab#21 the calls of `ax.plot([], [])` and similar were changed to setting `x = []` and passing it to the plotting functions. - This does not take care of the different colour cycles of plot and scatter and thus does not work. Changes to be committed: * modified: anesthetic/samples.py
This was referenced Jul 14, 2019
Merged
williamjameshandley
pushed a commit
that referenced
this pull request
Jul 15, 2019
* revert rewrite of colour fix from #21 * In #21 the calls of `ax.plot([], [])` and similar were changed to setting `x = []` and passing it to the plotting functions. - This does not take care of the different colour cycles of plot and scatter and thus does not work. Changes to be committed: * modified: anesthetic/samples.py * make pep8 conform
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@lukashergt: is there any reason why this wouldn't fix #19 in the same manner as #15?
I think this way of doing it is slightly more logical, and will be easier for downstream changes to integrate.
Checklist:
flake8 anesthetic tests)pydocstyle --convention=numpy anesthetic)python -m pytest)