edfize 0.1.0.beta6 → 0.1.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd66c8588e2ded11c90880663301a6ff5c735316
-  data.tar.gz: fa67299dca68b65f0d56393112f7b4395d5d58ed
+  metadata.gz: ba1a8b5aedfca32378aa7f2a33e74e905f55de59
+  data.tar.gz: 31c306bb6cc1eae5ff5e648825efc0fce4313d9e
 SHA512:
-  metadata.gz: 598a5dad055dd6e3ad3b7b339961a04ce05367ef460773e221ef9f7bd6ae7213cf35e84c71ffdd976bcda481141c7cd627eb669c9b2dfed52ed13636ccfa4d69
-  data.tar.gz: f1be2b665756ca380aac2d8f842e130f6f1f8417a4f5b5b0686b11b06fa1c2edebac07f7cd561382c1f73926c43edff64d0928fe70cb50ff29c4ac6d47b63b0f
+  metadata.gz: 5d9796b9ab7062d8852cd69e78fbdd575d101836cdba1b4d63bd3af4a1b6a9502a3bb52ce8c87e8fa2bd0312a9586b3b17bfc64f8f366ed55ee96a422e277424
+  data.tar.gz: 806d2e78b1d4f0173a900e09618c290213b70f3bb2fbfc0d75b344dc1985de9a2f4cc7f6c0ba1bc65ce1d371088b863a24809df4dd9729bb0751f54ba3f49c7a

data/lib/edfize/edf.rb

@@ -179,22 +179,37 @@ module Edfize
     end
 
     def get_data_records
-      @signals.each{|signal| signal.initialize_array_sizes!(@number_of_data_records)}
+      load_digital_signals()
+      calculate_physical_values!()
+    end
+
+    # 16-bit signed integer size = 2 Bytes = 2 ASCII characters
+    # 16-bit signed integer in "Little Endian" format (least significant byte first)
+    # unpack:  s<         16-bit signed, (little-endian) byte order
+    def load_digital_signals
+      @all_signal_data = IO.binread(@filename, nil, size_of_header).unpack('s<*')
+
+      all_samples_per_data_record = @signals.collect{|s| s.samples_per_data_record}
+      total_samples_per_data_record = all_samples_per_data_record.inject(:+).to_i
+
+      offset = 0
+      offsets = []
+      all_samples_per_data_record.each do |samples_per_data_record|
+        offsets << offset
+        offset += samples_per_data_record
+      end
 
-      current_read_offset = size_of_header
       (0..@number_of_data_records-1).to_a.each do |data_record_index|
-        @signals.each do |signal|
-          # 16-bit signed integer size = 2 Bytes = 2 ASCII characters
-          # 16-bit signed integer in "Little Endian" format (least significant byte first)
-          # unpack:  s<         16-bit signed, (little-endian) byte order
-          read_size = signal.samples_per_data_record * SIZE_OF_SAMPLE_IN_BYTES
-          start_index = data_record_index * signal.samples_per_data_record
-          end_index   = (data_record_index + 1) * signal.samples_per_data_record
-          signal.digital_values[start_index..end_index] = IO.binread(@filename, read_size, current_read_offset).unpack('s<*')
-          current_read_offset += read_size
+        @signals.each_with_index do |signal, signal_index|
+          read_start = data_record_index * total_samples_per_data_record + offsets[signal_index]
+          (0..signal.samples_per_data_record - 1).to_a.each do |value_index|
+            signal.digital_values << @all_signal_data[read_start+value_index]
+          end
         end
       end
+    end
 
+    def calculate_physical_values!
       @signals.each{|signal| signal.calculate_physical_values!}
     end
 

data/lib/edfize/signal.rb

@@ -39,9 +39,5 @@ module Edfize
       @physical_values
     end
 
-    def initialize_array_sizes!(data_records)
-      @physical_values = Array.new(@samples_per_data_record * data_records)
-    end
-
   end
 end

data/lib/edfize/version.rb

@@ -3,7 +3,7 @@ module Edfize
     MAJOR = 0
     MINOR = 1
     TINY = 0
-    BUILD = "beta6"
+    BUILD = "beta7"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edfize
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta6
+  version: 0.1.0.beta7
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize