pmeth 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceada8203f5a3f30779c0659894ce9ba093ace9b
-  data.tar.gz: c3986f76c2d706c48cc727752070be2157fb552d
+  metadata.gz: f2d15cc0b7b591e80a1cf83f22061ff3fb6a03b6
+  data.tar.gz: 7e99134af27d63fe2a3b1c20c49889dd1164ab63
 SHA512:
-  metadata.gz: 499c46045ead1236234721902860501e27971ed7cd331b234a1a90168778db4cf753f0722f2cd6b4e7ff480ce8ce8b99000133ba8f13d073fe36fd5aa38d2fe1
-  data.tar.gz: 0434f5177db12f1e65a48fc94c56efabf10325e6971d2825c83b92e44641ed05c3418f67bbed47627fe0c30e2c902e31103593baa47fc2a3dbef134bbc91370e
+  metadata.gz: e98efcde0963c58bd0e22b17c451be8ea710c3d7b8f505ddefcef424f1e5f389973b772e5b49685fb096905a3e9b1d7ec65ba4e88b5cfad58a13adfd8be77c2f
+  data.tar.gz: 53779c27902cc3e802af1592cafe9fa9fb33cfde6ce7dec97cec30ede90dc3285c67d20fade4b30c387b53264dde5da59bc0afd58046db3cc3ac563e87400f8a

data/lib/pmeth.rb

@@ -1,31 +1,31 @@
 #encoding: utf-8
+
+require 'prime'
+
+class Integer
+  #returns all positive factors of an Integer
+  def factors
+     (1..self).select { |n| (self % n).zero? } 
+  end
+  
+  #returns true if self is a prime number, false otherwise
+  def prime?
+    Prime.prime?(self)
+  end
+end
+
+
 class PMeth
-	# Returns true if integer n is a prime number, false if not
-	def self.prime?(n)
-		for d in 2..(n - 1)
-			if (n % d) == 0
-				return false
-			end
-		end
-		true
-	end
 
 	# Returns a random integer that array can be divided by to get another integer (other than the array length itself)
+	# by getting all the factors of the array length and ditching the array length
 	def self.division(array)
-		x = 1.5 # x assigned a non-integer value to begin with
-		if prime?(array.length) # array with prime number of objects is not divisible by any integer other than 1 and itself
-			x = 1
-		else
-			until x > 0 && array.length/x.to_f == (array.length/x.to_f).to_i && Integer === x
-				x = rand(array.length)
-			end
-		end
-		return x
+		array.length.factors.select {|n| n != array.length}.sample
 	end
 
 	# Returns a new permutation that has had a randomly sized sub-section re-ordered by shuffle
 	def self.chunk_mutate(permutation)
-		if prime?(permutation.length) # if there are a prime number of objects in the permutation
+		if permutation.length.prime? # if there are a prime number of objects in the permutation
 			ig = rand(permutation.length)-1 # choose a random object to ignore - to add back at its original index after mutation
 			ig_obj = permutation[ig] # save the object
 			permutation.delete_at(ig)
@@ -64,9 +64,8 @@ class PMeth
 
 	# Returns a permutation whose objects are ordered partly like parent_1 permutation, and partly like parent_2 permutation
 	def self.recombine(parent_1, parent_2)
-		child = []
 		x = division(parent_1) # the randomly chosen size of chunks that permutations will be split into
-		if prime?(parent_1.length) # to compensate for permutations with a prime number of objects:
+		if parent_1.length.prime? # to compensate for permutations with a prime number of objects:
 			ig = rand(parent_1.length)-1 # choose a random object to ignore - to add back at its original index after mutation
 			p2_ig = parent_2.index(parent_1[ig]) # choose the same object from parent_2
 			parent_1_reduced, parent_2_reduced = parent_1.dup, parent_2.dup # then create duplicates of the parent arrays...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pmeth
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Edward Chalstrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies: []
 description: "Reproduction methods for genetic (and other iterative improvement) algorithms,
   being used to solve permutation problems, \n  where permutations are arrays of unique