pso 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c638f93201545f2cc9b6df97e74bcd32a9e5c33abd478d79525a01a73a125fb
-  data.tar.gz: 724062befc0037ce7548a0a379c8c8da1e10b78eb93924c6f8095660f45f36c9
+  metadata.gz: 494a9e31cc52065c8b22eea253e6721fe52ac0a991a655b952d7cb23ef25dbdd
+  data.tar.gz: 8ffebd21cb02c8238bb4b29910134092c86583def6ed7d0926dcd2c3dd9c7c03
 SHA512:
-  metadata.gz: 80bd1ad7e0875e9fbd94cbea03e7327ab9b39995a9c1433d68d0e5dc07bd22ec2113ff5dea38369f196093015d3d1f3ee3d25cc90315d62dbb6623b8305d6cbe
-  data.tar.gz: 9a9f14196e96c535201510ebcd933c05c20b8e01d3ed8ef9c3dd9eeeccb643522dc0fb45ca5dabfb9e1a5c075a848b0b797b405260a58d947f4c9c8127da01db
+  metadata.gz: f6c895b7958f867561203cd298e94c775dae38b0b4a665e281edd54f9eb73d645513049df7275fb704bbb2294328a3e4b02c72bba1c4e910dd8d5bcf457eb456
+  data.tar.gz: 29e57ddf40635f9763e95f67fb0607366120077b99946453dd081543d602612da84e079793a474bae5bb1fc30d910ce7f283412fdd55d51ee5bbe43fb7413358

data/Gemfile.lock

@@ -1,12 +1,17 @@
 PATH
   remote: .
   specs:
-    pso (0.1.0)
+    pso (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
+    method_source (0.9.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -27,6 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  pry
   pso!
   rake (~> 10.0)
   rspec (~> 3.0)

data/lib/pso/solver.rb

@@ -1,10 +1,11 @@
 require 'thread'
 require 'pso/zero_vector'
 require 'pso/functions/rastrigin'
+require 'pry'
 
 module Pso
   class Solver
-    def initialize(din: 5, density: 5000, f: Pso::Rastrigin, center: ZeroVector[0,0,0,0,0], radius: 5.12, method: :min_by)
+    def initialize(din: 5, density: 50, f: Pso::Rastrigin, center: ZeroVector[0,0,0,0,0], radius: 5.12, method: :min_by)
       @f = f.new
       @din = din
       @center = center
@@ -19,6 +20,7 @@ module Pso
       Array.new(@density)
       @swarm = Array.new(@density) { generate_random_particle }
       @swarm_best = @swarm.map { |particle| [@f.f(particle), particle] }
+      @swarm_speed = @swarm.map { generate_random_particle }
     end
 
     def generate_random_noise_particle
@@ -41,18 +43,16 @@ module Pso
       end
     end
 
-    def solve(precision: 2000, threads: 4)
+    def solve(precision: 200000, threads: 1)
       Array.new(threads).map do
         Thread.new do
-          (precision / threads).times do
-            perfect = perfect_particle
-            for index in 0...@din
-              new_vector = normalize(interate(@swarm[index], @swarm_best[index].last, perfect))
-
-              if is_best(@swarm_best[index].first, @f.f(new_vector))
-                @swarm_best[index] = [@f.f(new_vector), new_vector]
-              end
-
+          ((precision / @swarm.size) / threads).times do |interation_number|
+            for index in 0...@density
+              perfect = perfect_particle
+              puts @f.f perfect
+              new_vector = normalize(interate(@swarm[index], @swarm_best[index].last, perfect, @swarm_speed[index]))
+              @swarm_best[index] = [@f.f(new_vector), new_vector] if is_best(@swarm_best[index].first, @f.f(new_vector))
+              @swarm_speed[index] = (new_vector - @swarm[index]).normalize
               @swarm[index] = new_vector
             end
           end
@@ -83,8 +83,13 @@ module Pso
       vector
     end
 
-    def interate(vector, best, perfect)
-      return vector + (generate_random_noise_particle) + (best - vector).normalize + (perfect - vector).normalize
+    def interate(vector, best, perfect, speed)
+      if vector == perfect
+        new_vec = vector + (best - vector).normalize * 0.2 + (generate_random_noise_particle) * rand * 0.05 + speed * 0.05
+        minimal = @f.f(vector) > @f.f(new_vec)
+        return @method == :min_by ? (minimal ? new_vec : vector) : ( minimal ? vector : new_vec)
+      end
+      vector + (generate_random_noise_particle) * rand * 0.1 + (best - vector).normalize * 0.5 + (perfect - vector).normalize + speed
     end
   end
 end

data/lib/pso/version.rb

@@ -1,3 +1,3 @@
 module Pso
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/pso.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pso
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Schweigert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Particle Swarm Optimization
 email:
 - marlon.henry@magrathealabs.com