DM-18314: reduce namespace confusion for matchOptimisticB #116
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
r-owen
requested changes
Mar 6, 2019
PaulPrice
force-pushed
the
tickets/DM-18314
branch
from
98e6dfc
to
f529d72
Compare
|
@r-owen: I've changed it so that the function name is preserved. I'm not completely happy with this solution, as the function is still being imported into the |
r-owen
approved these changes
Mar 8, 2019
|
If it works feel free to merge. But consider omitting "matchOptimisticB" from |
PaulPrice
force-pushed
the
tickets/DM-18314
branch
from
f529d72
to
040aab4
Compare
The 'matchOptimisticB' namespace is overloaded, which makes it
impossible to do:
import lsst.meas.astrom.matchOptimisticB.matchOptimisticBContinued
lsst.meas.astrom.matchOptimisticB.matchOptimisticBContinued.MatchOptimisticBTask
results in:
AttributeError: 'builtin_function_or_method' object has no attribute 'matchOptimisticBContinued'
The 'matchOptimisticB' module contains a function called
'matchOptimisticB' which was being imported over the top of the
module, so leave it in the module. Move the MatchOptimisticBTask
from the 'matchOptimisticB' module so it can be accessed
without problems. Added a test that detects the problem.
src/sip/CreateWcsWithSip.cc: In constructor 'lsst::meas::astrom::sip::CreateWcsWithSip<MatchT>::CreateWcsWithSip(const std::vector<T>&, const lsst::afw::geom::SkyWcs&, int, const lsst::geom::Box2I&, int)':
src/sip/CreateWcsWithSip.cc:145:46: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
if (_bbox.isEmpty() && !_matches.empty() > 0) {
^
Looks like a '_matches.size() > 0' was only half-changed to
'!_matches.empty()'.
PaulPrice
force-pushed
the
tickets/DM-18314
branch
from
040aab4
to
33f1e6a
Compare
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.
The 'matchOptimisticB' namespace is overloaded, which makes it
impossible to do:
import lsst.meas.astrom.matchOptimisticB.matchOptimisticBContinued
lsst.meas.astrom.matchOptimisticB.matchOptimisticBContinued.MatchOptimisticBTask
results in:
AttributeError: 'builtin_function_or_method' object has no attribute 'matchOptimisticBContinued'
The 'matchOptimisticB' module contains a function called
'matchOptimisticB' which is being imported over the top of the
module, so rename that function. Move the MatchOptimisticBTask
from the 'matchOptimisticB' module so it can be accessed
without problems. Added a test that detects the problem.