ta-indicator 0.0.4 → 0.1.0

data/lib/indicator/auto_gen/plus_di.rb

@@ -29,7 +29,7 @@ class Indicator::AutoGen::PlusDI < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -38,7 +38,7 @@ class Indicator::AutoGen::PlusDI < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_int(0, @time_period)

data/lib/indicator/auto_gen/plus_dm.rb

@@ -29,7 +29,7 @@ class Indicator::AutoGen::PlusDM < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low ]
   end
 
   # The outputs generated by this function
@@ -38,7 +38,7 @@ class Indicator::AutoGen::PlusDM < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_int(0, @time_period)

data/lib/indicator/auto_gen/sar.rb

@@ -33,7 +33,7 @@ class Indicator::AutoGen::Sar < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low ]
   end
 
   # The outputs generated by this function
@@ -42,7 +42,7 @@ class Indicator::AutoGen::Sar < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_real(0, @acceleration_factor)

data/lib/indicator/auto_gen/sar_ext.rb

@@ -57,7 +57,7 @@ class Indicator::AutoGen::SarExt < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low ]
   end
 
   # The outputs generated by this function
@@ -66,7 +66,7 @@ class Indicator::AutoGen::SarExt < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_real(0, @start_value)

data/lib/indicator/auto_gen/stoch.rb

@@ -45,7 +45,7 @@ class Indicator::AutoGen::Stoch < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -54,7 +54,7 @@ class Indicator::AutoGen::Stoch < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_int(0, @fast_k_period)

data/lib/indicator/auto_gen/stoch_f.rb

@@ -37,7 +37,7 @@ class Indicator::AutoGen::StochF < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -46,7 +46,7 @@ class Indicator::AutoGen::StochF < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_int(0, @fast_k_period)

data/lib/indicator/auto_gen/true_range.rb

@@ -21,7 +21,7 @@ class Indicator::AutoGen::TrueRange < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -30,7 +30,7 @@ class Indicator::AutoGen::TrueRange < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
 

data/lib/indicator/auto_gen/typ_price.rb

@@ -21,7 +21,7 @@ class Indicator::AutoGen::TypPrice < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -30,7 +30,7 @@ class Indicator::AutoGen::TypPrice < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
 

data/lib/indicator/auto_gen/ult_osc.rb

@@ -37,7 +37,7 @@ class Indicator::AutoGen::UltOsc < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -46,7 +46,7 @@ class Indicator::AutoGen::UltOsc < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_int(0, @first_period)

data/lib/indicator/auto_gen/wcl_price.rb

@@ -21,7 +21,7 @@ class Indicator::AutoGen::WclPrice < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -30,7 +30,7 @@ class Indicator::AutoGen::WclPrice < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
 

data/lib/indicator/auto_gen/will_r.rb

@@ -29,7 +29,7 @@ class Indicator::AutoGen::WillR < Indicator::Base
 
   # The minimum set of inputs required
   def self.inputs
-    [ :open, :high, :low, :close ]
+    [ :high, :low, :close ]
   end
 
   # The outputs generated by this function
@@ -38,7 +38,7 @@ class Indicator::AutoGen::WillR < Indicator::Base
   end
 
   def run(*args)
-    o, h, l, c, v, len = map_ohlcv(false, *args)
+    o, h, l, c, v, len = map_ohlcv(self.class.inputs, *args)
     @func.in_price(0, o, h, l, c, v, nil)
 
     @func.opt_int(0, @time_period)

data/lib/indicator/base.rb

@@ -15,5 +15,23 @@ module Indicator
     def self.inherited(subclass)
       Base.indicators << subclass
     end
+
+    def map_ohlcv types, *args
+
+      raise ArgumentError unless args.length > 0
+      first = args.first
+
+      l = [:open, :high, :low, :close, :volume].inject([]) do |lst, t|
+        if types.include? t
+          a = args.shift
+          lst << (a ? map(a, t) : map(first, t))
+        else
+          lst << nil
+        end
+      end
+
+      # Push the length onto the end of the array
+      l << first.length
+    end
   end
 end

data/lib/indicator/data_mapper.rb

@@ -65,26 +65,6 @@ module Indicator
       source.collect { |e| map_proc.call(e) }
     end
 
-    def map_ohlcv volume_required, *args
-
-      raise ArgumentError unless args.length > 0
-      first = args.first
-
-      types = [:open, :high, :low, :close]
-      types << :volume if volume_required
-
-      l = types.inject([]) do |lst, t|
-        a = args.shift
-        lst << (a ? map(a, t) : map(first, t)) 
-      end
-
-      # Push a nil in the place of the volume data series
-      # if it hasn't been requested
-      l << nil unless volume_required
-
-      # Push the length onto the end of the array
-      l << first.length
-    end
   end
 end
 

data/lib/indicator/version.rb

@@ -1,3 +1,3 @@
 module Indicator
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ta-indicator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000Z
+date: 2013-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: talib_ruby
-  requirement: &17147904 !ruby/object:Gem::Requirement
+  requirement: &18354552 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17147904
+  version_requirements: *18354552
 description: Higher level wrapper around the talib_ruby project
 email: mr.lamby@gmail.com
 executables: []