Some patches so that Unitful still works on julia 0.5; also, update d…

…eps/build.jl.
PainterQubits · Dec 31, 2016 · f03dbcd · tkelman · Feb 21, 2017 · ajkeller34
1 parent 866ccb7
commit f03dbcd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -81,7 +81,8 @@ else
         end
 
         # The hectare is used more frequently than any other power-of-ten of an are.
-        const ha = Unitful.Units{(Unitful.Unit{:Are}(2,1//1),), typeof(𝐋)}()
+        const ha = Unitful.Units{(Unitful.Unit{:Are, Unitful.Dimensions{
+            (Unitful.Dimension{:Length}(2//1),)}}(2,1//1,1.0,100//1),), typeof(𝐋^2)}()
 
         # Time
         @unit minute "min"      Minute      60s                     false

diff --git a/src/Unitful.jl b/src/Unitful.jl
@@ -1014,14 +1014,14 @@ end
 @generated function inv(x::Dimensions)
     tup = x.parameters[1]
     length(tup) == 0 && return :(x)
-    y = *(Dimensions{tup.^-1}())
+    y = *(Dimensions{map(x->x^-1,tup)}())
     :($y)
 end
 
 @generated function inv(x::Units)
     tup = x.parameters[1]
     length(tup) == 0 && return :(x)
-    tup2 = tup.^-1#map(x->x^-1,tup)
+    tup2 = map(x->x^-1,tup)
     D = typeof(mapreduce(dimension, *, NoDims, tup2))
     y = *(Units{tup2, D}())
     :($y)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -630,9 +630,13 @@ end
             @test typeof([1m, 2m, 3m] * 5m)            == Array{typeof(1u"m^2"),1}
             @test @inferred(5m .* [1m, 2m, 3m])        == [5m^2, 10m^2, 15m^2]
             @test typeof(5m .* [1m, 2m, 3m])           == Array{typeof(1u"m^2"),1}
-            @test_broken @inferred(eye(2).*V)          == [1.0V 0.0V; 0.0V 1.0V]
-
-            @test_broken @inferred(V.*eye(2))          == [1.0V 0.0V; 0.0V 1.0V]
+            @static if VERSION >= v"0.6.0-"
+                @test_broken @inferred(eye(2).*V)      == [1.0V 0.0V; 0.0V 1.0V]
+                @test_broken @inferred(V.*eye(2))      == [1.0V 0.0V; 0.0V 1.0V]
+            else
+                @test @inferred(eye(2).*V)             == [1.0V 0.0V; 0.0V 1.0V]
+                @test @inferred(V.*eye(2))             == [1.0V 0.0V; 0.0V 1.0V]
+            end
             @test @inferred([1V 2V; 0V 3V].*2)         == [2V 4V; 0V 6V]
             @test @inferred([1V, 2V] .* [true, false]) == [1V, 0V]
             @test @inferred([1.0m, 2.0m] ./ 3)         == [1m/3, 2m/3]