answer-factory 0.0.15 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.1.1

data/answer-factory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{answer-factory}
-  s.version = "0.0.15"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Tozier", "Trek Glowacki", "Jesse Sielaff"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-05-11}
   s.default_executable = %q{answer-factory}
   s.description = %q{The pragmaticgp gem provides a simple framework for building, running and managing genetic programming experiments which automatically discover algorithms and equations to solve user-defined problems.}
   s.email = %q{bill@vagueinnovation.com}
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
      "spec/batch_spec.rb",
      "spec/factories/factory_spec.rb",
      "spec/factories/workstation_spec.rb",
-     "spec/integration_specs/couch_db_integration.rb",
+     "spec/integration_specs/couch_db_integration.rspec",
      "spec/machines/any_one_spec.rb",
      "spec/machines/build_random_spec.rb",
      "spec/machines/evaluate_simple_score_spec.rb",
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
      "spec/batch_spec.rb",
      "spec/factories/factory_spec.rb",
      "spec/factories/workstation_spec.rb",
-     "spec/integration_specs/couch_db_integration.rb",
      "spec/machines/any_one_spec.rb",
      "spec/machines/build_random_spec.rb",
      "spec/machines/evaluate_simple_score_spec.rb",

data/lib/answers/answer.rb

@@ -2,7 +2,7 @@ require 'set'
 
 module AnswerFactory
   class Answer
-    attr_accessor :scores, :tags
+    attr_accessor :scores, :tags, :location
     attr_reader :draft_blueprint, :program, :timestamp, :ancestors
     attr_reader :initialization_options, :progress
     attr_accessor :couch_id, :couch_rev
@@ -19,6 +19,7 @@ module AnswerFactory
       end
       @timestamp = Time.now
       @couch_id = options[:couch_id] || ""
+      @location = options[:location] || :NOWHERE
       @couch_rev = options[:couch_rev] || ""
       @progress = options[:progress] || 0
       @ancestors = options[:ancestors] || []
@@ -112,6 +113,12 @@ module AnswerFactory
     end
   end
   
+  def move_to(where)
+    raise ArgumentError, "#{where} is not a Symbol" unless where.kind_of?(Symbol)
+    @location = where.to_sym
+    self
+  end
+  
   
   def add_tag(new_tag)
     raise ArgumentError, "#{new_tag} is not a Symbol" unless new_tag.kind_of?(Symbol)
