Skip to content

Commit f6834f6

Browse files
committed
bug fixes (describetask)
1 parent ec6abe5 commit f6834f6

File tree

4 files changed

+39
-3
lines changed

4 files changed

+39
-3
lines changed

FastTimeSeries/src/FastTimeSeries.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ include("recipes.jl")
4343

4444
const _tasks = Dict{String, Any}()
4545
include("tasks/classification.jl")
46+
include("tasks/regression.jl")
4647

4748
function __init__()
4849
_registerrecipes()
@@ -54,5 +55,5 @@ function __init__()
5455
end
5556

5657
export
57-
TimeSeriesRow, TSClassificationSingle, TSPreprocessing, _ts2df
58+
TimeSeriesRow, TSClassificationSingle, TSPreprocessing, TSRegression
5859
end

FastTimeSeries/src/container.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ function _ts2df(
205205

206206
char_num += 1
207207
num_this_dimension = 1
208-
arr = Array{Float32, 2}(undef, num_dimensions, series_length)
208+
arr = Array{Float64, 2}(undef, num_dimensions, series_length)
209209

210210
else
211211

@@ -333,7 +333,7 @@ function _ts2df(
333333
num_samples = length(instance_list)
334334
series_length = size(instance_list[1])[2]
335335

336-
data = Array{Float32, 3}(undef, num_samples, num_dimensions, series_length)
336+
data = Array{Float64, 3}(undef, num_samples, num_dimensions, series_length)
337337

338338
for sample in 1:num_samples
339339
data[sample, 1:end, 1:end] = instance_list[sample]

FastTimeSeries/src/recipes.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,11 @@ end
8787
sample = getobs(data, 1)
8888
@test checkblock(block, sample)
8989
end
90+
91+
@testset "TimeSeriesDatasetRegression [recipe]" begin
92+
path = load(datasets()["appliances_energy"])
93+
recipe = TimeSeriesDatasetRecipe(train_file="AppliancesEnergy_TRAIN.ts", test_file="AppliancesEnergy_TEST.ts", regression = true);
94+
data, block = Datasets.loadrecipe(recipe, path)
95+
sample = getobs(data, 1)
96+
@test checkblock(block, sample)
97+
end
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
"""
2+
TSRegressionSingle
3+
4+
Learning task for single-label time-series regression. Samples are standardized.
5+
"""
6+
7+
function TSRegression(blocks::Tuple{<:TimeSeriesRow, <:Continuous}, data)
8+
return SupervisedTask(
9+
blocks,
10+
(
11+
setup(TSPreprocessing, blocks[1], data[1].table),
12+
),
13+
)
14+
end
15+
16+
_tasks["tsregression"] = (
17+
id = "timeseries/regression",
18+
name = "Time-Series Regression",
19+
constructor = TSRegression,
20+
blocks = (TimeSeriesRow, Continuous),
21+
category = "supervised",
22+
description = """
23+
Time-Series regression task where every time-series has a single
24+
regression label associated with it.
25+
""",
26+
package = @__MODULE__,
27+
)

0 commit comments

Comments
 (0)