Allowing functions containing parameters for Contractor #142
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
|
@dpsanders as you suggested, I allowed to input parameters in function argument to avoid the problem of slowing down the process due to global variables. And also made the test cases as you needed. |
|
I think you can merge this PR now. |
dpsanders
reviewed
Jun 11, 2019
| @@ -148,7 +157,7 @@ BasicContractor(vars, f::Function) = BasicContractor([Variable(Symbol(i))() for | |||
|
|
|||
| Contractor(expr::Operation) = Contractor([], expr::Operation) | |||
|
|
|||
| Contractor(vars::Union{Vector{Operation}, Tuple{Vararg{Operation,N}}}, g::Function) where N = Contractor(vars, g(vars...)) #Contractor can be constructed by function name only | |||
| Contractor(vars::Union{Vector{Operation}, Tuple{Vararg{Operation,N}}}, para::Union{Vector{Operation}, Tuple{Vararg{Operation,N}}}, g::Function) where N = Contractor(vars, g(vars..., para...)) #Contractor can be constructed by function name onlyContractor(vars::Union{Vector{Operation}, Tuple{Vararg{Operation,N}}}, g::Function) where N = Contractor(vars, g(vars...)) #Contractor can be constructed by function name only | |||
There was a problem hiding this comment.
It should not be necessary to use so many type annotations.
Also there is some duplication at the end of the line.
Please always add a space after # in comments.
|
|
||
| for p in parameters | ||
| X = ×(X, p..p) |
There was a problem hiding this comment.
This will be very slow.
Also the parameters might conceivably be intervals.
| @@ -69,25 +74,29 @@ function contract(C::AbstractContractor, A::IntervalBox{Nout,T}, X::IntervalBox{ | |||
| # @show constrained | |||
| # @show intermediate | |||
| # @show C.backward(X, constrained, intermediate) | |||
| return IntervalBox{N,T}(C.backward(X, constrained, intermediate) ) | |||
| return IntervalBox{N,T}(C.backward(X, constrained, intermediate)[1:N]) | |||
There was a problem hiding this comment.
I don't understand why there's [1:N] here suddenly.
|
No longer relevant. |
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 #140