Fix an ambiguity

lombscargle(::LinSpace, ::Measurement) appeared to be ambigous, when calling the other lombscargle method.
JuliaAstro · Aug 18, 2016 · 4894dab · 4894dab
1 parent 0a976ff
commit 4894dab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/LombScargle.jl b/src/LombScargle.jl
@@ -514,13 +514,25 @@ function lombscargle{R1<:Real,R2<:Real,R3<:Real}(times::AbstractVector{R1},
 end
 
 # Uncertainties provided via Measurement type
-lombscargle{T<:Real,F<:AbstractFloat}(times::AbstractVector{T},
-                                      signal::AbstractVector{Measurement{F}};
-                                      kwargs...) =
-                                          lombscargle(times,
-                                                      value(signal),
-                                                      uncertainty(signal);
-                                                      kwargs...)
+function lombscargle{T<:Real,F<:AbstractFloat}(times::Range{T},
+                                               signal::AbstractVector{Measurement{F}};
+                                               kwargs...)
+    return _lombscargle_with_errors(times,
+                                    value(signal),
+                                    uncertainty(signal),
+                                    true;
+                                    kwargs...)
+end
+
+function lombscargle{T<:Real,F<:AbstractFloat}(times::AbstractVector{T},
+                                               signal::AbstractVector{Measurement{F}};
+                                               kwargs...)
+    return _lombscargle_with_errors(times,
+                                    value(signal),
+                                    uncertainty(signal),
+                                    false;
+                                    kwargs...)
+end
 
 """
     lombscargle(times::AbstractVector{Real}, signal::AbstractVector{Real},

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -63,6 +63,8 @@ pgram6 = lombscargle(t, s, maximum_frequency=30, fast=false)
 @test_approx_eq power(lombscargle(t, s, err, frequencies=0.2:0.2:1, fast=true, fit_mean=true))  [0.09230959166317655,0.0015654929813132702,0.00019405185108843607,6.0898671943944786e-5,6.0604505038256276e-5]
 @test_approx_eq power(lombscargle(t, s, err, frequencies=0.2:0.2:1, fast=true, fit_mean=false)) [0.09219168665786258,0.0015654342453078724,0.00019403694017215876,6.088944186950046e-5,6.05771360378885e-5]
 @test_approx_eq power(lombscargle(t, s, err, frequencies=0.2:0.2:1, fast=true, center_data=false, fit_mean=false)) [0.09360344864985332,0.0015354489715019735,0.0001784388515190763,4.744247354697125e-5,3.240223498703448e-5]
+@test power(lombscargle(t, s, err)) ==
+    power(lombscargle(t, measurement(s, err)))
 
 ##################################################
 ### Testing utilities