metaheuristic_algorithms 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93fd3942e1d7831286b0d122330e0ffc9af07f1
-  data.tar.gz: 056c20d3c4ab43513d6e7c480341c78e2546fe61
+  metadata.gz: 71ab576a4800485d9359feeeee21831e1e8cad8b
+  data.tar.gz: 8cb7ecfb7825b3a4ab998360605bc205a88756cb
 SHA512:
-  metadata.gz: c8d2d130a8f78ac347370344a653c0b81775dfaa489c21d6d2a45092adb723167e3b5be945f3556c88122e05d53ef94d732dec5ec53b1214589ee7324cdddcb6
-  data.tar.gz: 07cf3a588365188af867a514f8f58af3130c88b3316c4e1cad9bba8f73edb7356a344f46f50ea1c07d081b7360b4bcec79c956782070671850d1f6eb7842a022
+  metadata.gz: e3a418400c47d95fe4d9f2fceb1a7bd0ad8854d8ce00de8a34c04d39045748c52adc5a1837b1143607388d6224ebf924d57868b0db2d15f3c65cdd9c0c5f37b5
+  data.tar.gz: 11b6e91e6215f1f4fcea3498aa5db60475e46fe1a8e9bde5d11e62c6ba013d9caa5c975fad4a1f871b9414712fe747e1a6b75b28daa383209a44f0bf9a8223c5

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## metaheuristic_algorithms 0.2.4 (November 9, 2015) ##
+
+* Fixed a typo in method name minimum_decision_variable_values in FunctionWrapper's. 
+
+* Converts the values from methods in FunctionWrapper to Float, so that the algorithms codes work even when FunctionWrapper methods return values in BigDecimal. 
+
+Note: This can be considered to be incompatible API change. However, at this point, it is not yet considered to be a stable public API. Hence, the MAJOR version is kept to be 0. (See, [Semantic Versioning](http://semver.org/))

data/README.md

@@ -59,7 +59,7 @@ Step 1. Create a Function Wrapper for your objective function by extending Metah
         [5, 5]
       end
 
-      def miminum_decision_variable_values
+      def minimum_decision_variable_values
         [-5, -5]
       end
 

data/lib/metaheuristic_algorithms/base_algorithm_module.rb

@@ -3,10 +3,10 @@ module MetaheuristicAlgorithms
   module BaseAlgorithmModule
 
     def get_decision_variable_value_by_randomization(decision_variable_index)
-      # @function_wrapper.miminum_decision_variable_values[decision_variable_index] 
-      # + (@function_wrapper.maximum_decision_variable_values[decision_variable_index] - @function_wrapper.miminum_decision_variable_values[decision_variable_index]) * bigdecimal_rand
-      @function_wrapper.miminum_decision_variable_values[decision_variable_index] 
-      + (@function_wrapper.maximum_decision_variable_values[decision_variable_index] - @function_wrapper.miminum_decision_variable_values[decision_variable_index]) * rand
+      # @function_wrapper.minimum_decision_variable_values[decision_variable_index] 
+      # + (@function_wrapper.maximum_decision_variable_values[decision_variable_index] - @function_wrapper.minimum_decision_variable_values[decision_variable_index]) * bigdecimal_rand
+      @function_wrapper.minimum_decision_variable_values[decision_variable_index].to_f 
+      + (@function_wrapper.maximum_decision_variable_values[decision_variable_index].to_f - @function_wrapper.minimum_decision_variable_values[decision_variable_index].to_f) * rand
     end
 
     # Based on the code by antonakos on http://stackoverflow.com/questions/5825680/code-to-generate-gaussian-normally-distributed-random-numbers-in-ruby

data/lib/metaheuristic_algorithms/firefly_algorithm.rb

@@ -20,7 +20,7 @@ module MetaheuristicAlgorithms
       end
 
       def update_light_intensity
-        @light_intensity = @function_wrapper.objective_function_value(@location_coordinates)
+        @light_intensity = @function_wrapper.objective_function_value(@location_coordinates).to_f
       end
 
       def deep_clone
@@ -126,10 +126,10 @@ module MetaheuristicAlgorithms
       end
 
       def constrain_within_range(location_coordinate, variable_index)
-        if location_coordinate < @function_wrapper.miminum_decision_variable_values[variable_index]
-          @function_wrapper.miminum_decision_variable_values[variable_index]
-        elsif location_coordinate > @function_wrapper.maximum_decision_variable_values[variable_index]
-          @function_wrapper.maximum_decision_variable_values[variable_index]
+        if location_coordinate < (minimum_decision_variable_values = @function_wrapper.minimum_decision_variable_values[variable_index].to_f)
+          minimum_decision_variable_values
+        elsif location_coordinate > (maximum_decision_variable_values = @function_wrapper.maximum_decision_variable_values[variable_index].to_f)
+          maximum_decision_variable_values
         else
           location_coordinate
         end

data/lib/metaheuristic_algorithms/function_wrappers/abstract_wrapper.rb

@@ -10,9 +10,9 @@ module MetaheuristicAlgorithms
       end
 
       # Return value: Array
-      def miminum_decision_variable_values
+      def minimum_decision_variable_values
         raise "#{__method__} method must be implemented in the subclass"
-      end    
+      end
 
       # Input value: Array
       def objective_function_value(decision_variable_values)

data/lib/metaheuristic_algorithms/function_wrappers/easom_function_wrapper.rb

@@ -12,7 +12,7 @@ module MetaheuristicAlgorithms
         [10]
       end
 
-      def miminum_decision_variable_values
+      def minimum_decision_variable_values
         # [BigDecimal('-10')]
         [-10]
       end

data/lib/metaheuristic_algorithms/function_wrappers/michaelwicz_function_wrapper.rb

@@ -12,7 +12,7 @@ module MetaheuristicAlgorithms
         [4, 4]
       end
 
-      def miminum_decision_variable_values
+      def minimum_decision_variable_values
         # [BigDecimal('0'), BigDecimal('0')]
         [0, 0]
       end

data/lib/metaheuristic_algorithms/function_wrappers/nonsmooth_multipeak_function_wrapper.rb

@@ -11,7 +11,7 @@ module MetaheuristicAlgorithms
         [5, 5]
       end
 
-      def miminum_decision_variable_values
+      def minimum_decision_variable_values
         # [BigDecimal('-5'), BigDecimal('-5')]
         [-5, -5]
       end

data/lib/metaheuristic_algorithms/function_wrappers/rosenbrook_function_wrapper.rb

@@ -9,7 +9,7 @@ module MetaheuristicAlgorithms
         [5, 5]
       end
 
-      def miminum_decision_variable_values
+      def minimum_decision_variable_values
         # [BigDecimal('-5'), BigDecimal('-5')]
         [-5, -5]
       end

data/lib/metaheuristic_algorithms/genetic_algorithm.rb

@@ -82,7 +82,7 @@ module MetaheuristicAlgorithms
             get_decision_variable_value_by_randomization(variable_index)
           end
           @population << decision_variable_values
-          @population_fitness << @function_wrapper.objective_function_value(decision_variable_values)
+          @population_fitness << @function_wrapper.objective_function_value(decision_variable_values).to_f
         end
 
       end
@@ -126,8 +126,8 @@ module MetaheuristicAlgorithms
 
         end 
 
-        new_crossover_pair_1_fitness = @function_wrapper.objective_function_value(crossover_pair_1_decimal_values)
-        new_crossover_pair_2_fitness = @function_wrapper.objective_function_value(crossover_pair_2_decimal_values)
+        new_crossover_pair_1_fitness = @function_wrapper.objective_function_value(crossover_pair_1_decimal_values).to_f
+        new_crossover_pair_2_fitness = @function_wrapper.objective_function_value(crossover_pair_2_decimal_values).to_f
 
         if new_crossover_pair_1_fitness > @population_fitness[crossover_pair_1_index] && 
            new_crossover_pair_2_fitness > @population_fitness[crossover_pair_2_index]
@@ -176,7 +176,7 @@ module MetaheuristicAlgorithms
 
         end
 
-        new_individual_fitness = @function_wrapper.objective_function_value(decimal_values)
+        new_individual_fitness = @function_wrapper.objective_function_value(decimal_values).to_f
 
         if new_individual_fitness > @population_fitness[individual_index]          
 
@@ -193,7 +193,7 @@ module MetaheuristicAlgorithms
       end
 
       def in_the_range?(decimal_value, variable_index)
-        decimal_value >= @function_wrapper.miminum_decision_variable_values[variable_index] && decimal_value <= @function_wrapper.maximum_decision_variable_values[variable_index]
+        decimal_value >= @function_wrapper.minimum_decision_variable_values[variable_index].to_f && decimal_value <= @function_wrapper.maximum_decision_variable_values[variable_index].to_f
       end 
 
       def deep_clone_population

data/lib/metaheuristic_algorithms/harmony_search.rb

@@ -50,7 +50,7 @@ module MetaheuristicAlgorithms
             
             # if bigdecimal_rand < pitch_adjusting_rate
             if rand < pitch_adjusting_rate
-              pitch_adjusting = (@function_wrapper.maximum_decision_variable_values[variable_index] - @function_wrapper.miminum_decision_variable_values[variable_index]) / pitch_adjusting_range
+              pitch_adjusting = (@function_wrapper.maximum_decision_variable_values[variable_index].to_f - @function_wrapper.minimum_decision_variable_values[variable_index].to_f) / pitch_adjusting_range
               # decision_variable_value = decision_variable_value + pitch_adjusting * (bigdecimal_rand - BigDecimal('0.5'))
               decision_variable_value = decision_variable_value + pitch_adjusting * (rand -0.5)
             end
@@ -60,7 +60,7 @@ module MetaheuristicAlgorithms
 
         end
 
-        best_function_value = @function_wrapper.objective_function_value(decision_variable_values) 
+        best_function_value = @function_wrapper.objective_function_value(decision_variable_values).to_f 
 
         # TODO: Evaluate this logic. It appears that best_function_value_harmony_memory only needs to store the max best_function_value and the corresponding harmony_memory_random_index of harmony_memory. 
         #       The simpler implementation for MatLab doesn't seem to be a good implementation in Ruby here. 
@@ -96,7 +96,7 @@ module MetaheuristicAlgorithms
           end
 
           @harmony_memory << decision_variable_values
-          @best_function_value_harmony_memory << @function_wrapper.objective_function_value(decision_variable_values)
+          @best_function_value_harmony_memory << @function_wrapper.objective_function_value(decision_variable_values).to_f
 
         end
 

data/lib/metaheuristic_algorithms/simplified_particle_swarm_optimization.rb

@@ -33,7 +33,7 @@ module MetaheuristicAlgorithms
       number_of_iterations.times do |iteration|
 
         function_values = @particle_locations.map do |particle_location|
-          @function_wrapper.objective_function_value(particle_location)
+          @function_wrapper.objective_function_value(particle_location).to_f
         end 
 
         best_function_value = function_values.send(@objective_method_name)
@@ -69,10 +69,10 @@ module MetaheuristicAlgorithms
           (0...@number_of_variables).map do |variable_index|
 
             # The value out-of-range in order to enter while loop
-            # new_particle_location_coordinate = @function_wrapper.miminum_decision_variable_values[variable_index] - BigDecimal('1')
-            new_particle_location_coordinate = @function_wrapper.miminum_decision_variable_values[variable_index] - 1
+            # new_particle_location_coordinate = @function_wrapper.minimum_decision_variable_values[variable_index] - BigDecimal('1')
+            new_particle_location_coordinate = @function_wrapper.minimum_decision_variable_values[variable_index].to_f - 1
 
-            while new_particle_location_coordinate < @function_wrapper.miminum_decision_variable_values[variable_index] || new_particle_location_coordinate > @function_wrapper.maximum_decision_variable_values[variable_index]
+            while new_particle_location_coordinate < @function_wrapper.minimum_decision_variable_values[variable_index].to_f || new_particle_location_coordinate > @function_wrapper.maximum_decision_variable_values[variable_index].to_f
               # new_particle_location_coordinate = (BigDecimal('1') - social_coefficient) * particle_location[variable_index] + social_coefficient * global_best_position[variable_index] + random_variable_coefficient * (bigdecimal_rand - BigDecimal('0.5'))
               new_particle_location_coordinate = (1 - social_coefficient) * particle_location[variable_index] + social_coefficient * global_best_position[variable_index] + random_variable_coefficient * (rand - 0.5)
             end

data/lib/metaheuristic_algorithms/simulated_annealing.rb

@@ -51,9 +51,9 @@ module MetaheuristicAlgorithms
       number_of_acceptances = 0
       total_evaluations = 0
 
-      initial_estimates = @function_wrapper.initial_decision_variable_value_estimates
+      initial_estimates = @function_wrapper.initial_decision_variable_value_estimates.map(&:to_f)
 
-      best_evaluation = @function_wrapper.objective_function_value(initial_estimates)
+      best_evaluation = @function_wrapper.objective_function_value(initial_estimates).to_f
 
       best_solution = initial_estimates      
 
@@ -72,7 +72,7 @@ module MetaheuristicAlgorithms
         end
 
         new_estimates = estimate_solution(initial_estimates, standard_diviation_for_estimation)
-        new_evaluation = @function_wrapper.objective_function_value(new_estimates)
+        new_evaluation = @function_wrapper.objective_function_value(new_estimates).to_f
 
         evaluation_delta = ratio_of_energy_delta_over_evaluation_delta * (new_evaluation - best_evaluation)
 
@@ -107,10 +107,10 @@ module MetaheuristicAlgorithms
         (0...@number_of_variables).map do |variable_index|
 
           # The value out-of-range in order to enter while loop
-          # new_estimate = @function_wrapper.miminum_decision_variable_values[variable_index] - BigDecimal('1')
-          new_estimate = @function_wrapper.miminum_decision_variable_values[variable_index] - 1
+          # new_estimate = @function_wrapper.minimum_decision_variable_values[variable_index] - BigDecimal('1')
+          new_estimate = @function_wrapper.minimum_decision_variable_values[variable_index].to_f - 1
 
-          while new_estimate < @function_wrapper.miminum_decision_variable_values[variable_index] || new_estimate > @function_wrapper.maximum_decision_variable_values[variable_index]
+          while new_estimate < @function_wrapper.minimum_decision_variable_values[variable_index].to_f || new_estimate > @function_wrapper.maximum_decision_variable_values[variable_index].to_f
 
             # MatLab example code uses newGuess = initialGuess + rand(1,2) * randn;
             # But in our case, the value range is different. 

data/lib/metaheuristic_algorithms/version.rb

@@ -1,3 +1,3 @@
 module MetaheuristicAlgorithms
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/metaheuristic_algorithms/virtual_bee_algorithm.rb

@@ -16,7 +16,7 @@ module MetaheuristicAlgorithms
       number_of_virtual_bees = number_of_virtual_bees.to_i unless number_of_virtual_bees.kind_of?(Integer)
       number_of_foraging_explorations = number_of_foraging_explorations.to_i unless number_of_foraging_explorations.kind_of?(Integer)
 
-      solution_estimates = @function_wrapper.initial_decision_variable_value_estimates
+      solution_estimates = @function_wrapper.initial_decision_variable_value_estimates.map(&:to_f)
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaheuristic_algorithms
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tadatoshi Takahashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt