mspire 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f9f35036ad4f2a25b69644aa4157281bc18ccb
-  data.tar.gz: 3d5001ce1de7d3d5da82c5de7b3440c93d34abbb
+  metadata.gz: c92ec4a23bf1ecef8abc24269b4e680c8a7ed8bd
+  data.tar.gz: 1016a66f7c99acf348ae1a439c77fd54e91431f6
 SHA512:
-  metadata.gz: aa2b1352be5a165feeca924d1690fde4e43d980df05aee0dc9a30768644a6a7e6cac645171d93ff83cebddd340660c13fec17d6e27e9e8e31a134d35bfe1fed4
-  data.tar.gz: 8e6cc4877db87cbb408c53966570277ebb14eccbf308c8a7e9eadbe793c430e7f25cabd8be492d4f7cef93d0860955265cb48af3a4127fa86a7de5e7b83e99d2
+  metadata.gz: a09382c44d33e3cb5d6f3d307c8306a06af85851645f3d4ee80799b85ecbd41e87b53b8b29ee758909050776356d88eda131b77f169493b299a42af0954486b5
+  data.tar.gz: b3161fcf60c22a25b2c736612b7d9798c95185a45b9de97d181c791b6311d58fc73a927540385c908b26a394ca0f5dbe550b646e331da8f0d1f924054a216cb4

data/lib/mspire/bin.rb

@@ -38,25 +38,27 @@ module Mspire
     #
     #
     def self.bin(bins, objects, *data_capture_obj, &block)
-      obj_e = objects.each ; obj = obj_e.next  
-
       data_capture = data_capture_obj.first || bins
 
-      bin_i = 0  # the bin index
-      cbin = bins[bin_i]  # the current bin
-      done = false
-      until done
-        value = (block.nil? ? obj : block.call(obj))
-        if cbin.begin <= value
-          until cbin === value && data_capture[bin_i] << obj
-            bin_i += 1
-            cbin=bins[bin_i] || (done=true && break)
-          end
-          obj=obj_e.next rescue done=true
-        else
-          while cbin.begin > value && !done
-            obj=obj_e.next rescue done=true && break
-            value = (block.nil? ? obj : block.call(obj))
+      if objects.size > 0
+        obj_e = objects.each ; obj = obj_e.next  
+
+        bin_i = 0  # the bin index
+        cbin = bins[bin_i]  # the current bin
+        done = false
+        until done
+          value = (block.nil? ? obj : block.call(obj))
+          if cbin.begin <= value
+            until cbin === value && data_capture[bin_i] << obj
+              bin_i += 1
+              cbin=bins[bin_i] || (done=true && break)
+            end
+            obj=obj_e.next rescue done=true
+          else
+            while cbin.begin > value && !done
+              obj=obj_e.next rescue done=true && break
+              value = (block.nil? ? obj : block.call(obj))
+            end
           end
         end
       end

data/lib/mspire/peaklist.rb

@@ -7,11 +7,11 @@ module Mspire
   class Peaklist < Array
 
     def lo_x
-      self.first[0]
+      self.first[0] if size > 0
     end
 
     def hi_x
-      self.last[0]
+      self.last[0] if size > 0
     end
 
     DEFAULT_MERGE = {
@@ -77,8 +77,10 @@ module Mspire
         first_peaklist = peaklists.first
         min = first_peaklist.first.x; max = first_peaklist.last.x
         peaklists.each do |peaklist|
-          min = peaklist.lo_x if peaklist.lo_x < min
-          max = peaklist.hi_x if peaklist.hi_x > max
+          if peaklist.size > 0
+            min = peaklist.lo_x if peaklist.lo_x < min
+            max = peaklist.hi_x if peaklist.hi_x > max
+          end
         end
         [min, max]
       end
@@ -355,6 +357,15 @@ module Mspire
         no_lm_pklsts 
       end 
     end # def split
+
+    # returns an Mspire::Spectrum object
+    def to_spectrum
+      xs = [] ; ys = []
+      each do |peak|
+        xs << peak.x ; ys << peak.y
+      end
+      Mspire::Spectrum.new([xs, ys])
+    end
   end
 end
 

data/lib/mspire/spectrum_like.rb

@@ -83,11 +83,11 @@ module Mspire
       pl = Peaklist.new
       if peak_id
         peaks.each_with_index do |peak,i|
-          pl[i] = Mspire::Peak.new( peak )
+          pl[i] = Mspire::TaggedPeak.new( peak, peak_id )
         end
       else
         peaks.each_with_index do |peak,i|
-          pl[i] = Mspire::TaggedPeak.new( peak, peak_id )
+          pl[i] = Mspire::Peak.new( peak )
         end
       end
       pl

data/lib/mspire/version.rb

@@ -1,3 +1,3 @@
 module Mspire
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mspire
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - John T. Prince
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -547,4 +547,3 @@ test_files:
 - spec/testfiles/mspire/quant/unlog_transform.rb
 - spec/testfiles/plms1/output.key
 - spec/testfiles/processed_binary.tmp.ibd
-has_rdoc: