feldtruby 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5558f3b77d1f52c3bb73f77ab79755b9d8e8f20
-  data.tar.gz: 1d6e7c4cea54211d5487b41b71710ea30827ceb8
+  metadata.gz: bc84378ec9d25a827e522fd84024d0dec4c3658e
+  data.tar.gz: 34f48433331c60b650fb2ea7022b4a4f22cb1d64
 SHA512:
-  metadata.gz: d7f2ff3e1edcacd55278c11d228eced97c128ce1628f55f5edb30aee3fdfb6c2a7c676ac62860a62e5cfd33bd588eba795d50f489becbaae592bb63b36f8b07b
-  data.tar.gz: 2397c74ee5a6eea1c250b9481ace101ed6ecc58990649b2fa6d10aaee73136a5b5e758ccd7689c807f1283f49493c7e3ac1987dea11b37fe4fe262f6e8474020
+  metadata.gz: a44e07d27e5a69fac7b5f044091be9f0f0700174a657625bbeef428156a0046939ff2bb24fb75e36bdda67fb93c603e0014bd0c473f3b37cee03ec7b249f5dc9
+  data.tar.gz: 0a51a26c2502ce997ee1a00fd9362096efeb8e5d0beb7e9f2f7518e00dda2fbcc670e6284d4eac3c1e62ee7be29c01cc2e72cc68e82214e61421794f48f34ed3

data/lib/feldtruby/optimize/differential_evolution.rb

@@ -188,11 +188,27 @@ class DEOptimizer_Best_1_Bin < DEOptimizerBase
 	include DE_MutationStrategy_Best_1
 end
 
+# The DE/best/1/* mutation strategy.
+module DE_MutationStrategy_Best_2
+	# We need four parents for two donor vectors. And then the target, so 1+4 in total.
+	def num_parents_to_sample; 5; end
+
+	def mutate(targetIndex, donorParentsIndices)
+		p1, p2, p3, p4 = get_candidates_with_indices(donorParentsIndices)
+		f = scale_factor(targetIndex)
+		candidate_from_array(best) + (f * (p1 - p2)) + (f * (p3 - p4))
+	end
+end
+
+class DEOptimizer_Best_2_Bin < DEOptimizer_Best_1_Bin
+	include DE_MutationStrategy_Best_2
+end
+
 # DE/rand/1/bin is the default DE optimizer since it does not converge too
 # quickly but is generally good. For many problems the DEOptimizer_Best_1_Bin
 # gives better results faster though.
 DEOptimizer = DEOptimizer_Rand_1_Bin
-#DEOptimizer = DEOptimizer_Best_1_Bin
+#DEOptimizer = DEOptimizer_Best_2_Bin
 
 # Optimize the _numVariables_ between the _min_ and _max_ values given _costFunction_.
 # Default is to minimize.

data/lib/feldtruby/optimize/objective.rb

@@ -214,7 +214,7 @@ class Objective
   private
 
   def update_quality_value_of(candidate, subQualities, weights)
-    qv = QualityValue.new subQualities, candidate, self
+    qv = @aggregator.make_quality_value subQualities, candidate, self
     update_quality_value_in_object candidate, qv
   end
 
@@ -328,6 +328,10 @@ end
 class Objective::QualityAggregator
   attr_reader :objective
 
+  def make_quality_value(subQvs, candidate, objective)
+    QualityValue.new subQvs, candidate, objective
+  end
+
   # Set the objective to use.
   def objective=(objective)
     # Calculate the signs to be used in inverting the max methods later.
@@ -366,6 +370,10 @@ end
 # their peers; the aggregate fitness value is fully determined by the individual
 # and the global min and max values for each objective.
 class Objective::MeanWeigthedGlobalRatios < Objective::WeightedSumAggregator
+  def make_quality_value(subQvs, candidate, objective)
+    PercentageQualityValue.new subQvs, candidate, objective
+  end
+
   def ratio(index, value, min, max)
     return 1000.0 if value == nil # We heavily penalize if one sub-quality could not be calculated. Max is otherwise 1.0.
     if objective.is_min_goal?(index)
