feldtruby 0.3.18 → 0.4.0

data/test/test_optimize_objective.rb

@@ -11,13 +11,13 @@ class SingleObjective1 < FeldtRuby::Optimize::Objective
 end
 
 describe "a single minimizing objective" do
-	before do
-		@o = SingleObjective1.new
-	end
+  before do
+    @o = SingleObjective1.new
+  end
 
-	it "has one goal" do
-		@o.num_goals.must_equal 1
-	end
+  it "has one goal" do
+    @o.num_goals.must_equal 1
+  end
 
   it "can return the name of the goal methods" do
     @o.goal_methods.sort.must_equal [:goal_min_sum]
@@ -43,54 +43,127 @@ describe "a single minimizing objective" do
     @o.is_min_goal_method?("max_anything").must_equal false
   end
 
-	it "correctly calculates the sub-qualitites" do
-		@o.sub_qualities_of([1]).must_equal [1]
-		@o.sub_qualities_of([1, 2]).must_equal [3]
-		@o.sub_qualities_of([1, 2, -45]).must_equal [-42]
-	end
-
-	it "correctly calculates the quality value and sets up its getter methods" do
-		i1 = [1]
-    q1 = @o.quality_of(i1)
-    q1.value.must_equal 1
-    q1.sub_qualities.must_equal [1]
-    q1.candidate.must_equal i1
-    q1.objective.must_equal @o
-    q1.version.must_equal @o.current_version
-
-    i2 = [1, 2]
-		q2 = @o.quality_of(i2)
-    q2.value.must_equal 3
-    q2.sub_qualities.must_equal [3]
-    q2.candidate.must_equal i2
-    q2.objective.must_equal @o
-    q2.version.must_equal @o.current_version
+  it "correctly calculates the sub-qualitites" do
+    @o.sub_qualities_of([1]).must_equal [1]
+    @o.sub_qualities_of([1, 2]).must_equal [3]
+    @o.sub_qualities_of([1, 2, -45]).must_equal [-42]
+  end
 
-    i3 = [1, 2, -45]
-		q3 = @o.quality_of(i3)
-    q3.value.must_equal -42
-    q3.sub_qualities.must_equal [-42]
-    q3.candidate.must_equal i3
-    q3.objective.must_equal @o
-    q3.version.must_equal @o.current_version
-	end
+  describe "a simple case with 3 candidates" do
+    before do
+      @i1 = [1]
+      @q1 = @o.quality_of(@i1)
+
+      @i2 = [1, 2]
+      @q2 = @o.quality_of(@i2)
+
+      @i3 = [1, 2, -45]
+      @q3 = @o.quality_of(@i3)
+    end
+
+    it "correctly calculates the quality value, sets up its getter methods" do
+      i1 = [1]
+      q1 = @o.quality_of(i1)
+
+      q1.value.must_equal 1
+      q1.sub_qualities.must_equal [1]
+      q1.candidate.must_equal i1
+      q1.objective.must_equal @o
+ 
+      i2 = [1, 2]
+      q2 = @o.quality_of(i2)
+
+      q2.value.must_equal 3
+      q2.sub_qualities.must_equal [3]
+      q2.candidate.must_equal i2
+      q2.objective.must_equal @o
+ 
+      i3 = [1, 2, -45]
+      q3 = @o.quality_of(i3)
+
+      q3.value.must_equal -42
+      q3.sub_qualities.must_equal [-42]
+      q3.candidate.must_equal i3
+      q3.objective.must_equal @o
+    end
+
+    it 'can hat compare the candidate solutions' do
+      @o.hat_compare(@i3, @i1).must_equal 1
+      @o.hat_compare(@i1, @i3).must_equal -1
+
+      @o.hat_compare(@i1, @i2).must_equal 1
+      @o.hat_compare(@i2, @i1).must_equal -1
+
+      @o.hat_compare(@i3, @i2).must_equal 1
+      @o.hat_compare(@i2, @i3).must_equal -1
+
+      @o.hat_compare(@i1, @i1).must_equal 0
+      @o.hat_compare(@i2, @i2).must_equal 0
+      @o.hat_compare(@i3, @i3).must_equal 0
+    end
+  
+    it 'can compare the candidate solutions with is_better_than?' do
+      @o.is_better_than?(@i3, @i1).must_equal true
+      @o.is_better_than?(@i3, @i2).must_equal true
+      @o.is_better_than?(@i1, @i2).must_equal true
+    end
+
+    it 'can compare the quality values with smaller than' do
+      (@q1 < @q3).must_equal true
+      (@q2 < @q3).must_equal true
+      (@q2 < @q1).must_equal true
+
+      (@q3 < @q1).must_equal false
+      (@q3 < @q2).must_equal false
+      (@q1 < @q2).must_equal false
+    end
+
+    it 'can compare the quality values with larger than' do
+      (@q3 > @q1).must_equal true
+      (@q3 > @q2).must_equal true
+      (@q1 > @q2).must_equal true
+
+      (@q1 > @q3).must_equal false
+      (@q2 > @q3).must_equal false
+      (@q2 > @q1).must_equal false
+    end
+
+    it 'can rank different subsets of candidates' do
+      b1, b2, b3 = @o.rank_candidates([@i1, @i2, @i3])
+      b1.must_equal @i3
+      b2.must_equal @i1
+      b3.must_equal @i2
+
+      b1, b2 = @o.rank_candidates([@i1, @i2])
+      b1.must_equal @i1
+      b2.must_equal @i2
+
+      b1, b2 = @o.rank_candidates([@i1, @i3])
+      b1.must_equal @i3
+      b2.must_equal @i1
+
+      b1, b2 = @o.rank_candidates([@i2, @i3])
+      b1.must_equal @i3
+      b2.must_equal @i2
+    end
+  end
 end
 
 class TwoMinObjectives1 < FeldtRuby::Optimize::Objective
-	def objective_min_distance_between(candidate)
-		candidate.distance_between_elements.sum
-	end
-	def objective_min_sum(candidate)
-		candidate.sum
-	end
+  def objective_min_distance_between(candidate)
+    candidate.distance_between_elements.sum
+  end
+  def objective_min_sum(candidate)
+    candidate.sum
+  end
 
   public :update_global_mins_and_maxs
 end
 
 describe "two sub-objectives" do
-	before do
-		@o = TwoMinObjectives1.new
-	end
+  before do
+    @o = TwoMinObjectives1.new
+  end
 
   it "has two aspects/sub-objectives" do
     @o.num_goals.must_equal 2
@@ -136,14 +209,13 @@ describe "two sub-objectives" do
     @o.sub_qualities_of([1,2,5]).must_equal [4,8]
   end
 
-  it "correctly calculates the quality value and updates version numbers" do
+  it "correctly calculates the quality value" do
     i1 = [1,2,3]
     q1 = @o.quality_of(i1)
     q1.value.must_equal( 1*((2-1) + (3-2)) + 1*(1+2+3) )
     q1.sub_qualities.must_equal [2.0, 6.0]
     q1.candidate.must_equal i1
     q1.objective.must_equal @o
-    q1.version.must_equal @o.current_version
     @o.best_candidate.must_equal i1
 
     i2 = [2,2,2]
@@ -152,10 +224,6 @@ describe "two sub-objectives" do
     q2.sub_qualities.must_equal [0.0, 6.0]
     q2.candidate.must_equal i2
     q2.objective.must_equal @o
-    q2.version.must_equal @o.current_version
-    # Since 0.0 was smaller than previous minimum for goal 1 the version number 
-    # should be updated since the quality eval above.
-    q2.version.must_equal( q1.version + 1 )
     @o.best_candidate.must_equal i2
 
     i3 = [2,2,10]