@@ -130,6 +137,7 @@ module AnswerFactory
     basics["_rev"] = self.couch_rev unless self.couch_rev.empty? 
     
     basics.merge!({'blueprint' => self.blueprint,
+      'location' => self.location.to_sym,
       'tags' => self.tags.to_a, 
       'scores' => self.scores,
       'progress' => self.progress,
@@ -144,8 +152,9 @@ module AnswerFactory
     symbolized_scores = value_hash["scores"].inject({}) {|memo,(k,v)| memo[k.to_sym] = v; memo }
         
     Answer.new(value_hash["blueprint"],
-      couch_id:value_hash['id'],
-      couch_rev:value_hash['rev'],
+      couch_id:value_hash['_id'],
+      couch_rev:value_hash['_rev'],
+      location:(value_hash["location"] || "NOWHERE").to_sym,
       tags:tag_set,
       scores:symbolized_scores,
       progress:value_hash["progress"],

data/lib/answers/batch.rb

@@ -54,6 +54,7 @@ module AnswerFactory
         end
       rescue JSON::ParserError => e
         puts "Batch not read due to JSON ParserError: '#{e.message}'"
+        # raise e
       end
       return batch
     end

data/lib/factories/factory.rb

@@ -63,6 +63,5 @@ module AnswerFactory
     rescue StandardError
       false 
     end
-    
   end
 end

data/lib/factories/workstation.rb

@@ -58,10 +58,17 @@ module AnswerFactory
     end
     
     
-    def ship_to(where, &filter)
+    def ship_to(where)
       raise ArgumentError, "Workstation#ship_to cannot ship to a #{where.class}" unless
         where.kind_of?(Symbol)
-      (@answers.find_all &filter).each {|a| a.add_tag where; a.remove_tag @name}
+        
+      @answers.each do |a|
+        next unless a.location.to_sym == @name.to_sym
+        if block_given?
+          next unless yield(a)
+        end
+        a.move_to(where)
+      end
     end
     
     
@@ -72,11 +79,12 @@ module AnswerFactory
     
     
     def scrap_if(why, &filter)
-      (@answers.find_all &filter).each {|a| a.add_tag :SCRAP; a.remove_tag @name}
+      ship_to(:SCRAP, &filter) 
+      # (@answers.find_all &filter).each {|a| a.add_tag :SCRAP; a.remove_tag @name}
     end
     
     def scrap_everything
-      scrap_if("everything dies") {|x| true}
+      ship_to(:SCRAP)
     end
     
     

data/spec/answer_spec.rb

@@ -57,6 +57,30 @@ describe "Answer" do
       Answer.new("foo").scores.should == {}
     end
     
+    it "should have a tags attribute" do
+      Answer.new("").should respond_to(:tags)
+    end
+    
+    it "should be possible to set the :tags via initialization option" do
+      Answer.new("", tags:["hi"]).tags.to_a.should == ["hi"]
+    end
+    
+    it "should not report duplicate entries" do
+      Answer.new("", tags:["hi", "hi"]).tags.to_a.should == ["hi"]
+    end
+    
+    it "should have a :location attribute" do
+      Answer.new("").should respond_to(:location)
+    end
+    
+    it "should have a default :location of :NOWHERE" do
+      Answer.new("").location.should == :NOWHERE
+    end
+    
+    it "be possible to set :location via an initialization option" do
+      Answer.new("", location:"nearby").location.should == "nearby"
+    end
+    
     it "should have a #timestamp, which is when (wall clock time) it was made" do
       tn = Time.now
       Time.should_receive(:now).and_return(tn)
@@ -78,7 +102,7 @@ describe "Answer" do
   describe "serialization" do
     describe "writing" do
       before(:each) do
-        @a1 = Answer.new("block {do a}", progress:12)
+        @a1 = Answer.new("block {do a}", progress:12, location: :here)
       end
       
       it "should not contain the CouchDB _id, if none was set" do
@@ -99,11 +123,14 @@ describe "Answer" do
         @a1.data['_rev'].should == "88888"
       end
       
-      
       it "should contain the blueprint" do
         @a1.data['blueprint'].should == @a1.blueprint
       end
       
+      it "should contain the location" do
+        @a1.data['location'].should == @a1.location
+      end
+      
       it "should contain the tags" do
         @a1.data['tags'].should == @a1.tags.to_a
       end
@@ -125,7 +152,7 @@ describe "Answer" do
     
     describe "reading" do
       before(:each) do
-        @couchified = {"id"=>"0f60c293ad736abfdb083d33f71ef9ab", "key"=>"ws1", "value"=>{"id"=>"0f60c293ad736abfdb083d33f71ef9ab", "rev"=>"1-473467b6dc1a4cba3498dd6eeb8e3206", "blueprint"=>"do bar", "tags"=>["quux", "whatevz"], "scores"=>{"badness" => 12.345}, "progress" => 12, "timestamp"=>"2010/04/14 17:09:14 +0000"}}
+        @couchified = {"id"=>"0f60c293ad736abfdb083d33f71ef9ab", "key"=>"ws1", "value"=>{"_id"=>"0f60c293ad736abfdb083d33f71ef9ab", "_rev"=>"1-473467b6dc1a4cba3498dd6eeb8e3206", "blueprint"=>"do bar", "location"=>"here","tags"=>["quux", "whatevz"], "scores"=>{"badness" => 12.345}, "progress" => 12, "timestamp"=>"2010/04/14 17:09:14 +0000"}}
         @my_a = Answer.from_serial_hash(@couchified)
       end
       
@@ -142,6 +169,10 @@ describe "Answer" do
         @my_a.blueprint.should == "do bar"
       end
       
+      it "should accumulate the :location" do
+        @my_a.location.should == :here
+      end
+      
       it "should collect the tag Array into a Set of symbols" do
         @my_a.tags.should be_a_kind_of(Set)
         @my_a.tags.should include(:quux)
@@ -438,6 +469,20 @@ describe "Answer" do
   end
   
   
+  describe "locations" do
+    describe "move_to" do
+      it "should change the :location" do
+        a = Answer.new("do a", location: :dzz)
+        a.move_to(:zzd).location.should == :zzd
+      end
+      
+      it "should raise an error if the argument isn't a Symbol" do
+        lambda{Answer.new("do a").move_to(99123)}.should raise_error(ArgumentError)
+      end
+    end
+  end
+  
+  
   describe "tags" do
     it "should have a tags array" do
       Answer.new("").tags.should be_a_kind_of(Set)

data/spec/factories/workstation_spec.rb

@@ -208,15 +208,20 @@ describe "Workstation" do
       describe "ship_to" do
         before(:each) do
           @w2 = Workstation.new(:lulu)
-          @a1 = Answer.new("do fun_stuff", tags:[:lulu])
-          @a2 = Answer.new("do sad_stuff", tags:[:lulu])
+          @a1 = Answer.new("do fun_stuff", location: :lulu)
+          @a2 = Answer.new("do sad_stuff", location: :lulu)
           @w2.answers = Batch[@a1,@a2]
         end
         
+        
         it "should accept a single argument" do
           @w2.method(:ship_to).arity.should == 1
         end
         
+        it "should be comfortable without any block" do
+          @w2.ship_to(:here)
+        end
+        
         it "should check the argument is a symbol" do
           lambda{@w2.ship_to(8)}.should raise_error(ArgumentError)
           lambda{@w2.ship_to(:heaven)}.should_not raise_error
@@ -227,25 +232,17 @@ describe "Workstation" do
           @w2.ship_to(:heaven) {|a| Math.sin(12.0)}
         end
         
-        it "should add a new location tag to the answers in the filtered subset" do
-          @a1.should_receive(:add_tag).with(:xyzzy)
-          @a2.should_receive(:add_tag).with(:xyzzy)
-          @w2.ship_to(:xyzzy) {|a| true}
-        end
-        
-        it "should remove the old location tag to the answers in the filtered subset" do
-          @a1.should_receive(:remove_tag).with(:lulu)
-          @a2.should_receive(:remove_tag).with(:lulu)
+        it "should change the :location of the answers in the filtered subset" do
+          @a1.should_receive(:move_to).with(:xyzzy)
+          @a2.should_receive(:move_to).with(:xyzzy)
           @w2.ship_to(:xyzzy) {|a| true}
         end
         
-        it "should not touch the tags of answers not in the filtered subset" do
-          @a1.should_receive(:remove_tag).with(:lulu)
-          @a2.should_not_receive(:remove_tag)
-          @w2.ship_to(:xyzzy) {|a| a.blueprint.include? "fun"}
+        it "should only ship things that are still there" do
+          @a2.location = :far_away
+          @w2.ship_to(:other_place) {|a| true}
+          @a2.location.should == :far_away
         end
-        
-        it "should only ship things that are still there"
       end
     end
     
@@ -259,8 +256,8 @@ describe "Workstation" do
       describe "scrap_if" do
         before(:each) do
           @w3 = Workstation.new(:falafel)
-          @a1 = Answer.new("do fun_stuff", progress:1, tags:[:falafel])
-          @a2 = Answer.new("do sad_stuff", progress:99, tags:[:falafel])
+          @a1 = Answer.new("do fun_stuff", progress:1, location: :falafel)
+          @a2 = Answer.new("do sad_stuff", progress:99, location: :falafel)
           @w3.answers = Batch[@a1,@a2]
         end
         
@@ -273,32 +270,14 @@ describe "Workstation" do
           @w3.scrap_if("Math says so") {|a| Math.cos(12.0)}
         end
         
-        it "should add a new location tag :SCRAP to the answers in the filtered subset" do
-          @a1.should_receive(:add_tag).with(:SCRAP)
-          @a2.should_receive(:add_tag).with(:SCRAP)
-          @w3.scrap_if("everything dies") {|a| true}
-        end
-        
-        it "should remove the old location tag to the answers in the filtered subset" do
-          @a1.should_receive(:remove_tag).with(:falafel)
-          @a2.should_receive(:remove_tag).with(:falafel)
-          @w3.scrap_if("entropy") {|a| true}
-        end
-        
-        it "should not touch the tags of answers not in the filtered subset" do
-          @a1.should_receive(:remove_tag).with(:falafel)
-          @a2.should_not_receive(:remove_tag)
-          @w3.scrap_if("insufficient progress") {|a| a.progress < 10}
-        end
-        
         it "should not scrap things that aren't at that location"
       end
       
       describe "scrap_everything" do
         before(:each) do
           @w4 = Workstation.new(:ice_station_zebra)
-          @a1 = Answer.new("do anything", tags:[:ice_station_zebra])
-          @a2 = Answer.new("do whatevz", tags:[:ice_station_zebra])
+          @a1 = Answer.new("do anything", location: :ice_station_zebra)
+          @a2 = Answer.new("do whatevz", location: :ice_station_zebra)
           @w4.answers = Batch[@a1,@a2]
         end
         
@@ -307,20 +286,14 @@ describe "Workstation" do
         end
         
         it "should call scrap_if" do
-          @w4.should_receive(:scrap_if)
+          @w4.should_receive(:ship_to)
           @w4.scrap_everything
         end
         
         it "should send every answer to :SCRAP" do
-          @w4.answers.each {|a| a.tags.should_not include(:SCRAP)}
-          @w4.scrap_everything
-          @w4.answers.each {|a| a.tags.should include(:SCRAP)}
-        end
-        
-        it "should remove the current location from every answer" do
-          @w4.answers.each {|a| a.tags.should include(:ice_station_zebra)}
+          @w4.answers.each {|a| a.location.should_not == :SCRAP}
           @w4.scrap_everything
-          @w4.answers.each {|a| a.tags.should_not include(:ice_station_zebra)}
+          @w4.answers.each {|a| a.location.should == :SCRAP}
         end
         
         it "should be safe to repeat the statement" do

data/spec/integration_specs/couch_db_integration.rspec

@@ -0,0 +1,142 @@
+require File.join(File.dirname(__FILE__), "./../spec_helper")
+
+# CouchDB MUST BE RUNNING BEFORE YOU RUN THESE
+
+class ShipperStation < Workstation
+  def receive!
+    gather_mine
+  end
+  
+  def ship!
+    ship_to(:that_place) {|answer| true} 
+  end
+end
+
+
+describe "CouchDB stuff" do
+  before(:each) do
+    
+    configatron.factory.couchdb.server = "http://127.0.0.1:5984"
+    configatron.factory.couchdb.name = "integration_test_db"
+    break("CouchDB is offline") unless Factory.couch_available?
+    @db_uri = "#{configatron.factory.couchdb.server}/#{configatron.factory.couchdb.name}"
+  end
+  
+  after(:all) do
+    CouchRest.database!(@db_uri).delete!
+  end
+  
+  
+  describe "Factory CouchDB interaction" do
+    it "should actually return 'true' if the db is reachable" do
+      Factory.couch_available?.should be true
+    end
+    
+    it "should actually return 'false' if the db is unavailable" do
+      FakeWeb.allow_net_connect = false
+      Factory.couch_available?.should be false
+      FakeWeb.allow_net_connect = true
+    end
+    
+  end
+  
+  describe "Batch reading and writing" do
+    describe "updating a Batch" do
+      before(:each) do
+        @batch = Batch.[](Answer.new("do a"), Answer.new("do b"))
+      end
+
+      describe "Batch#bulk_save!" do
+        it "should capture the couch_id values in the Answers themselves" do
+          old_ids = @batch.collect {|a| a.couch_id}
+          @batch.bulk_save!(@db_uri)
+          new_ids = @batch.collect {|a| a.couch_id}
+          old_ids.should_not == new_ids
+        end
+        
+        it "should capture the couch_rev values in the Answers themselves" do
+          @batch.bulk_save!(@db_uri)
+          new_revs = @batch.collect {|a| a.couch_rev}
+          new_revs.each {|r| r.should_not == ""}
+        end
+      end
+      
+      
+      it "should be possible to set the couchdb_id and have that be actually used" do
+        @batch[0].couch_id = "001"
+        @batch[1].couch_id = "002"
+        ids = @batch.bulk_save!(@db_uri).collect {|r| r["id"]}
+        ids.should == ["001", "002"]
+      end
+      
+      it "should be possible to overwrite a document with new info" do
+        @batch.bulk_save!(@db_uri)
+        
+        db = CouchRest.database!(@db_uri)
+        as_saved = db.get(@batch[0].couch_id)["_rev"]
+        @batch[0].scores[:wellness] = 0
+        @batch.bulk_save!(@db_uri)
+        and_now = db.get(@batch[0].couch_id)["_rev"]
+        as_saved[0].should == "1"
+        and_now[0].should == "2"
+      end
+      
+    end
+  end
+  
+  
+  describe "Workstations passing Batches around" do
+    
+    describe "gathering" do
+      before(:each) do
+        @ws1 = ShipperStation.new(:this_place)
+        @batch = Batch.[](
+          Answer.new("do a", location: :this_place), 
+          Answer.new("do b", location: :this_place),
+          Answer.new("do c", location: :elsewhere))
+        CouchRest.database!(@db_uri).
+          batch_save_doc({'_id' => "_design/this_place",
+            views: { current: { map: 
+              "function(doc) { if(doc.location == 'this_place') { emit(doc._id, doc); } }"}}})
+        @batch.bulk_save!(@db_uri)
+      end
+      
+      it "should gather the right ones" do
+        @ws1.receive!
+        @ws1.answers.length.should == 2
+        @ws1.answers.collect {|a| a.blueprint}.sort.should == ["do a", "do b"]
+      end
+      
+      it "should capture the :_id and :_rev fields of the records" do
+        @ws1.receive!
+        @ws1.answers.each {|a| a.couch_id.should_not == ""}
+        @ws1.answers.each {|a| a.couch_rev.should_not == ""}
+      end
+    end
+    
+    
+    describe "shipping" do
+      before(:each) do
+        @ws1 = ShipperStation.new(:this_place)
+        @batch = Batch.[](
+          Answer.new("do a", location: :this_place), 
+          Answer.new("do b", location: :this_place),
+          Answer.new("do c", location: :elsewhere))
+        CouchRest.database!(@db_uri).
+          batch_save_doc({'_id' => "_design/this_place",
+            views: { current: { map: 
+              "function(doc) { if(doc.location == 'this_place') { emit(doc._id, doc); } }"}}})
+        @batch.bulk_save!(@db_uri)
+      end
+      
+      it "should not be able to re-gather Answers it has shipped away" do
+        @ws1.cycle # load, ship, and save
+        @ws1.receive!
+        @ws1.answers.length.should == 0
+      end
+    end
+    
+  end
+  
+  
+end

data/tasks/setup_factory.thor

@@ -23,6 +23,7 @@ class Setup_Factory < Thor::Group
     empty_directory("./lib/nudge/instructions")
     empty_directory("./lib/nudge/types")
     empty_directory("./lib/factory/machines")
+    empty_directory("./lib/factory/workstations")
     empty_directory("./spec")
   end
   

data/templates/answer_factory_activate_template.erb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'answer-factory'
 include Nudge
 include AnswerFactory
@@ -23,102 +24,102 @@ 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
+class GenerationStation < Workstation
   attr_reader :random_program_maker
   
   def initialize(name, options = {})
     super
     @random_program_maker = Machines::BuildRandom.new(
       how_many:10,
-      target_size_in_points:7, 
+      target_size_in_points:20, 
       reference_names:["x1", "x2"])
   end
   
-  def receive!
-    gather_mine
-    puts "#{self.name}: received and now have: #{@answers.length}"
-    puts "\n\n#{self.name}: tags begin as #{(@answers.collect {|a| a.tags.to_a}).flatten}"
-    
-  end
-  
   def build!
     @answers = process_with @random_program_maker
-    puts "#{self.name}: built and now have: #{@answers.length}"
+    @answers.each {|a| a.location = :maker}
+    puts
+    puts "MAKER BUILD: made #{@answers.length}"
   end
   
   def ship!
-    ship_to(:breeder) {|answer| true} 
-    puts "#{self.name}: shipping to #{@answers.collect {|a| a.tags.to_a}.inspect}"
+    ship_to(:polisher) {|answer| true}
+    puts "MAKER SHIP -> POLISHER"
   end
 end
 
 
-class EvaluatorStation1 < Workstation
+class VariationStation < Workstation
   attr_reader :my_length_evaluator
   
   def initialize(name, options = {})
     super
-    @my_length_evaluator = Machines::EvaluateSimpleScore.new(
-      :name => :blueprint_length,
-      scorer:Proc.new {|a| a.blueprint.length})
+    @mutator = Machines::MutateFootnotesUniform.new(
+      )
+    @score_1 = Machines::EvaluateSimpleScore.new(
+      :name => :number_of_footnotes,
+      scorer:Proc.new {|a| a.blueprint.scan(/^«/).length})
   end
   
   def receive!
     gather_mine
-    puts "#{self.name}: received and now have: #{@answers.length}"
-    puts "\n\n#{self.name}: tags begin as #{(@answers.collect {|a| a.tags.to_a}).flatten}"
+    puts "POLISHER RECEIVE: got #{@answers.length}"
   end
   
   def build!
-    @answers = process_with @my_length_evaluator
-    puts "#{self.name}: built and now have: #{@answers.length}"
+    @mutants = process_with @mutator
+    @mutants.each {|a| @answers << a}
+    @answers = process_with @score_1
+    puts "POLISHER BUILD: has #{@answers.length}"
   end
   
   def ship!
-    ship_to(:marker) {|answer| rand < 0.5} 
-    puts "#{self.name}: shipping to #{@answers.collect {|a| a.tags.to_a}.inspect}"
+    ship_to(:picker) {|answer| true} 
   end
   
   def scrap!
-    puts "\n\n#{self.name}: tags begin as #{(@answers.collect {|a| a.tags.to_a}).flatten}"
-    @best_score = (@answers.collect {|a| a.scores[:blueprint_length]}).min
-    scrap_if("too_long") {|a| (a.scores[:blueprint_length] > @best_score)}
-    puts "#{self.name}: tags ended as #{(@answers.collect {|a| a.tags.to_a})}"
-    puts "#{self.name}: scores ended as #{(@answers.collect {|a| a.scores.values})}\n\n"
+    best_score = (@answers.collect {|a| a.scores[:number_of_footnotes]}).min
+    worst_score = (@answers.collect {|a| a.scores[:number_of_footnotes]}).max
+    puts "#{worst_score}..#{best_score}"
+    scrap_if("too many footnotes") {|a| a.scores[:number_of_footnotes] > 
+        ((worst_score - best_score)/2.0 + best_score)}
+    puts "PICKER SCRAP: kept #{@answers.find_all {|a| a.location == :polisher}.length}"
   end
 end
 
 
-class EvaluatorStation2 < Workstation
-  attr_reader :my_length_evaluator
+class ScreeningStation < Workstation
+  attr_reader :letters
   
   def initialize(name, options = {})
     super
-    @my_length_evaluator = Machines::EvaluateSimpleScore.new(
-      :name => :points,
-      scorer:Proc.new {|a| a.blueprint.points})
+    @letters = Machines::EvaluateSimpleScore.new(
+      :name => :letters,
+      scorer:Proc.new {|a| a.blueprint.length})
+    @so_far_so_good = Machines::SelectNondominated.new
   end
   
   def receive!
     gather_mine
-    puts "#{self.name}: received and now have: #{@answers.length}"
-    puts "\n\n#{self.name}: tags begin as #{(@answers.collect {|a| a.tags.to_a}).flatten}"
+    puts "PICKER RECEIVE: got #{@answers.length}"
   end
   
   def build!
-    @answers = process_with @my_length_evaluator
-    puts "#{self.name}: built and now have: #{@answers.length}"
+    @answers = process_with @letters
+    @best = process_with @so_far_so_good
+    puts "PICKER EVERYTHING: #{@answers.length}"
+    @answers.each {|a| puts a.scores}
+    puts "----------"
+    puts "PICKER NONDOMINATED SET: #{@best.length}"
+    @best.each {|a| puts a.scores}
+    
   end
   
   def scrap!
-    puts "\n\n#{self.name}: tags begin as #{(@answers.collect {|a| a.tags.to_a}).flatten}"
-    @best_score = (@answers.collect {|a| a.scores[:points]}).min
-    scrap_if("too_long") {|a| (a.scores[:points] > @best_score)}
-    puts "#{self.name}: tags ended as #{(@answers.collect {|a| a.tags.to_a}).flatten}"
-    puts "#{self.name}: scores ended as #{(@answers.collect {|a| a.scores.values}).flatten}\n\n"
+    scrap_if("dominated") {|a| !@best.include?(a)}
+    puts "PICKER SCRAP: kept #{@answers.find_all {|a| a.location == :picker}.length}"
   end
 end
 
@@ -141,30 +142,43 @@ raise "CouchDB not available at #{configatron.factory.couchdb.server}" unless
 # extend Workstation
 Dir.glob(File.dirname(__FILE__) + configatron.project.workstations.path) {|file| require file}
 
+
+### these should get tucked away elsewhere:
+
 project = Factory.new()
-workstations = [GeneratorStation.new(:maker),EvaluatorStation1.new(:breeder)]
-  # GeneratorStation.new(:maker)],
-  # EvaluatorStation1.new(:breeder),
-  # EvaluatorStation2.new(:marker)]
+workstations =[
+  GenerationStation.new(:maker),
+  VariationStation.new(:polisher),
+  ScreeningStation.new(:picker)]
 
-# write view document(s)
+# reset database
 db = CouchRest.database!("#{configatron.factory.couchdb.server}/#{configatron.factory.name}")
 db.delete!
 db.create!
 
-db.batch_save_doc({'_id' => "_design/marker", views: { current: { map: "function(doc) { if(doc.tags.length > 0) { for(var idx in doc.tags) { if(doc.tags[idx] == 'marker') {emit(doc._id, doc)   }}}}"}}})
 
-db.batch_save_doc({'_id' => "_design/breeder", views: { current: { map: "function(doc) { if(doc.tags.length > 0) { for(var idx in doc.tags) { if(doc.tags[idx] == 'breeder') {emit(doc._id, doc)   }}}}"}}})
+# create required view document(s) [should be part of generating each workstation]
+db.batch_save_doc({'_id' => "_design/maker", views: { current: { map: "function(doc) {
+  if(doc.location == 'maker') {
+    emit(doc._id, doc);
+  }
+}"}}})
 
-db.batch_save_doc({'_id' => "_design/maker", views: { current: { map: "function(doc) { if(doc.tags.length > 0) { for(var idx in doc.tags) { if(doc.tags[idx] == 'maker') {emit(doc._id, doc)   }}}}"}}})
+db.batch_save_doc({'_id' => "_design/polisher", views: { current: { map: "function(doc) {
+  if(doc.location == 'polisher') {
+    emit(doc._id, doc);
+  }
+}"}}})
 
+db.batch_save_doc({'_id' => "_design/picker", views: { current: { map: "function(doc) {
+  if(doc.location == 'picker') {
+    emit(doc._id, doc);
+  }
+}"}}})
 
-test = {"_id" => "test_doc", "wild" => "and random"}
-db.save_doc(test)
-test["foo" => "bar"]
-db.save_doc(test)
 
-5.times do
+# final workcycle behavior
+100.times do
   workstations.each do |ws|
     ws.cycle
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 15
-  version: 0.0.15
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bill Tozier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -04:00
+date: 2010-05-11 00:00:00 -04:00
 default_executable: answer-factory
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,7 @@ files:
 - spec/batch_spec.rb
 - spec/factories/factory_spec.rb
 - spec/factories/workstation_spec.rb
-- spec/integration_specs/couch_db_integration.rb
+- spec/integration_specs/couch_db_integration.rspec
 - spec/machines/any_one_spec.rb
 - spec/machines/build_random_spec.rb
 - spec/machines/evaluate_simple_score_spec.rb
@@ -194,7 +194,6 @@ test_files:
 - spec/batch_spec.rb
 - spec/factories/factory_spec.rb
 - spec/factories/workstation_spec.rb
-- spec/integration_specs/couch_db_integration.rb
 - spec/machines/any_one_spec.rb
 - spec/machines/build_random_spec.rb
 - spec/machines/evaluate_simple_score_spec.rb

data/spec/integration_specs/couch_db_integration.rb

@@ -1,60 +0,0 @@
-require File.join(File.dirname(__FILE__), "./../spec_helper")
-
-# CouchDB MUST BE RUNNING BEFORE YOU RUN THESE
-
-
-describe "CouchDB stuff" do
-  before(:each) do
-    configatron.factory.couchdb.server = "http://127.0.0.1:5984"
-    configatron.factory.couchdb.name = "integration_test_db"
-    break("CouchDB is offline") unless Factory.couch_available?
-    @db_uri = "#{configatron.factory.couchdb.server}/#{configatron.factory.couchdb.name}"
-  end
-  
-  after(:all) do
-    CouchRest.database!(@db_uri).delete!
-  end
-  
-  describe "updating a Batch" do
-    before(:each) do
-      @batch = Batch.[](Answer.new("do a"), Answer.new("do b"))
-    end
-    
-    describe "Batch#bulk_save!" do
-      it "should capture the couch_id values in the Answers themselves" do
-        old_ids = @batch.collect {|a| a.couch_id}
-        @batch.bulk_save!(@db_uri)
-        new_ids = @batch.collect {|a| a.couch_id}
-        old_ids.should_not == new_ids
-      end
-      
-      it "should capture the couch_rev values in the Answers themselves" do
-        @batch.bulk_save!(@db_uri)
-        new_revs = @batch.collect {|a| a.couch_rev}
-        new_revs.each {|r| r.should_not == ""}
-      end
-    end
-    
-    
-    it "should be possible to set the couchdb_id and have that be actually used" do
-      @batch[0].couch_id = "001"
-      @batch[1].couch_id = "002"
-      ids = @batch.bulk_save!(@db_uri).collect {|r| r["id"]}
-      ids.should == ["001", "002"]
-    end
-    
-    it "should be possible to overwrite a document with new info" do
-      @batch.bulk_save!(@db_uri)
-      
-      db = CouchRest.database!(@db_uri)
-      as_saved = db.get(@batch[0].couch_id)["_rev"]
-      @batch[0].scores[:wellness] = 0
-      @batch.bulk_save!(@db_uri)
-      and_now = db.get(@batch[0].couch_id)["_rev"]
-      as_saved[0].should == "1"
-      and_now[0].should == "2"
-    end
-    
-  end
-  
-end