feldtruby 0.3.18 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c76bb7e979470ff22539fc9543ddf008dfe34a0
-  data.tar.gz: b9215aa49df906e914bd69611fefd0eddd46ae03
+  metadata.gz: d26d52d618b786234ccdce29a35965776806697c
+  data.tar.gz: 7df492becb40e830a2dfc72099a0f00b14321803
 SHA512:
-  metadata.gz: ff95c9ebbca79724d25133f970d3a638d118f624eb72b6601605f697a53c1132d7b7923c670319b547d70006b6dd8f81416aba5498ec4dc75d85e6fe8c16ce63
-  data.tar.gz: 78b95306f0af7db720989945452304e4bd6977209cb3eb84d4d7faf43807c72b28776bc140be95ea1c5bcb9d9857ecffb0bb5fbf3b04f68fb162715479812496
+  metadata.gz: 3780f3a073bfd81db3c25afcd28b464bf04df82445e37ac00a6117eec023b09fa424001cc9aff66a0fc9b0ba3939aeacadf558c118798e7db3f5d18c985a6bc1
+  data.tar.gz: 704149c43950a6893da57311593edbd77dc392a27ef83979cf2b88d62d8a495c1878e9748f36f7cb206f74fbdcd12a567c0621003d13c409e869ae1dd54f7de4

data/Rakefile

@@ -21,8 +21,18 @@ task :test_sep do
   end
 end
 
-desc "Run all tests"
+desc "Run all normal tests"
 task :test do
+  run_tests Dir["test/test*.rb"]
+end
+
+desc "Run long-running tests"
+task :testlong do
+  run_tests Dir["test/long_running/test*.rb"]
+end
+
+desc "Run all tests"
+task :testall do
   run_tests Dir["test/**/test*.rb"]
 end
 

data/lib/feldtruby/array/basic_stats.rb

@@ -129,6 +129,11 @@ module BasicStatistics
 		sum
 	end
 
+	# Root mean square from another vector
+	def rms_from(other)
+		Math.sqrt(sum_squared_error(other))
+	end
+
 	# Return summary stats for an array of numbers.
 	def summary_stats
 		return "" if length == 0

data/lib/feldtruby/logger.rb

@@ -8,8 +8,8 @@ module FeldtRuby
 # Simplest possible logger only prints to STDOUT.
 class Logger
   DefaultParams = {
-    :verbose => true,
-    :print_frequency => 0.3  # Minimum seconds between consecutive messages printed for the same event type
+    :verbose => false,
+    :printFrequency => 0.0  # Minimum seconds between consecutive messages printed for the same event type
   }
 
   UnixEpoch = Time.at(0)
@@ -24,7 +24,7 @@ class Logger
 
     self.verbose = @params[:verbose]
 
-    self.print_frequency = @params[:print_frequency]
+    self.print_frequency = @params[:printFrequency]
 
     @ios = []
 
@@ -62,7 +62,7 @@ class Logger
 
   # Set the minimum time between printing successive messages of the same type.
   def print_frequency=(seconds = 1.0)
-    @print_frequency = @params[:print_frequency] = seconds
+    @print_frequency = @params[:printFrequency] = seconds
   end
 
   # Add one more _io_ stream to which events are logged.
@@ -113,7 +113,11 @@ class Logger
   end
 
   # Log a data event.
-  def log_data eventType, data, message = nil
+  def log_data eventType, data, message = nil, tagWithData = false
+    if tagWithData
+      dstr = data.keys.map {|k| "#{k}: #{data[k]}"}.join("\n  ")
+      message += "\n  #{dstr}"
+    end
     log_event eventType, {"d" => data}, message
   end
 
@@ -157,7 +161,7 @@ class Logger
 
     elapsed_str = Time.human_readable_timestr elapsed_time(time)
 
-    s = time.strftime("\n%H:%M.%S%3N (#{elapsed_str}), ") + message
+    s = time.strftime("\n%H:%M.%S (#{elapsed_str}), ") + message
 
     @ios.each {|io| io.puts s}
 
@@ -171,7 +175,15 @@ end
 module Logging
   attr_accessor :logger
 
-  def setup_logger_and_distribute_to_instance_variables(logger = nil)
+  def setup_logger_and_distribute_to_instance_variables(loggerOrOptions = nil)
+
+    if Hash === loggerOrOptions
+      options = loggerOrOptions
+      logger = nil
+    else
+      options = {}
+      logger = loggerOrOptions
+    end
 
     # Precedence for loggers if several has been setup:
     #  1. One specified as parameter to this method
@@ -179,7 +191,7 @@ module Logging
     #  3. First one found on an instance var
     #  4. Create a new standard one
     self.logger = logger || self.logger || __find_logger_set_on_instance_vars() ||
-      new_default_logger()
+      new_default_logger(options)
 
     # Now distribute the preferred logger to all instance vars, recursively.
     self.instance_variables.each do |ivar_name|
@@ -195,8 +207,8 @@ module Logging
   end
 
   # Override to use another logger as default if no logger is found.
-  def new_default_logger
-    FeldtRuby::Logger.new
+  def new_default_logger(options = {})
+    FeldtRuby::Logger.new(STDOUT, options)
   end
 
   # Find a logger if one has been set on any of my instance vars or their

data/lib/feldtruby/optimize/differential_evolution.rb

@@ -60,20 +60,20 @@ class DEOptimizerBase < EvolutionaryOptimizer
 
 		best, worst = objective.rank_candidates([target, trial])
 
-		# Supplant the target vector with the trial vector if better
+		# Supplant the target vector with the trial vector if trial vector is better.
 		if best != target
 			logger.log_data :better_candidate_found, {
-				:better => best, 
-				:quality => @objective.quality_of(best)}, "Trial vector was better"
-			trial_better = true
+				"Trial" => trial, 
+				"Trial Quality" => @objective.quality_of(trial),
+				"Target" => target, 
+				"Target Quality" => @objective.quality_of(target)
+				}, "DE (step #{@num_optimization_steps}): Trial vector was better than target vector"
 			update_candidate_in_population(target_index, trial)
+			feedback_on_trial_vs_target(trial, target, true)
 		else
-			trial_better = false
+			feedback_on_trial_vs_target(trial, target, false)
 		end
 
-		# Give feedback to strategy since some strategies use this to self-adapt
-		feedback_on_trial_vs_target(trial, target, trial_better)
-
 		[best]
 	end