Skip to content

Fix deprecation warning and other extra white space #71

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 1 commit into from
Jul 14, 2015
Merged

Fix deprecation warning and other extra white space #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions src/differentiate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

export differentiate

#################################################################
#
# differentiate()
# based on John's differentiate and this code, I think by Miles Lubin:
# https://github.com/IainNZ/NLTester/blob/master/julia/nlp.jl#L74
#
#
#################################################################

differentiate(ex::SymbolicVariable, wrt::SymbolicVariable) = (ex == wrt) ? 1 : 0
Expand All @@ -33,7 +32,7 @@ function differentiate(::SymbolParameter{:^}, args, wrt)
elseif yp == 0
return :( $y * $xp * ($x ^ ($y - 1)) )
else
return :( $x ^ $y * ($xp * $y / $x + $yp * log($x)) )
return :( $x ^ $y * ($xp * $y / $x + $yp * log($x)) )
end
end

Expand Down Expand Up @@ -215,12 +214,12 @@ for (funsym, exp) in symbolic_derivative_1arg_list
end

derivative_rules_bessel = [
( :besselj, :( * (besselj(nu - 1, x) - besselj(nu + 1, x)) / 2 ))
( :besseli, :( * (besseli(nu - 1, x) + besseli(nu + 1, x)) / 2 ))
( :bessely, :( * (bessely(nu - 1, x) - bessely(nu + 1, x)) / 2 ))
( :besselj, :( (besselj(nu - 1, x) - besselj(nu + 1, x)) / 2 ))
( :besseli, :( (besseli(nu - 1, x) + besseli(nu + 1, x)) / 2 ))
( :bessely, :( (bessely(nu - 1, x) - bessely(nu + 1, x)) / 2 ))
( :besselk, :( -1 * (besselk(nu - 1, x) + besselk(nu + 1, x)) / 2 ))
( :hankelh1, :( * (hankelh1(nu - 1, x) - hankelh1(nu + 1, x)) / 2 ))
( :hankelh2, :( * (hankelh2(nu - 1, x) - hankelh2(nu + 1, x)) / 2 ))
( :hankelh1, :( (hankelh1(nu - 1, x) - hankelh1(nu + 1, x)) / 2 ))
( :hankelh2, :( (hankelh2(nu - 1, x) - hankelh2(nu + 1, x)) / 2 ))
]


Expand Down Expand Up @@ -258,7 +257,7 @@ end

## Differentiate for piecewise functions defined using ifelse
function differentiate(::SymbolParameter{:ifelse}, args, wrt)
:(ifelse($(args[1]), $(differentiate(args[2],wrt)),$(differentiate(args[3],wrt))))
:(ifelse($(args[1]), $(differentiate(args[2],wrt)),$(differentiate(args[3],wrt))))
end

function differentiate(ex::Expr, targets::Vector{Symbol})
Expand Down