Add copynames argument to copy #297
Merged
+91
−46
Conversation
This file contains hidden or 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
Codecov Report
@@ Coverage Diff @@
## master #297 +/- ##
==========================================
+ Coverage 96.18% 96.19% +<.01%
==========================================
Files 25 25
Lines 4192 4227 +35
==========================================
+ Hits 4032 4066 +34
- Misses 160 161 +1
Continue to review full report at Codecov.
|
mlubin
reviewed
Apr 8, 2018
src/Test/modellike.jl
Outdated
| @test MOI.supportsconstraint(dest, MOI.VectorAffineFunction{Float64}, MOI.Zeros) | ||
|
|
||
| copyresult = MOI.copy!(dest, src) | ||
| copyresult = MOI.copy!(dest, src; copynames=false) |
There was a problem hiding this comment.
the semicolon isn't needed at call sites, you can say MOI.copy!(dest, src, copynames=false)
mlubin
reviewed
Apr 8, 2018
src/Utilities/cachingoptimizer.jl
Outdated
| function attachoptimizer!(m::CachingOptimizer) | ||
| @assert m.state == EmptyOptimizer | ||
| copy_result = MOI.copy!(m.optimizer, m.model_cache) | ||
| # We do not need to copy names are name-related operation are handled by `m.model_cache` |
There was a problem hiding this comment.
malformed sentence. maybe: "we do not need to copy names because name-related operations are handled by m.model_cache"
mlubin
reviewed
Apr 8, 2018
| attribute_value_map(idxmap, f::MOI.AbstractFunction) = mapvariables(idxmap, f) | ||
| attribute_value_map(idxmap, attribute_value) = attribute_value | ||
| function defaultcopy!(dest::MOI.ModelLike, src::MOI.ModelLike) | ||
| function defaultcopy!(dest::MOI.ModelLike, src::MOI.ModelLike, copynames::Bool) |
There was a problem hiding this comment.
Maybe add a deprecation to not immediately break all solver interfaces that use defaultcopy!
5 tasks
mlubin
reviewed
Apr 9, 2018
src/Utilities/cachingoptimizer.jl
Outdated
| @assert m.state == EmptyOptimizer | ||
| copy_result = MOI.copy!(m.optimizer, m.model_cache) | ||
| # We do not need to copy names because name-related operations are handled by `m.model_cache` | ||
| copy_result = MOI.copy!(m.optimizer, m.model_cache; copynames=false) |
mlubin
reviewed
Apr 9, 2018
src/Utilities/copy.jl
Outdated
| attribute_value_map(idxmap, f::MOI.AbstractFunction) = mapvariables(idxmap, f) | ||
| attribute_value_map(idxmap, attribute_value) = attribute_value | ||
| function defaultcopy!(dest::MOI.ModelLike, src::MOI.ModelLike) | ||
| warn("defaultcopy!(dest, src) is deprecated, use defaultcopy!(dest, src, false) instead or defaultcopy!(dest, src, true) if you do not want to copy names.") |
There was a problem hiding this comment.
Are false and true swapped here? true is the default, and you use false if you do not want to copy names
mlubin
approved these changes
Apr 9, 2018
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.
Closes #291