small fixes

awesome-spectral-indices · Feb 17, 2024 · aee5d90 · aee5d90
1 parent 0e6bcc9
commit aee5d90
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/test/DataFrames/compute_index.jl b/test/DataFrames/compute_index.jl
@@ -4,9 +4,13 @@ using DataFrames
 using Random
 using Combinatorics
 using StatsBase
-include("../test_utils.jl")
 Random.seed!(17)
 
+function convert_to_kwargs(df::DataFrame)
+    kwargs = [(Symbol(band) => DataFrame(band => df[:, band])) for band in names(df)]
+    return kwargs
+end
+
 @testset "DataFrames compute_index single index tests: $idx_name" for (idx_name, idx) in indices
     @testset "as Params" begin
         if idx_name == "AVI" || idx_name == "TVI"

diff --git a/test/DataFrames/compute_kernel.jl b/test/DataFrames/compute_kernel.jl
@@ -1,7 +1,11 @@
 using Test
 using SpectralIndices
 using DataFrames
-include("../test_utils.jl")
+
+function convert_to_kwargs(df::DataFrame)
+    kwargs = [(Symbol(band) => DataFrame(band => df[:, band])) for band in names(df)]
+    return kwargs
+end
 
 params = DataFrame(;
     a=[1, 2], b=[3, 4], c=[1, 1], p=[2, 2], sigma=[5, 5]

diff --git a/test/YAXArrays/compute_index.jl b/test/YAXArrays/compute_index.jl
@@ -5,9 +5,14 @@ using DimensionalData
 using Random
 using Combinatorics
 using StatsBase
-include("../test_utils.jl")
 Random.seed!(17)
 
+function convert_to_kwargs(yaxarr::YAXArray)
+    var_names = lookup(yaxarr, :Variables)
+    kwargs = [(Symbol(var_name) => yaxarr[Variable=At(var_name)]) for var_name in var_names]
+    return kwargs
+end
+
 xdim = Dim{:x}(range(1, 10, length=10))
 ydim = Dim{:x}(range(1, 10, length=15))
 

diff --git a/test/YAXArrays/compute_kernel.jl b/test/YAXArrays/compute_kernel.jl
@@ -1,7 +1,12 @@
 using Test
 using SpectralIndices
 using YAXArrays
-include("../test_utils.jl")
+
+function convert_to_kwargs(yaxarr::YAXArray)
+    var_names = lookup(yaxarr, :Variables)
+    kwargs = [(Symbol(var_name) => yaxarr[Variable=At(var_name)]) for var_name in var_names]
+    return kwargs
+end
 
 axlist = (
     Dim{:Lon}(1:5),

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -13,6 +13,7 @@ end
 end
 
 @safetestset "Compute Indices" begin
+    include("test_utils.jl")
     include("compute_index.jl")
     include("DataFrames/compute_index.jl")
     include("YAXArrays/compute_index.jl")

diff --git a/test/test_utils.jl b/test/test_utils.jl
@@ -1,3 +1,5 @@
+using SpectralIndices
+
 function custom_key_combinations(dict::Dict{String,SpectralIndices.AbstractSpectralIndex},
     combo_size::Int,
     num_combos::Int
@@ -6,15 +8,4 @@ function custom_key_combinations(dict::Dict{String,SpectralIndices.AbstractSpect
     all_combos = combinations(keys_list, combo_size)
     selected_combos = sample(collect(all_combos), num_combos, replace=false)
     return selected_combos
-end
-
-function convert_to_kwargs(yaxarr::YAXArray)
-    var_names = lookup(yaxarr, :Variables)
-    kwargs = [(Symbol(var_name) => yaxarr[Variable=At(var_name)]) for var_name in var_names]
-    return kwargs
-end
-
-function convert_to_kwargs(df::DataFrame)
-    kwargs = [(Symbol(band) => DataFrame(band => df[:, band])) for band in names(df)]
-    return kwargs
 end