Class Guessing Implementation #74
Conversation
|
This is an excellent candidate for some unit tests - it will be easier to tweak the implementation once you have some tests. |
|
I think this is complete. Please ignore my comment about all elements having length, I realise now that they only do after element creation. My comment concerning the misidentifying skew quadrupoles is still valid though. I will remove both comments on my next commit. |
pyat/test/conftest.py
Outdated
|
|
||
|
|
||
| @pytest.fixture | ||
| def rin(): | ||
| rin = numpy.array(numpy.zeros((6, 1)), order='F') | ||
| return rin | ||
|
|
||
| @pytest.fixture(scope='session') |
There was a problem hiding this comment.
Why do you need these fixtures? Can't you just use load_mat.CLASSES in the tests?
There was a problem hiding this comment.
I tried it and it didn't work...I can't remember why though. I'll take another look.
There was a problem hiding this comment.
Apologies, it doesn't work with pytest.mark.parametrize or passing it as an argument without fixtures. It does however work if you just define it at the top of the file and then don't pass it as an argument to the tests. I'll commit this change as it's simpler than using fixtures.
|
Is this ready for merging ? I would like to take benefit of it ! |
|
This looks generally OK. I'm still not sure why you redefine the constants at the top of |
|
Corrected. |
Lots of basic logic to hopefully better identify element Classes. This function will misidentify rather than not identify a class, though it is unlikely that this will have an effect on the essential functions or twiss data of the ring. The sanitisation function should also catch most PassMethod/Class incompatibilities that would otherwise raise an error during atpass.