Merge branch 'master' of https://github.com/johnmyleswhite/Calculus.jl

Author: rgiordan

REQUIRE

@@ -1,2 +1,2 @@
-julia 0.3
-Compat
+julia 0.3.7
+Compat 0.4.0

src/Calculus.jl

@@ -14,6 +14,8 @@ module Calculus
            jacobian,
            second_derivative
 
+    import Base: gradient
+
     # TODO: Debate type system more carefully
     # abstract BundledFunction
     # abstract ScalarFunction

src/differentiate.jl

@@ -161,9 +161,9 @@ symbolic_derivative_1arg_list = [
     ( :asech,       :( -1 / x / sqrt(1 - x^2)                   ))
     ( :acsch,       :( -1 / abs(x) / sqrt(1 + x^2)              ))
     ( :acoth,       :(  1 / (1 - x^2)                           ))
-    ( :erf,         :(  2 * exp(-square(x)) / sqrt(pi)          ))
-    ( :erfc,        :( -2 * exp(-square(x)) / sqrt(pi)          ))
-    ( :erfi,        :(  2 * exp(square(x)) / sqrt(pi)           ))
+    ( :erf,         :(  2 * exp(-x*x) / sqrt(pi)                ))
+    ( :erfc,        :( -2 * exp(-x*x) / sqrt(pi)                ))
+    ( :erfi,        :(  2 * exp(x*x) / sqrt(pi)                 ))
     ( :gamma,       :(  digamma(x) * gamma(x)                   ))
     ( :lgamma,      :(  digamma(x)                              ))
     ( :digamma,     :(  trigamma(x)                             ))
@@ -196,7 +196,7 @@ export symbolic_derivatives_1arg
 
 # deprecated: for backward compatibility with packages that used
 # this unexported interface.
-derivative_rules = Array((Symbol,Expr),0)
+derivative_rules = Array(@Compat.compat(Tuple{Symbol,Expr}),0)
 for (s,ex) in symbolic_derivative_1arg_list
     push!(derivative_rules, (s, :(xp*$ex)))
 end

src/symbolic.jl

@@ -140,7 +140,7 @@ function simplify(::SymbolParameter{:+}, args)
         return args[1]
     else
         (sum, sym_args) = sum_numeric_args(args)
-        args = sum==0 ? sym_args : [sum, sym_args]
+        args = sum==0 ? sym_args : [sum; sym_args]
         return Expr(:call, :+, args...)
     end
 end
@@ -182,7 +182,7 @@ function simplify(::SymbolParameter{:*}, args)
         return Expr(:call, :-, args[2])
     else
         (prod, sym_args) = mul_numeric_args(args)
-        args = prod==1 ? sym_args : [prod, sym_args]
+        args = prod==1 ? sym_args : [prod; sym_args]
         return Expr(:call, :*, args...)
     end
 end

test/symbolic.jl

@@ -96,5 +96,5 @@ end
 # Tests with ifelse
 #
 @test isequal(differentiate(:(ifelse(x < 1, exp(x^2), 1/x)), :x), :(ifelse(x < 1,2x * exp(x^2), -1/x^2)))
-@test isequal(differentiate(:(ifelse(x <= 0, 0, ifelse(x > 1, 1, x))), : x), 
+@test isequal(differentiate(:(ifelse(x <= 0, 0, ifelse(x > 1, 1, x))), :x),
 														:(ifelse(x <= 0, 0, ifelse(x > 1, 0, 1))))