Merge pull request #80 from daschw/32bit

Fix optimize_datetime_ticks on 32bit systems

.travis.yml

@@ -6,6 +6,7 @@ os:
 julia:
   - 0.7
   - 1.0
+  - 1.3
   - nightly
 notifications:
   email: true

Project.toml

@@ -1,6 +1,6 @@
 name = "PlotUtils"
 uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "0.6.2"
+version = "0.6.3"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -10,9 +10,9 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
-julia = "0.7, 1"
 Colors = "0"
 Reexport = "0"
+julia = "0.7, 1"
 
 [extras]
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

appveyor.yml

@@ -2,6 +2,7 @@ environment:
   matrix:
   - julia_version: 0.7
   - julia_version: 1
+  - julia_version: 1.3
   - julia_version: nightly
 
 platform:

src/ticks.jl

@@ -45,7 +45,7 @@ optimize_ticks() = Any[]
                            coverage_weight::Float64=1/3, niceness_weight::Float64=1/4,
                            strict_span=true, span_buffer = nothing
         )
-            
+
 Find some reasonable values for tick marks.
 
 This is basically Wilkinson's ad-hoc scoring method that tries to balance
@@ -104,7 +104,7 @@ tight fit around the data, optimal number of ticks, and simple numbers.
 
 ## Returns:
   `(ticklocations::Vector{Float64}, x_min, x_max)`
-            
+
 ## Mathematical details
 
 Wilkinson’s optimization function is defined as the sum of three
@@ -423,12 +423,9 @@ end
 
 # Choose "round" (full seconds/minutes/hours/days/months/years) DateTime ticks
 # between x_min and x_max:
-function optimize_datetime_ticks(a_min::Real, a_max::Real;
-    k_min::Integer = 2,
-    k_max::Integer = 4)
-
-    x_min = DateTime(Dates.UTM(Int(round(a_min))))
-    x_max = DateTime(Dates.UTM(Int(round(a_max))))
+function optimize_datetime_ticks(a_min, a_max; k_min = 2, k_max = 4)
+    x_min = DateTime(Dates.UTM(Int64(round(a_min))))
+    x_max = DateTime(Dates.UTM(Int64(round(a_max))))
 
     Δt = x_max - x_min
     if Δt > Dates.Day(365 * k_min)
@@ -453,7 +450,7 @@ function optimize_datetime_ticks(a_min::Real, a_max::Real;
         P = Dates.Millisecond
         steplength = Δt / (k_max * Dates.Millisecond(1))
     end
-    steplength = P(max(1, Integer(round(steplength))))
+    steplength = P(max(1, Int(round(steplength))))
 
     period_hierarchy = [Dates.Millisecond, Dates.Second, Dates.Minute,
         Dates.Hour, Dates.Day, Dates.Month, Dates.Year]

test/runtests.jl

@@ -1,6 +1,7 @@
 using PlotUtils
 using Test
 using Statistics: mean
+using Dates
 
 # TODO: real tests
 
@@ -86,7 +87,12 @@ end
 
 @testset "ticks" begin
     @test optimize_ticks(-1,2) == ([-1.0,0.0,1.0,2.0],-1.0,2.0)
-
+    dt1, dt2 = Dates.value(DateTime(2000)), Dates.value(DateTime(2100))
+    @test optimize_datetime_ticks(dt1, dt2) == (
+        [63113990400000, 63902908800000, 64691827200000, 65480745600000],
+        ["2001-01-01", "2026-01-01", "2051-01-01", "2076-01-01"]
+    )
+
     @testset "small range $x, $(i)ϵ" for x in exp10.(-12:12), i in -5:5
         y = x + i*eps(x)
         x,y = minmax(x,y)