implement in terms of Partials

JuliaDiff · Feb 12, 2017 · 87947ed · 87947ed
1 parent 9a91b37
commit 87947ed
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/src/dual.jl b/src/dual.jl
@@ -403,28 +403,9 @@ end
 # Pretty Printing #
 ###################
 
-const _subscripts = ["₀", "₁", "₂", "₃", "₄", "₅", "₆", "₇", "₈", "₉"]
-
 function Base.show{N}(io::IO, n::Dual{N})
     parts, val = partials(n), value(n)
     compact = get(io, :compact, false)
     show(io, val)
-    for (i, p) in enumerate(parts)
-        if signbit(p) && !isnan(p)
-            p = -p
-            print(io, compact ? "-" : " - ")
-        else
-            print(io, compact ? "+" : " + ")
-        end
-        show(io, p)
-        if !(isa(p, Integer) && !isa(p, Bool) || isa(p, AbstractFloat) && isfinite(p))
-            print(io, "*")
-        end
-        print(io, "ɛ")
-        if length(parts) > 1
-            for d in reverse(digits(i))
-                print(io, _subscripts[d + 1])
-            end
-        end
-    end
+    show(io, parts, true)
 end
diff --git a/src/partials.jl b/src/partials.jl
@@ -211,4 +211,30 @@ end
 # Pretty Printing #
 ###################
 
-Base.show{N}(io::IO, p::Partials{N}) = print(io, "Partials", p.values)
+const _subscripts = ["₀", "₁", "₂", "₃", "₄", "₅", "₆", "₇", "₈", "₉"]
+
+Base.show(io::IO, ::MIME"text/plain", p::Partials) = show(io, p)
+
+function Base.show{N}(io::IO, parts::Partials{N}, showing_dual = false)
+    compact = get(io, :compact, false)
+    for (i, p) in enumerate(parts)
+        if showing_dual == true || i != 1
+            if signbit(p) && !isnan(p)
+                p = -p
+                print(io, compact ? "-" : " - ")
+            else
+                print(io, compact ? "+" : " + ")
+            end
+        end
+        show(io, p)
+        if !(isa(p, Integer) && !isa(p, Bool) || isa(p, AbstractFloat) && isfinite(p))
+            print(io, "*")
+        end
+        print(io, "ɛ")
+        if length(parts) > 1
+            for d in reverse(digits(i))
+                print(io, _subscripts[d + 1])
+            end
+        end
+    end
+end