From 27d8f3856e4ecdb9a61a42df64e99ea65f85593d Mon Sep 17 00:00:00 2001
From: Michel Juillard <michel@dell-michel.home>
Date: Tue, 26 May 2020 12:12:15 +0200
Subject: [PATCH] fixing infinite loop in constructor
---
src/TimeDataFrames.jl | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/TimeDataFrames.jl b/src/TimeDataFrames.jl
index 35650a2..f5b3e24 100644
--- a/src/TimeDataFrames.jl
+++ b/src/TimeDataFrames.jl
@@ -19,9 +19,10 @@ TimeDataFrame() = TimeDataFrame(DataFrame(), Vector{Period}(), true,
TimeDataFrame(frequency::Frequency) = TimeDataFrame(DataFrame(),
Vector{Period}(), true, frequency)
-function TimeDataFrame(dataframe::AbstractDataFrame, frequency::Frequency, firstperiod)
+function TimeDataFrame(dataframe::AbstractDataFrame, frequency::Frequency, firstperiod;
+ copycol::Bool=true)
periods = [Period(firstperiod + i - 1, 0, frequency) for i in 1:DataFrames.nrow(dataframe)]
- TimeDataFrame(dataframe, periods, true, frequency)
+ TimeDataFrame(DataFrame(dataframe; copycols), periods, true, frequency)
end
function TimeDataFrame(filename::String, frequency::Frequency, firstperiod)
@@ -31,10 +32,6 @@ function TimeDataFrame(filename::String, frequency::Frequency, firstperiod)
TimeDataFrame(data, periods, true, frequency)
end
-TimeDataFrame(df::DataFrame, frequency::Frequency, firstperiod;
- copycols::Bool=true) =
- TimeDataFrame(DataFrame(df; copycols),
- frequency, firstperiod)
TimeDataFrame(frequency::Frequency, firstperiod, pairs::Pair{Symbol,<:Any}...;
makeunique::Bool=false, copycols::Bool=true) =
--
GitLab