@@ -458,14 +466,26 @@ class QualityValue
     -(@sub_qualities[index])
   end
 
+  def value_to_s
+    "#{value.to_significant_digits(4)}"
+  end
+
   def to_s
     subqs = sub_qualities.map {|f| f ? f.to_significant_digits(3) : nil}
     # Note! We ask for the value first which guarantees that we then have a version number.
-    qstr = "#{value.to_significant_digits(4)}"
+    qstr = value_to_s
     "#{qstr} (SubQs = #{subqs.inspect}, ver. #{@version})"
   end
 end
 
+class PercentageQualityValue < QualityValue
+  def value_to_s
+    return "N/A" if @sub_qualities.any? {|sq| sq.nil?}
+    "%s%%" % (value * 100.0).to_significant_digits(6).to_s
+  end
+end
+
+
 # Short hand for when the objective function is given as a block that should be minimized.
 class ObjectiveMinimizeBlock < Objective
   def initialize(&objFunc)

data/lib/feldtruby/optimize/optimizer.rb

@@ -209,7 +209,7 @@ end
 DefaultOptimizationOptions = {
 	:terminationCriterionClass => FeldtRuby::Optimize::MaxStepsTerminationCriterion,
 	:verbose => true,
-	:populationSize => 200,
+	:populationSize => 100,
 	:samplerClass => FeldtRuby::Optimize::RadiusLimitedPopulationSampler,
 	:samplerRadius => 8 # Max distance between individuals selected in same tournament.
 }

data/lib/feldtruby/version.rb

@@ -1,3 +1,3 @@
 module FeldtRuby
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/test/test_optimize_differential_evolution.rb

@@ -63,4 +63,26 @@ describe "DE/best/1/bin" do
 		de2.best.sum.must_be :<=, 0.40
 		de2.num_optimization_steps.must_equal 1234
 	end
+end
+
+describe "DE/best/2/bin" do
+	it "works for rms of small vector" do
+		s2 = SearchSpace.new_symmetric(2, 1)
+		o1 = MinimizeRMS.new
+		de1 = DEOptimizer_Best_2_Bin.new(o1, s2, {:verbose => false, :maxNumSteps => 1000})
+		de1.optimize()
+		# Very unlikely we get a number over 0.30 (2 elements) after 1000 steps...
+		de1.best.sum.must_be :<=, 0.30
+		de1.num_optimization_steps.must_equal 1000
+	end
+
+	it "works for rms and sum of small vector and with more steps" do
+		s4 = SearchSpace.new_symmetric(4, 1)
+		o2 = MinimizeRMSAndSum.new
+		de2 = DEOptimizer_Best_2_Bin.new(o2, s4, {:verbose => false, :maxNumSteps => 1234})
+		de2.optimize()
+		# Very unlikely we get a number over 0.40 (4 elements)...
+		de2.best.sum.must_be :<=, 0.40
+		de2.num_optimization_steps.must_equal 1234
+	end
 end

data/test/test_optimize_objective.rb

@@ -492,11 +492,11 @@ describe "Can handle objectives that return nil" do
     q1 = o.quality_of([1])
     q1.sub_qualities.must_equal [1]
     q1.value.must_equal 0.0 # Perfect score
-    q1.to_s.must_equal "0.0 (SubQs = [1.0], ver. 2)"
+    q1.to_s.must_equal "0.0% (SubQs = [1.0], ver. 2)"
 
     q2 = o.quality_of([])
     q2.sub_qualities.must_equal [nil]
     q2.value.must_equal 1000.0 # Max penalty
-    q2.to_s.must_equal "1000.0 (SubQs = [nil], ver. 2)"
+    q2.to_s.must_equal "N/A (SubQs = [nil], ver. 2)"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feldtruby
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Robert Feldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rinruby