merge

Project.toml

@@ -1,10 +1,6 @@
 name = "CalculusWithJulia"
 uuid = "a2e0e22d-7d4c-5312-9169-8b992201a882"
-<<<<<<< HEAD
 version = "0.2.1"
-=======
-version = "0.2.0"
->>>>>>> master
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -21,17 +17,12 @@ SplitApplyCombine = "03a91e81-4c3e-53e1-a0a4-9c0c8f19dd66"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [weakdeps]
-<<<<<<< HEAD
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 SymPyCore = "458b697b-88f0-4a86-b56b-78b75cfb3531"
 
 [extensions]
 CalculusWithJuliaPlotsExt = "Plots"
 CalculusWithJuliaSymPyCoreExt = "SymPyCore"
-=======
-SymPyCore = "458b697b-88f0-4a86-b56b-78b75cfb3531"
-Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
->>>>>>> master
 
 [compat]
 Contour = "0.5 - 0.6"
@@ -44,9 +35,6 @@ Roots = "1, 2"
 SpecialFunctions = "1, 2"
 julia = "1"
 
-[extensions]
-CalculusWithJuliaSymPyCoreExt = "SymPyCore"
-CalculusWithJuliaPlotsExt = "Plots"
 
 [extras]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"

src/derivatives.jl

@@ -110,17 +110,10 @@ Create a sign chart for `f` over `(a,b)`. Returns a collection of named tuples,
 
 ```
 julia> sign_chart(x -> (x-1/2)/(x*(1-x)), 0, 1)
-<<<<<<< HEAD
 3-element Vector{NamedTuple{(:zero_oo_NaN, :sign_change)}}:
  (zero_oo_NaN = 0.0, sign_change = an endpoint)
  (zero_oo_NaN = 0.5, sign_change = - to +)
  (zero_oo_NaN = 1.0, sign_change = an endpoint)
-=======
-3-element Vector{NamedTuple{(:DNE_0_∞, :sign_change)}}:
- (DNE_0_∞ = 0, sign_change = an endpoint)
- (DNE_0_∞ = 0.5, sign_change = - → +)
- (DNE_0_∞ = 1, sign_change = an endpoint)
->>>>>>> master
 ```
 
 !!! note "Warning"
@@ -138,13 +131,8 @@ function sign_chart(f, a, b; atol=1e-6)
     end
 
     pm(x) = x < 0 ? "-" : x > 0 ? "+" : "0"
-<<<<<<< HEAD
     rnd(x) = round(x, sigdigits=12)
     summarize(f,cp,d) = (zero_oo_NaN = rnd(cp), sign_change = pm(cp-d, cp+d))
-=======
-    summarize(f,cp,d) = (DNE_0_∞ = cp, sign_change = pm(cp-d, cp+d))
->>>>>>> master
-
 
     # zeros of f
     zs = find_zeros(f, (a, b))