updates

src/reader.jl

@@ -101,18 +101,18 @@ end
 """
     file_to_array(
         filename::String,
-        implementation::DataType;
+        implementation::Type{I};
         labels_to_read::Vector{String} = String[],
-    )
+    ) where {I <: Implementation}
 
 Reads a file and returns the data and metadata as a tuple.
 """
 function file_to_array(
     filename::String,
-    implementation::DataType;
+    implementation::Type{I};
     labels_to_read::Vector{String} = String[],
-)
-    reader = Reader{implementation}(
+) where {I <: Implementation}
+    reader = Reader{I}(
         filename;
         labels_to_read,
         carrousel = false, # carrousel does not make sense in this implemetations
@@ -124,7 +124,7 @@ function file_to_array(
     data = zeros(
         Float32,
         length(reader.labels_to_read),
-        dimensions_sizes...,
+        dimension_sizes...,
     )
 
     for dims in Iterators.product([1:size for size in dimension_sizes]...)

src/writer.jl

@@ -37,22 +37,23 @@ end
     array_to_file(
         filename::String,
         data::Array{T, N},
-        implementation::DataType;
+        implementation::Type{I};
         dimensions::Vector{String},
         labels::Vector{String},
         time_dimension::String,
         dimension_size::Vector{Int},
         initial_date::Union{String, DateTime} = "",
         unit::String = "",
         round_digits::Union{Int, Nothing} = nothing,
-    ) where {T, N}
+    ) where {I <:Implementation, T, N}
 
 Write a time series file in Quiver format.
 
 Required arguments:
 
   - `file_path::String`: Path to file.
   - `data::Array{T, N}`: Data to be written.
+  - `implementation::Type{I}`: Implementation to be used. It can be `Quiver.csv` or `Quiver.binary`.
   - `dimensions::Vector{String}`: Dimensions of the data.
   - `labels::Vector{String}`: Labels of the data.
   - `time_dimension::String`: Name of the time dimension.
@@ -66,15 +67,15 @@ Optional arguments:
 function array_to_file(
     filename::String,
     data::Array{T, N},
-    implementation::DataType;
+    implementation::Type{I};
     dimensions::Vector{String},
     labels::Vector{String},
     time_dimension::String,
     dimension_size::Vector{Int},
     initial_date::Union{String, DateTime} = "",
     unit::String = "",
-    round_digits::Union{Int, Nothing} = nothing,
-) where {T, N}
+    digits::Union{Int, Nothing} = nothing,
+) where {I <: Implementation, T, N}
     kwargs_dict = Dict{Symbol, Any}()
     if initial_date !== ""
         if isa(initial_date, String)
@@ -101,7 +102,7 @@ function array_to_file(
 
     for dims in Iterators.product([1:size for size in reverse(dimension_size)]...)
         dim_kwargs = OrderedDict(reverse_dimensions .=> dims)
-        Quiver.write!(writer, round_digits(data[:, dims...]); dim_kwargs...)
+        Quiver.write!(writer, round_digits(data[:, dims...], digits); dim_kwargs...)
     end
 
     Quiver.close!(writer)
@@ -113,6 +114,6 @@ function round_digits(vec::Vector{T}, ::Nothing) where {T}
     return vec
 end
 
-function round_digits(vec::Vector{T}, round_digits::Int) where {T}
-    return round.(vec, digits = round_digits)
+function round_digits(vec::Vector{T}, digits::Int) where {T}
+    return round.(vec, digits)
 end

test/test_read_write.jl

@@ -952,9 +952,9 @@ function read_file_to_array(impl)
     filename = joinpath(@__DIR__, "test_read_file_to_array")
 
     initial_date = DateTime(2006, 1, 1)
-    num_stages = 10
+    num_stages = 4
     dates = collect(initial_date:Dates.Month(1):initial_date + Dates.Month(num_stages - 1))
-    num_scenarios = 12
+    num_scenarios = 3
     num_blocks_per_stage = Int32.(Dates.daysinmonth.(dates) .* 24)
     num_time_series = 3
 
@@ -977,10 +977,11 @@ function read_file_to_array(impl)
     Quiver.array_to_file(
         filename,
         data,
-        impl,
-        dimensions, 
-        labels, 
-        time_dimension, 
+        impl;
+        dimensions,
+        labels,
+        time_dimension,
+        dimension_size,
         initial_date
     )
 
@@ -1008,6 +1009,7 @@ function test_read_write_implementations()
             read_outside_bounds_4(impl)
             read_filtering_labels(impl)
             read_write_out_of_order_kwargs(impl)
+            read_file_to_array(impl)
             if impl == Quiver.csv
                 read_write_goto_csv_1()
                 read_write_goto_csv_2()