Fix shortcut without 1

femtotrader · Nov 11, 2016 · 92740ce · 92740ce · femtotrader · Nov 11, 2016
1 parent c04e7ab
commit 92740ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/TimeFrames.jl b/src/TimeFrames.jl
@@ -68,8 +68,13 @@ function TimeFrame(s::String)
     if m == nothing
         error("Can't parse %s to TimeFrame")
     else
-        tf_typ = _D_STR2TIMEFRAME[m[2]]
-        value = parse(Int, m[1])
+        s_freq = m[2]
+        tf_typ = _D_STR2TIMEFRAME[s_freq]
+        if m[1] != ""
+            value = parse(Int, m[1])
+        else
+            value = 1
+        end
         tf_typ(value)
     end
 end

diff --git a/test/test_timeframe.jl b/test/test_timeframe.jl
@@ -33,6 +33,10 @@ tf = TimeFrame("15T")
 @test tf.time_period.value == 15
 @test typeof(tf) == Minutely
 
+tf = TimeFrame("T")
+@test tf.time_period.value == 1
+@test typeof(tf) == Minutely
+
 # Grouper
 dt = DateTime(2016, 7, 20, 13, 24, 35, 245)