@@ -164,11 +232,6 @@ describe "two sub-objectives" do
     q3.sub_qualities.must_equal [8.0, 14.0]
     q3.candidate.must_equal i3
     q3.objective.must_equal @o
-    q3.version.must_equal @o.current_version
-    # Since both goals got new max values the version number should have
-    # been bumped by 2.
-    q3.version.must_equal( q2.version + 2 )
-
     @o.best_candidate.must_equal i2
   end
 
@@ -199,13 +262,10 @@ describe "two sub-objectives" do
     res.length.must_equal 3
 
     q1 = i1._annotations[@o][:quality]
-    q1.version.must_equal @o.current_version
 
     q2 = i2._annotations[@o][:quality]
-    q1.version.must_equal @o.current_version
 
     q3 = i3._annotations[@o][:quality]
-    q3.version.must_equal @o.current_version
   end
 
   it "updates the quality value if old when calling quality_of" do
@@ -214,7 +274,6 @@ describe "two sub-objectives" do
     i2 = [1,1,1]
     q2 = @o.quality_of(i2)
     q1b = @o.quality_of(i1)
-    q1b.version.must_equal q2.version
   end
 
   it "updates the quality value if old when calling rank_candidates" do
@@ -225,75 +284,73 @@ describe "two sub-objectives" do
     res = @o.rank_candidates([i1, i2])
 
     q1 = i1._annotations[@o][:quality]
-    q1.version.must_equal @o.current_version
 
     q2 = i2._annotations[@o][:quality]
-    q1.version.must_equal @o.current_version
   end
 end
 
 describe "the objective itself and its updates" do
-	before do
-		@o = SingleObjective1.new
-		@o2 = TwoMinObjectives1.new
-		@c = [1,2,3]
-	end
-
-	it "repeatedly returns the same quality value for an object unless the objective itself has been changed" do
-		qv = @o.quality_of(@c)
-		qv.must_equal @o.quality_of(@c)
-	end
-
-	it "returns different quality values for different objectives" do
-		qv = @o.quality_of(@c)
-		qv2 = @o2.quality_of(@c)
-		qv.wont_equal qv2
-	end
-
-	it "re-evaluates if the objective has changed since original evaluation" do
-		qv = @o2.quality_of(@c)
-		@o2.quality_of([1,2,3,4,5]) # Higher sum so max updated
-		qvnew = @o2.quality_of(@c)
-		qvnew.wont_equal qv
-	end
+  before do
+    @o = SingleObjective1.new
+    @o2 = TwoMinObjectives1.new
+    @c = [1,2,3]
+  end
+
+  it "repeatedly returns the same quality value for an object unless the objective itself has been changed" do
+    qv = @o.quality_of(@c)
+    qv.must_equal @o.quality_of(@c)
+  end
+
+  it "returns different quality values for different objectives" do
+    qv = @o.quality_of(@c)
+    qv2 = @o2.quality_of(@c)
+    qv.wont_equal qv2
+  end
+
+  it "we get the same quality object even if the objective has changed" do
+    qv = @o2.quality_of(@c)
+    @o2.quality_of([1,2,3,4,5]) # Higher sum so max updated
+    qvnew = @o2.quality_of(@c)
+    qvnew.must_be_same_as qv
+  end
 
   it "can compare two candidates directly" do
     @o.is_better_than?([1], [2]).must_equal true
     @o.is_better_than?([3], [2]).must_equal false
 
-    # If they have the same quality value the result can be arbitrary
-    # but in the current implementation it is not:
-    @o.is_better_than?([3, 1], [2, 2]).must_equal true
-  end
-
-	describe "version numbers" do
-		it "has version number 0 when no evaluation has taken place" do
-			@o.current_version.must_equal 0
-			@o2.current_version.must_equal 0
-		end
-
-		it "increases the version number also for single goal objectives" do
-			@o.quality_of([1])
-			@o.current_version.must_equal 2 # min and max changed
-		end
-
-		it "increases the version number each time a quality aspect of a candidate is more extreme than previously seen (when multi-objective)" do
-			@o2.quality_of([1])
-			@o2.current_version.must_equal 4 # Both min and max changed for two objectives => 2*2
-			@o2.quality_of([2])
-			@o2.current_version.must_equal 5 # New max values for sum objective => +1
-			@o2.quality_of([1,2])
-			@o2.current_version.must_equal 7 # New max values for both objectives => +2
-			@o2.quality_of([0])
-			@o2.current_version.must_equal 8 # New min value for sum objective => +1
-			@o2.quality_of([-1])
-			@o2.current_version.must_equal 9 # New min value for sum objective => +1
-			@o2.quality_of([-2])
-			@o2.current_version.must_equal 10 # New min value for sum objective => +1
-			@o2.quality_of([1,2,3])
-			@o2.current_version.must_equal 12 # New max for both objectives => +1
-		end
-	end
+    @o.is_better_than?([3, 2], [2, 2]).must_equal false
+    @o.is_better_than?([3, 1], [2, 2]).must_equal false
+    @o.is_better_than?([3, 0.5], [2, 2]).must_equal true
+  end
+
+  describe "version numbers" do
+    it "has version number 0 when no evaluation has taken place" do
+      @o.current_version.must_equal 0
+      @o2.current_version.must_equal 0
+    end
+
+    it "increases the version number also for single goal objectives" do
+      @o.quality_of([1])
+      @o.current_version.must_equal 2 # min and max changed
+    end
+
+    it "increases the version number each time a quality aspect of a candidate is more extreme than previously seen (when multi-objective)" do
+      @o2.quality_of([1])
+      @o2.current_version.must_equal 4 # Both min and max changed for two objectives => 2*2
+      @o2.quality_of([2])
+      @o2.current_version.must_equal 5 # New max values for sum objective => +1
+      @o2.quality_of([1,2])
+      @o2.current_version.must_equal 7 # New max values for both objectives => +2
+      @o2.quality_of([0])
+      @o2.current_version.must_equal 8 # New min value for sum objective => +1
+      @o2.quality_of([-1])
+      @o2.current_version.must_equal 9 # New min value for sum objective => +1
+      @o2.quality_of([-2])
+      @o2.current_version.must_equal 10 # New min value for sum objective => +1
+      @o2.quality_of([1,2,3])
+      @o2.current_version.must_equal 12 # New max for both objectives => +1
+    end
+  end
 end
 
 class OneMinOneMaxObjective1 < FeldtRuby::Optimize::Objective
@@ -350,7 +407,6 @@ describe "calculating quality with weights" do
     q1.sub_qualities.must_equal [2.0, 6.0]
     q1.candidate.must_equal i1
     q1.objective.must_equal @o
-    q1.version.must_equal @o.current_version    
 
     @o.weights = {:objective_min_distance_between => 5, :objective_max_sum => 30}
     q2 = @o.quality_of(i1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feldtruby
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Feldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rinruby
@@ -147,6 +147,9 @@ files:
 - spikes/simple_de_run.rb
 - spikes/zlib_for_short_strings.rb
 - test/helper.rb
+- test/long_running/multi_objective_problems.rb
+- test/long_running/single_objective_problems.rb
+- test/long_running/test_single_objective_optimization.rb
 - test/skip_test_array_archive.rb
 - test/test_array.rb
 - test/test_array_basic_stats.rb
@@ -202,6 +205,9 @@ specification_version: 4
 summary: Robert Feldt's Common Ruby Code lib
 test_files:
 - test/helper.rb
+- test/long_running/multi_objective_problems.rb
+- test/long_running/single_objective_problems.rb
+- test/long_running/test_single_objective_optimization.rb
 - test/skip_test_array_archive.rb
 - test/test_array.rb
 - test/test_array_basic_stats.rb