spnet 0.1.6 → 0.1.7

data/lib/spnet/core/block.rb

@@ -33,7 +33,7 @@ class Block
   
   # Produces a BlockState object based on this Block object.
   # @return [BlockState]
-  def export_state
+  def save_state
     params = collect_params
     
     # discard the params that are the same as the initial port params
@@ -46,6 +46,14 @@ class Block
     BlockState.new(:class_sym => self.class.to_s.to_sym, :params => params)
   end
 
+  def restore_state state
+    state.params.each do |port_name,value|
+      if @in_ports.has_key?(port_name)
+        @in_ports[port_name].set_value value
+      end
+    end
+  end
+  
   private
   
   def collect_params

data/lib/spnet/core/link.rb

@@ -43,7 +43,7 @@ class Link
   end
 
   # Produce a LinkState object from the current Link object.
-  def export_state blocks
+  def save_state blocks
     from, to = nil, nil
     
     blocks.each do |block_name, block|

data/lib/spnet/core/network.rb

@@ -35,15 +35,15 @@ class Network
   end
   
   # Produce a NetworkState object from the current Network object.
-  def export_state
+  def save_state
     block_states = {}
     @blocks.each do |block_name, block|
-      block_states[block_name] = block.export_state
+      block_states[block_name] = block.save_state
     end
     
     link_states = []
     @links.each do |link|
-      link_states.push link.export_state(@blocks)
+      link_states.push link.save_state(@blocks)
     end
     
     return NetworkState.new(:block_states => block_states, :link_states => link_states)

data/lib/spnet/ports/signal_out_port.rb

@@ -5,19 +5,33 @@ module SPNet
 # @author James Tunnell
 class SignalOutPort < OutPort
 
+  attr_reader :queue
+
   # A new instance of SignalOutPort.
   def initialize
+    @queue = []
     super(:matching_class => SignalInPort)
   end
   
-  # If linked, return the result of calling the connected SignalInPort object's
-  # enqueue_values method. Otherwise, return false.
-  def send_values values
-    if linked?
+  # Add values to queue or send them directly to linked port
+  # (if autosend is true).
+  # @param [Array] values The values to add.
+  # @param [true/false] autosend If true, and this port is linked to another
+  #                              port, skip this port's queue and enqueue values
+  #                              directly on the linked port's queue.
+  def enqueue_values values, autosend = true
+    if autosend && linked?
       @link.to.enqueue_values values
+    else
+      @queue.concat values
     end
-    return false
   end
 
+  # Remove values to queue.
+  # @param [Fixnum] count Number of values to remove.
+  def dequeue_values count = @queue.count
+    raise ArgumentError, "count is greater than @queue.count" if count > @queue.count
+    @queue.slice!(0...count)
+  end  
 end
 end

data/lib/spnet/storage/block_state.rb

@@ -9,10 +9,10 @@ class BlockState
   # Define arg specs to use in processing hashed arguments during #initialize.  
   ARG_SPECS = {
     :class_sym => arg_spec(:reqd => true, :type => Symbol),
-    :params => arg_spec_hash(:reqd => false, :type => Object)
+    :params => arg_spec_hash(:reqd => false, :type => Object),
   }
   
-  attr_reader :class_sym, :hashed_args, :params
+  attr_reader :class_sym, :params
   
   # A new instance of NetworkState. 
   # @param [Hash] args Hashed arguments for initialization. See Network::ARG_SPECS
@@ -25,17 +25,26 @@ class BlockState
   def make_block args
     raise ArgumentError, "args does not have :sample_rate key" unless args.has_key?(:sample_rate)
     
-    klass = Kernel.const_get(@class_sym)
+    klass = find_class(@class_sym)
     block = klass.new :sample_rate => args[:sample_rate]
+    block.restore_state self
     
-    @params.each do |port_name,value|
-      if block.in_ports.has_key?(port_name)
-        port = block.in_ports[port_name]
-        port.set_value value
-      end
+    return block
+  end
+  
+  private
+  
+  def find_class sym
+    s = sym.to_s
+    parts = s.split("::")
+    
+    cur_space = Kernel
+    
+    for i in (0...(parts.count-1))
+      cur_space = cur_space.const_get(parts[i].to_sym)
     end
     
-    return block
+    return cur_space.const_get parts.last.to_sym
   end
 end
 end

data/lib/spnet/version.rb

@@ -1,5 +1,5 @@
 # Provide infrastructure for forming processing networks.
 module SPNet
   # spnet version
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/core/block_spec.rb

@@ -61,20 +61,20 @@ describe SPNet::Block do
     end
   end
   
-  context '#export_state' do
+  context '#save_state' do
     it 'should set class_sym to :Block' do
-      TestBlock.new(:sample_rate => @sample_rate).export_state.class_sym.should eq(:TestBlock)
+      TestBlock.new(:sample_rate => @sample_rate).save_state.class_sym.should eq(:TestBlock)
     end
 
     it 'should have empty port params since no params were modified' do
-      TestBlock.new(:sample_rate => @sample_rate).export_state.params.should be_empty
+      TestBlock.new(:sample_rate => @sample_rate).save_state.params.should be_empty
     end
 
     context 'one param modified' do
       it 'should set params according to ParamInPort settings' do
         block = TestBlock.new :sample_rate => @sample_rate
         block.in_ports["VALUE1"].set_value(4.4)
