feldtruby 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a76753a45218658033069292166e1f2a6632958
-  data.tar.gz: f7885cd0eece07094aca1d27da9da38e9ddbf51f
+  metadata.gz: ad952a39bbe9677ec2b77ad2c6e31fc5f36bf0a1
+  data.tar.gz: b56013ccf611756359d1d5b693fd6fb2bbbad34b
 SHA512:
-  metadata.gz: 96eef547a76262a695fc9480abf6b672b5536881953754ee5b8461de00fa08df05718c5b3e3e40894d4c4d65f527802cec3f11e695a4ca3e9d5b55ba24b2d9b8
-  data.tar.gz: db581f0014c8252980e263db25eacc6804723022d8b08130678a2cdf0f1711baf1118fbb26e710101e9225b2ff6ea00fb526be987017e2539d6f403acee8d95a
+  metadata.gz: cb3b0858ec241137b537d803cd451a53266b0e19d41fe230b7e2372992cd1841b19e1b1f4b2eb1467f57852f3eeaca9fb20d19d7b5d6e8f0c9af9631dfd30309
+  data.tar.gz: 65bc21364e93321ed1f7f87d8d93225a7a390ae96efd0bd7912add8170500588e5deb9ab4d2af1c6df529bf150112823b85221f001a3eb6635af517e539246e0

data/lib/feldtruby/optimize/objective.rb

@@ -261,6 +261,8 @@ class Objective
     min = @global_min_values_per_goal[index]
     max = @global_max_values_per_goal[index]
 
+    return unless qValue
+    
     if qValue < min
 
       @global_min_values_per_goal[index] = qValue

data/lib/feldtruby/version.rb

@@ -1,3 +1,3 @@
 module FeldtRuby
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/test/long_running/test_single_objective_optimization.rb

@@ -49,11 +49,11 @@ describe "Sphere function" do
     time.must_be :<, 7.5
   end
 
-  it 'can optimize the Sphere function in 30 dimensions' do
-    best, obj, time = best_from_de_on_objective MinSphere.new, 30, 220_000
-    time.must_be :<, 28.0
-    # We don't test closeness since it might take very long for 30D to get close on all dimensions.
-  end
+#  it 'can optimize the Sphere function in 30 dimensions' do
+#    best, obj, time = best_from_de_on_objective MinSphere.new, 30, 220_000
+#    time.must_be :<, 28.0
+#    # We don't test closeness since it might take very long for 30D to get close on all dimensions.
+#  end
 end
 
 describe "Levi13 function" do
@@ -76,9 +76,8 @@ describe "Easom function" do
   it 'can optimize the Easom function' do
     objective = MinEasom.new
     ss = objective.search_space
-    # Why can't we do this in 25_000 evals anymore? We did it before. Repeatedly. Very strange.
     de = DEOptimizer.new(objective, ss, {:verbose => false, 
-      :maxNumSteps => 40_000, :printFrequency => 0.0, 
+      :maxNumSteps => 30_000, :printFrequency => 0.0, 
       :samplerRadius => 5})
     best = de.optimize().to_a
 

data/test/test_optimize_objective.rb

@@ -477,4 +477,24 @@ describe "Using MWGR for range-independent aggregate fitness calc" do
     @o.rank_candidates([i3,i1]).must_equal [i1,i3]
     @o.rank_candidates([i2,i3]).must_equal [i2,i3]
   end
+end
+
+class ObjectiveReturningNil < FeldtRuby::Optimize::Objective
+  def objective_min_sum(ary)
+    return nil if ary.length < 1
+    ary.sum
+  end
+end
+
+describe "Can handle objectives that return nil" do
+  it 'works' do
+    o = ObjectiveReturningNil.new
+    q1 = o.quality_of([1])
+    q1.sub_qualities.must_equal [1]
+    q1.value.must_equal 0.0 # Perfect score
+
+    q2 = o.quality_of([])
+    q2.sub_qualities.must_equal [nil]
+    q2.value.must_equal 1000.0 # Max penalty
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feldtruby
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Robert Feldt