lttb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c647e0772742ee162459334ede93428d12a7c79c
-  data.tar.gz: 525ce8a01dab924bd16d94e5cad4981e9173194f
+  metadata.gz: 63541c85ddb7883a40974ac7a652e727a36d0eff
+  data.tar.gz: 6ebeefd2c9409ae071965facfa5ef7a661e155bc
 SHA512:
-  metadata.gz: fd1e18e0a2e234c49af4d9a865aae858f262e5249b82464012e4f2d2bc3d661f0e1338261a03a06bcddb49f4eb1674da2bc2bc96986e8eb4b0b4ee86609cf055
-  data.tar.gz: 62da5c7ea2c2990aa83ea5008f11c71494ba74cc1c2792a486e84d241535499057147a382f3e9e9a6e7b488a17b9d5917ffd5d9d236383ed130e3829ce109822
+  metadata.gz: 6af76625dde3414dfa982e555a1b782f13992928bc3fff403102dfca1a732040ee367a1e655ea5652ab0d1d69bc9659662560a09f47ef168df210bcf96d634ab
+  data.tar.gz: 7dec397202a2d9189872d3677172f9ecd4ce0bfc66b150dedcbd0b7a429d788478f9f1a720f96a8e1e5f1f7bf0317d4ea6221f513d4ec40e4869afd35261d4d8

data/lib/lttb/process.rb

@@ -30,16 +30,27 @@ module Lttb
     every = (data_length - 2) / (threshold - 2)
 
     a = 0 # Initially a is the first point in the triangle
-    sampled = [data[a]] # Always add the first point
+    next_a = 0
+    max_area_point = nil
+    max_area = 0
+    area = 0
+
+    sampled = []
+    sampled[0] = data[a] # Always add the first point
+    sampled_index = 1 # Now we start at index 1
+
+    i = 0
+    while i < threshold - 2
+      # Calculate bucket points
+      bucket_start = (((i + 0) * every).floor + 1).to_i
+      bucket_mid = (((i + 1) * every).ceil).to_i
+      bucket_end = (((i + 2) * every).ceil).to_i
 
-    (0..(threshold - 3)).each do |i|
       # Calculate point average for next bucket (containing c)
       avg_x = 0
       avg_y = 0
-      avg_range_start = (((i + 1) * every).floor + 1).to_i
-      avg_range_end = (((i + 2) * every).floor + 1).to_i
-      avg_range_end = avg_range_end < data_length ? avg_range_end : data_length
-
+      avg_range_start = bucket_mid
+      avg_range_end = bucket_end < data_length ? bucket_end : data_length
       avg_range_length = avg_range_end - avg_range_start
 
       while avg_range_start < avg_range_end
@@ -53,9 +64,8 @@ module Lttb
       avg_y /= avg_range_length
 
       # Get the range for this bucket
-      range_offs = (((i + 0) * every).floor + 1).to_i
-      range_to = (((i + 1) * every).floor + 1).to_i
-      range_to = range_to < data_length - 1 ? range_to : data_length - 1
+      range_offs = bucket_start
+      range_to = bucket_mid
 
       # Point a
       point_ax = data[a][0]
@@ -79,8 +89,10 @@ module Lttb
         range_offs += 1 # increment
       end
 
-      sampled.push(max_area_point) # Pick this point from the bucket
+      sampled[sampled_index] = max_area_point # Pick this point from the bucket
+      sampled_index += 1
       a = next_a # This a is the next a (chosen b)
+      i += 1 # increase count
     end
 
     sampled.push(data[data.size - 1]) # Always add last

data/lib/lttb/version.rb

@@ -1,3 +1,3 @@
 module Lttb
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lttb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jubke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler