answer-factory 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/answer-factory.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{answer-factory}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Tozier", "Trek Glowacki", "Jesse Sielaff"]

data/lib/factories/factory.rb

@@ -5,7 +5,7 @@ module AnswerFactory
     attr_reader :name
     attr_reader :nudge_instructions
     attr_reader :nudge_types
-    attr_reader :couchdb_server
+    attr_reader :couchdb_server, :couchdb_name
     attr_accessor :workstation_names
     attr_reader :original_options_hash
     
@@ -21,11 +21,17 @@ module AnswerFactory
         configatron.factory.retrieve(:workstation_names, nil) ||
         Array.new
       
+      
       # CouchDB settings
       @couchdb_server = options[:couchdb_server] ||
         configatron.factory.couchdb.retrieve(:server, nil) ||
         "http://127.0.0.1:5984"
       
+      @couchdb_name = options[:couchdb_name] ||
+        configatron.factory.couchdb.retrieve(:name, nil) ||
+        @name
+      
+      
       # Nudge language settings
       @nudge_instructions = options[:nudge_instructions] ||
         configatron.nudge.instructions.retrieve(:all, nil) ||
@@ -47,10 +53,11 @@ module AnswerFactory
       configatron.nudge.types.all = @nudge_types
       configatron.factory.workstation_names = @workstation_names
       configatron.factory.couchdb.server = @couchdb_server
+      configatron.factory.couchdb.name = @couchdb_name
     end
     
     
-    def couch_available?
+    def self.couch_available?
       open(configatron.factory.couchdb.server).status
       true
     rescue StandardError

data/lib/factories/workstation.rb

@@ -1,19 +1,16 @@
 module AnswerFactory
   
   class Workstation
-    attr_reader :name, :capacity, :couchdb_uri, :factory_name
+    attr_reader :name, :capacity, :factory_name
     attr_accessor :downstream_stations
     attr_accessor :answers
-    attr_accessor :build_sequence
     
     
     def initialize(name, options = {})
       raise ArgumentError, "#{name} is not a Symbol" unless name.kind_of?(Symbol)
       @name = name
-      @factory_name = options[:factory_name] || 'factory_name'
-      @couchdb_uri = options[:couchdb_uri] || "http://127.0.0.1:5984/#{@factory_name}"
+      @factory_name = configatron.factory.name
       @capacity = options[:capacity] || 100
-      @build_sequence = options[:build_sequence] || Array.new
       @downstream_stations = Array.new
       @answers = Batch.new
     end
@@ -25,9 +22,21 @@ module AnswerFactory
       which.add_tag(where)
     end
     
+    def couchdb_uri
+      "#{configatron.factory.couchdb.server}/#{configatron.factory.couchdb.name}"
+    end
+    
+    
+    def receive!
+      # Workstation is a superclass; the default behavior (doing nothing)
+      # should be overridden in a subclass definition
+    end
+    
     
     def gather_mine
-      @answers += Batch.load_from_couch(@couchdb_uri, "#{name}/current")
+      gathered = Batch.load_from_couch(couchdb_uri, "#{name}/current")
+      puts "gathered: #{gathered.class}"
+      @answers = gathered
     end
     
     
@@ -72,11 +81,17 @@ module AnswerFactory
     end
     
     
+    def after_cycle!
+      @answers.bulk_save!(couchdb_uri)
+      @answers = Batch.new
+    end
+    
     def cycle
       self.receive!
       self.build!
       self.ship!
       self.scrap!
+      self.after_cycle!
     end
   end
 end

data/lib/operators/all_duplicated_genomes_sampler.rb

@@ -1,4 +1,5 @@
 module AnswerFactory
+  
   class AllDuplicatedGenomesSampler < Sampler
     def generate(crowd)
       result = Batch.new
@@ -11,4 +12,5 @@ module AnswerFactory
       return result
     end
   end
+
 end

data/lib/operators/program_point_count_evaluator.rb

@@ -1,5 +1,6 @@
 module AnswerFactory
   class ProgramPointEvaluator < Evaluator
+    
     def evaluate(batch)
       raise(ArgumentError, "Can only evaluate a Batch of Answers") if !batch.kind_of?(Batch)
       batch.each do |i|
@@ -10,5 +11,8 @@ module AnswerFactory
         end
       end
     end
+    
+    alias  generate evaluate
+    
   end
 end

data/spec/factories/factory_spec.rb

@@ -9,6 +9,10 @@ describe "Factory" do
       end
       
       describe "Factory.new should have reasonable default values" do
+        before(:each) do
+          configatron.reset!
+        end
+        
         it "should use 'my_factory' for #name" do
           f1 = Factory.new
           f1.name.should == "my_factory"
@@ -24,6 +28,12 @@ describe "Factory" do
           f1.couchdb_server.should == 'http://127.0.0.1:5984'
         end
         
+        it "should use self.name for #couchdb_name" do
+          f1 = Factory.new(name:"bob")
+          f1.couchdb_name.should == f1.name
+        end
+        
+        
         it "should use Nudge::Instruction.all_instructions for #nudge_instructions" do
           f1 = Factory.new
           f1.nudge_instructions.should == Instruction.all_instructions
@@ -77,6 +87,13 @@ describe "Factory" do
           end
         end
         
+        it "should hit configatron for #couchdb_name" do
+          configatron.temp do
+            configatron.factory.couchdb.name = "succotash"
+            f1 = Factory.new
+            f1.couchdb_name.should == "succotash"
+          end
+        end
       end
       
       
@@ -106,6 +123,11 @@ describe "Factory" do
             Factory.new(couchdb_server:"http://127.0.0.1:9999")
             configatron.factory.couchdb.server.should == "http://127.0.0.1:9999"
           end
+          
+          it "should overwrite #factory.couchdb.server" do
+            Factory.new(couchdb_name:"miss_jackson")
+            configatron.factory.couchdb.name.should == "miss_jackson"
+          end
         end
       end
       
@@ -120,14 +142,14 @@ describe "Factory" do
         
         it "should have a method to check that couchDB is accessible" do
           f1 = Factory.new(name:"boo")
-          lambda{f1.couch_available?}.should_not raise_error
+          lambda{Factory.couch_available?}.should_not raise_error
         end
         
         it "should return true if the uri is reachable" do
           uri = "http://mycouch.db/boo"
           f1 = Factory.new(name:"boo", couchdb_server:uri)
           FakeWeb.register_uri(:any, uri, :body => "We are here!", :status => [200, "OK"])
-          f1.couch_available?.should == true
+          Factory.couch_available?.should == true
         end
         
         it "should return false if the uri is offline or 404's out" do
@@ -135,23 +157,10 @@ describe "Factory" do
           f1 = Factory.new(name:"boo", couchdb_server:uri)
           FakeWeb.register_uri(:any, "http://mycouch.db/boo",
             :body => "Go away!", :status => [404, "Not Found"])
-          f1.couch_available?.should == false
+          Factory.couch_available?.should == false
           
           f1 = Factory.new(name:"boo", couchdb_server:"http://127.0.0.1:9991/place")
-          f1.couch_available?.should == false
-        end
-      end
-      
-      
-      describe "database setup" do
-        describe "paths" do
-          it "should have reasonable defaults"
-          
-          describe "setting from file" do
-            it "should populate configatron.main_database.db_root"
-            
-            it "should populate configatron.main_database.db_name"
-          end
+          Factory.couch_available?.should == false
         end
       end
     end

data/spec/factories/workstation_spec.rb

@@ -2,8 +2,7 @@ require File.join(File.dirname(__FILE__), "./../spec_helper")
 
 
 describe "Workstation" do
-  
-  describe "names" do
+  describe "#name" do
     it "should have a name" do
       Workstation.new(:my_workthing).name.should == :my_workthing
     end
@@ -14,26 +13,14 @@ describe "Workstation" do
     end
     
     it "should have a factory_name" do
-      Workstation.new(:ws).factory_name.should be_a_kind_of(String)
-    end
-    
-    it "should have a default factory_name of 'factory_name'" do
-      Workstation.new(:ws).factory_name.should == 'factory_name'
-    end
-    
-    it "should be possible to set the factory_name via an initialization option" do
-      Workstation.new(:ws, factory_name:'foo').factory_name.should == 'foo'
-    end
-  end
-  
-  
-  describe "database" do
-    it "should have a URI for a CouchDB instance" do
-      Workstation.new(:ws).couchdb_uri.should be_a_kind_of(String)
+      Workstation.new(:ws).should respond_to(:factory_name)
     end
     
-    it "should default to http://127.0.0.1:5984/\#{@factory_name}" do
-      Workstation.new(:ws).couchdb_uri.should == "http://127.0.0.1:5984/factory_name"
+    it "should get factory_name from configatron" do
+      configatron.temp do
+        configatron.factory.name = 'somewhere_lovely'
+        Workstation.new(:ws).factory_name.should == 'somewhere_lovely'
+      end
     end
   end
   
@@ -93,22 +80,42 @@ describe "Workstation" do
   
   
   describe "#cycle" do
+    before(:each) do
+      FakeWeb.register_uri(:any, "http://127.0.0.1:5984/this_factory/_bulk_docs",
+        :body => @canned, :status => [200, "OK"])
+    end
     
     describe "the #before_cycle method" do
       it "should empty @answers"
     end
     
     it "should invoke #receive!, #build!, #ship! and #scrap!" do
-      w1 = Workstation.new(:place)
-      w1.should_receive(:receive!)
-      w1.should_receive(:build!)
-      w1.should_receive(:ship!)
-      w1.should_receive(:scrap!)
-      w1.cycle
+      configatron.temp do
+        configatron.factory.couchdb.server = "http://127.0.0.1:5984"
+        configatron.factory.couchdb.name = "this_factory"
+        
+        w1 = Workstation.new(:this_factory)
+        w1.stub!(:after_cycle!)
+        w1.should_receive(:receive!)
+        w1.should_receive(:build!)
+        w1.should_receive(:ship!)
+        w1.should_receive(:scrap!)
+        w1.cycle
+      end
     end
     
     describe "the #after_cycle method" do
-      it "should save everything in @answers to the persistent store"
+      it "should save everything in @answers to the persistent store" do
+        configatron.temp do
+          configatron.factory.couchdb.server = "http://127.0.0.1:5984"
+          configatron.factory.couchdb.name = "this_factory"
+          
+          FakeWeb.allow_net_connect = false
+          @w1 = Workstation.new(:ws1, factory_name:"this_factory")
+          @w1.answers.should_receive(:bulk_save!)
+          @w1.after_cycle!
+        end
+      end
     end
     
     describe "#receive!" do
@@ -119,6 +126,7 @@ describe "Workstation" do
       describe "gather_mine" do
         before(:each) do
           @w1 = Workstation.new(:ws1, factory_name:"this_factory")
+          
           @uri = "http://127.0.0.1:5984/this_factory"
           @design_doc = "ws1/current"  # we'll assume this has been set up!
           @view_uri = "http://127.0.0.1:5984/this_factory/_design/ws1/_view/current"
@@ -127,17 +135,27 @@ describe "Workstation" do
         end
         
         it "should use the Batch#load_from_couch method" do
-          FakeWeb.register_uri(:any, @view_uri, :body => @canned, :status => [200, "OK"])
-          Batch.should_receive(:load_from_couch).with(@uri,@design_doc).and_return(Batch.new)
-          @w1.gather_mine
+          configatron.temp do
+            configatron.factory.couchdb.server = "http://127.0.0.1:5984"
+            configatron.factory.couchdb.name = "this_factory"
+            
+            FakeWeb.register_uri(:any, @view_uri, :body => @canned, :status => [200, "OK"])
+            Batch.should_receive(:load_from_couch).with(@uri,@design_doc).and_return(Batch.new)
+            @w1.gather_mine
+          end
         end
         
         it "should add that Batch into self#answers" do
-          FakeWeb.register_uri(:any, @view_uri, :body => @canned, :status => [200, "OK"])
-          @w1.answers.length.should == 0
-          @w1.gather_mine
-          @w1.answers.length.should == 1
-          @w1.answers[0].scores[:badness].should == 12.345
+          configatron.temp do
+            configatron.factory.couchdb.server = "http://127.0.0.1:5984"
+            configatron.factory.couchdb.name = "this_factory"
+          
+            FakeWeb.register_uri(:any, @view_uri, :body => @canned, :status => [200, "OK"])
+            @w1.answers.length.should == 0
+            @w1.gather_mine
+            @w1.answers.length.should == 1
+            @w1.answers[0].scores[:badness].should == 12.345
+          end
         end
       end
       