-        state = block.export_state
+        state = block.save_state
         state.params.should eq("VALUE1" => 4.4)
       end
     end
@@ -84,7 +84,7 @@ describe SPNet::Block do
         block = TestBlock.new :sample_rate => @sample_rate
         block.in_ports["VALUE1"].set_value(4.4)
         block.in_ports["VALUE2"].set_value(5.5)
-        state = block.export_state
+        state = block.save_state
         state.params.should eq("VALUE1" => 4.4, "VALUE2" => 5.5)
       end
     end

data/spec/core/link_spec.rb

@@ -75,7 +75,7 @@ describe SPNet::Link do
     end
   end
   
-  context '#export_state' do
+  context '#save_state' do
     before :all do
       blocks = {
         "A" => TestBlock.new(:sample_rate => 2),
@@ -83,7 +83,7 @@ describe SPNet::Link do
       }
       link = Link.new(:from => blocks["A"].out_ports["OUT"], :to => blocks["B"].in_ports["IN"])
       link.activate
-      @state = link.export_state blocks
+      @state = link.save_state blocks
     end
     
     it 'should make a LinkState object' do

data/spec/ports/signal_in_port_spec.rb

@@ -8,7 +8,7 @@ describe SPNet::SignalInPort do
     end
   end
 
-  describe 'enqueue_values' do
+  describe '#enqueue_values' do
     it 'should add values to queue' do
       port = SPNet::SignalInPort.new
       values = [2.4, 2.6, 4.9, 5.1]
@@ -27,7 +27,7 @@ describe SPNet::SignalInPort do
     end
   end
 
-  describe 'dequeue_values' do
+  describe '#dequeue_values' do
     it 'should remove N values from queue' do
       port = SPNet::SignalInPort.new
       values = [2.4, 2.6, 4.9, 5.1]

data/spec/ports/signal_out_port_spec.rb

@@ -6,14 +6,83 @@ describe SPNet::SignalOutPort do
     @in_port = SPNet::SignalInPort.new
   end
   
-  describe '#send_values' do
-    it 'should enqueue the values on the linked input port' do
-      @out_port.set_link Link.new(:to => @in_port, :from => @out_port)
+  describe '#enqueue_values' do
+    context 'not linked to a SignalInPort' do
+      before :each do
+        @port = SPNet::SignalOutPort.new
+        @values = [2.4, 2.6, 4.9, 5.1]
+      end
       
-      @in_port.queue.should be_empty
-      @out_port.send_values [1,2,3,4]
-      @in_port.queue.should eq([1,2,3,4])
+      context 'autosend flag set false' do
+        it 'should add values to queue' do
+          @port.enqueue_values @values.clone, false
+          @values.should eq(@port.queue)
+        end
+      end
+      
+      context 'autosend flag set true' do
+        it 'should add values to queue' do
+          @port.enqueue_values(@values.clone)
+          @values.should eq(@port.queue)
+        end        
+      end
+    end
+    
+    context 'linked to a SignalInPort' do
+      before :each do
+        @port = SPNet::SignalOutPort.new
+        @in_port = SignalInPort.new
+        Link.new(:from => @port, :to => @in_port).activate
+        @values = [2.4, 2.6, 4.9, 5.1]
+      end
+      
+      context 'autosend flag set false' do
+        it 'should add values to the queue' do
+          @port.enqueue_values @values.clone, false
+          @values.should eq(@port.queue)
+          @in_port.queue.should be_empty
+        end
+      end
+      
+      context 'autosend flag set true' do
+        it 'should not add values to the queue, but instead add values to the linked port queue' do
+          @port.enqueue_values @values.clone
+          @values.should eq(@in_port.queue)
+          @port.queue.should be_empty
+        end
+      end      
     end
   end
 
+  describe '#dequeue_values' do
+    before :each do
+      @port = SPNet::SignalOutPort.new
+      @values = [2.4, 2.6, 4.9, 5.1]
+      @port.enqueue_values(@values.clone)
+    end
+    
+    it 'should remove N values from queue' do
+      values2 = @port.dequeue_values 2
+      @port.queue.count.should be 2
+      values2.count.should be 2
+      values2.first.should eq(@values.first)
+    end    
+    
+    it 'should remove all values from queue if no count is given' do
+      values2 = @port.dequeue_values
+      @port.queue.should be_empty
+      values2.should eq(@values)
+    end
+  end
+  
+  #describe '#send_values' do
+  #  it 'should enqueue the values on the linked input port' do
+  #    @out_port.set_link Link.new(:to => @in_port, :from => @out_port)
+  #    
+  #    @in_port.queue.should be_empty
+  #    @out_port.evalues [1,2,3,4]
+  #    @in_port.queue.should eq([1,2,3,4])
+  #  end
+  #end
+
 end

data/spec/spec_helper.rb

@@ -34,7 +34,7 @@ class TestBlock < Block
     )
 
     pass_through = lambda do |count|
-      output.send_values input.dequeue_values(count)
+      output.enqueue_values input.dequeue_values(count)
     end
     
     super(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spnet
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashmake
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 654422513
+      hash: -2015029166841238127
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 654422513
+      hash: -2015029166841238127
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23