RectPartition and Deformation fixes #748
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
* Add domain parameter to LinDeformFixedTempl.__init__, enables different dtypes, backends and interpolations * Relax condition of coord space and template space in deformations to requiring that the partitions match.
adler-j
force-pushed
the
issue-747__Rectpartition_ne_missing
branch
from
acc9b7d
to
388bfcd
Compare
kohr-h
requested changes
Nov 30, 2016
| """Initialize a new instance. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| template : `DiscreteLpElement` | ||
| Fixed template that is to be deformed. | ||
| domain : power space of `DiscreteLp` | ||
| The space of all allowable coordinates in the deformation. |
| A `ProductSpace` of ``template.ndim`` copies of a function-space. | ||
| It must fulfill | ||
| ``domain[0].partition == template.space.partition``, so | ||
| this option is useful mainly when different interpolations |
| """Initialize a new instance. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| template : `DiscreteLpElement` | ||
| Fixed template that is to be deformed. | ||
| domain : power space of `DiscreteLp` |
| It must fulfill | ||
| ``domain[0].partition == template.space.partition``, so | ||
| this option is useful mainly when different interpolations | ||
| in the displacement and template. |
| domain = self.template.space.real_space.tangent_bundle | ||
| else: | ||
| if not isinstance(domain, ProductSpace): | ||
| raise TypeError('`coord_space` must be a `ProductSpace` ' |
| raise TypeError('`coord_space` must be a power space, ' | ||
| 'got {!r}'.format(domain)) | ||
| if not isinstance(domain[0], DiscreteLp): | ||
| raise TypeError('`coord_space[0]` must be a `DiscreteLp` ' |
| 'instance, got {!r}'.format(domain[0])) | ||
|
|
||
| if template.space.partition != domain[0].partition: | ||
| raise ValueError('`template.space.partition` not ' |
There was a problem hiding this comment.
break like this
raise ValueError(
'...')That should require much less lines.
| It must fulfill | ||
| ``domain[0].partition == template.space.partition``, so | ||
| this option is useful mainly when different interpolations | ||
| in the displacement and template. |
There was a problem hiding this comment.
You mention complex spaces in the other variant but not here.
There was a problem hiding this comment.
It is not relevant here, giving a complex template is handled properly already without it.
| raise ValueError('`templ_space.real_space.tangent_bundle` not ' | ||
| 'equal to `displacement.space` ({} != {})' | ||
| if templ_space.partition != space[0].partition: | ||
| raise ValueError('`templ_space.partition` not ' |
| option is useful mainly for support of complex spaces. | ||
| ``templ_space[0].partition == displacement.space.partition``, so | ||
| this option is useful mainly for support of complex spaces and if | ||
| different interpolations should be used for the displacement and |
|
Updated by comments. merge? |
kohr-h
approved these changes
Nov 30, 2016
|
Sure! |
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.
Fixes issue #747,
RectPartition.__ne__missing and also fixes what I was aiming to fix, more relaxed conditions for the template space and coordinate space.