data/spec/operators/evaluators/program_point_evaluator_spec.rb

@@ -39,5 +39,10 @@ describe ProgramPointEvaluator do
       @ppe.evaluate(@dudes)
       @dudes.each {|dude| origIDs.should include(dude.object_id)}
     end
+    
+    it "should return a Batch" do
+      @ppe.evaluate(@dudes).should be_a_kind_of(Batch)
+    end
+    
   end
 end

data/spec/operators/pointCrossover_spec.rb

@@ -56,5 +56,10 @@ describe "PointCrossoverOperator" do
       babies = @myXover.generate([@dude1, @dude2],10)
       babies.each {|baby| [8,12].should include(baby.progress)}
     end
+    
+    it "should return a Batch" do
+      babies = @myXover.generate(Batch.[](@dude1, @dude2))
+      babies.should be_a_kind_of(Batch)
+    end
   end
 end

data/templates/answer_factory_activate_template.erb

@@ -1,4 +1,6 @@
 require 'answer-factory'
+include Nudge
+include AnswerFactory
 
 ####
 ####
@@ -6,16 +8,91 @@ require 'answer-factory'
 ####
 ####
 
-# Nudge language extensions:
+
+#### CouchDB access:
+configatron.factory.couchdb.server =          'http://127.0.0.1:5984'
+
+#### Factory settings:
+configatron.factory.name =                    'my_factory'
+
+#### Workstation definitions:
+configatron.project.workstations.path =       '/lib/factory/workstations/*'
+
+#### Nudge language extensions:
 configatron.project.nudge.instructions.path = '/lib/nudge/instructions/*'
 configatron.project.nudge.types.path =        '/lib/nudge/types/*'
 
 
+
+#### normally these should be in /lib/factory/workstations/**
+
+class GeneratorStation < Workstation
+  attr_reader :random_program_maker
+  
+  def initialize(name, options = {})
+    super
+    @random_program_maker = RandomGuessOperator.new(how_many:10)
+  end
+  
+  def build!
+    process_with @random_program_maker
+  end
+  
+  def ship!
+    ship_to(:breeder) {|answer| true} 
+  end
+end
+
+
+class EvolverStation < Workstation
+  attr_reader :my_crossover_operator
+  attr_reader :my_length_evaluator
+  
+  def initialize(name, options = {})
+    super
+    @my_crossover_operator = PointCrossoverOperator.new
+    @my_length_evaluator = ProgramPointEvaluator.new(score_label:"length")
+  end
+  
+  def receive!
+    gather_mine
+  end
+  
+  def build!
+    process_with @my_crossover_operator
+    # process_with @my_length_evaluator
+  end
+  
+  def scrap!
+    @highest_progress = (@answers.collect {|a| a.progress}).max
+    scrap_if("too_old") {|a| a.progress < @highest_progress} 
+  end
+end
+
+
 ####
 ####
-#### DON'T EDIT PAST THIS POINT
+#### DON'T EDIT BEYOND THIS POINT
 ####
 ####
 
+# extend Nudge
 Dir.glob(File.dirname(__FILE__) + configatron.project.nudge.instructions.path) {|file| require file}
-Dir.glob(File.dirname(__FILE__) + configatron.project.nudge.types.path) {|file| require file}
+Dir.glob(File.dirname(__FILE__) + configatron.project.nudge.types.path) {|file| require file}
+
+# confirm database access
+raise "CouchDB not available at #{configatron.factory.couchdb.server}" unless
+  Factory.couch_available?()
+
+# extend Workstation
+Dir.glob(File.dirname(__FILE__) + configatron.project.workstations.path) {|file| require file}
+
+
+project = Factory.new
+workstations = [GeneratorStation.new(:maker), EvolverStation.new(:breeder)]
+
+10.times do
+  workstations.each do |ws|
+    ws.cycle
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Bill Tozier