Skip to content

Use IntervalContractors.jl for reverse functions #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 4, 2017
Merged

Use IntervalContractors.jl for reverse functions #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cc1077
Replace reverse_mode.jl with using IntervalContractors package
dpsanders Apr 30, 2017
7fc3c37
Make alias for unexported rev_ops
dpsanders Apr 30, 2017
de24ec0
Remove reverse_mode.jl
dpsanders May 1, 2017
5aa41dc
Rename rev_ops -> reverse_operations
dpsanders May 1, 2017
3a22df1
Add IntervalContractors to REQUIRE
dpsanders May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
julia 0.5
IntervalArithmetic 0.9
IntervalRootFinding 0.1
IntervalContractors 0.1
MacroTools 0.3

6 changes: 4 additions & 2 deletions src/IntervalConstraintProgramming.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ __precompile__()

module IntervalConstraintProgramming

using IntervalArithmetic, IntervalRootFinding
using IntervalArithmetic,
IntervalRootFinding,
IntervalContractors

using MacroTools

Expand All @@ -20,8 +22,8 @@ export
Vol,
show_code

const reverse_operations = IntervalContractors.reverse_operations

include("reverse_mode.jl")
include("ast.jl")
include("code_generation.jl")
include("contractor.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/ast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ function process_call!(flatAST::FlatAST, ex, new_var=nothing)

#@show op

if op ∈ keys(rev_ops) # standard operator
if op ∈ keys(reverse_operations) # standard operator
if new_var == nothing
new_var = make_symbol()
end
Expand Down
2 changes: 1 addition & 1 deletion src/code_generation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function emit_backward_code(a::Assignment)
args = isa(a.args, Vector) ? a.args : [a.args]

return_args = [a.lhs, args...]
rev_op = rev_ops[a.op] # find reverse operation
rev_op = reverse_operations[a.op] # find reverse operation

if rev_op == :() # empty
args = make_tuple(args)
Expand Down
130 changes: 0 additions & 130 deletions src/reverse_mode.jl
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,3 @@ end

@test C3(A, x) == IntervalBox(sqrt(A / 16))
end

@testset "power_rev for odd power" begin
x = -∞..∞
a = -8..27
power_rev(a, x, 3)[2] == Interval(-2.0000000000000004, 3.0000000000000004)
end