pmeth 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d15cc0b7b591e80a1cf83f22061ff3fb6a03b6
-  data.tar.gz: 7e99134af27d63fe2a3b1c20c49889dd1164ab63
+  metadata.gz: be93eb83871e0795baa264779bd8ba8eef3708f5
+  data.tar.gz: 55e2c27e3923bdb6671203c9ea896d965a9b3a25
 SHA512:
-  metadata.gz: e98efcde0963c58bd0e22b17c451be8ea710c3d7b8f505ddefcef424f1e5f389973b772e5b49685fb096905a3e9b1d7ec65ba4e88b5cfad58a13adfd8be77c2f
-  data.tar.gz: 53779c27902cc3e802af1592cafe9fa9fb33cfde6ce7dec97cec30ede90dc3285c67d20fade4b30c387b53264dde5da59bc0afd58046db3cc3ac563e87400f8a
+  metadata.gz: 7d2ed29982589d3951b3a643e8f847ae42acf38b7f168bdf74c5dcf950bd63954560daed6d8a52c7b1220e2d7769bd660a59e7ae31f7e144b791c25905992573
+  data.tar.gz: c881281f8e56adeb2c6c9ffb7786ccea1119a5d24dfb13aa7f7ec594e2fde7c949957249b5a5c5db00b203443188c45d4b7cb503b112d8d1fdc0acc0a5afddf4

data/lib/pmeth.rb

@@ -3,15 +3,15 @@
 require 'prime'
 
 class Integer
-  #returns all positive factors of an Integer
-  def factors
-     (1..self).select { |n| (self % n).zero? } 
-  end
+	#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
+	#returns true if self is a prime number, false otherwise
+	def prime?
+		Prime.prime?(self)
+	end
 end
 
 
@@ -26,7 +26,7 @@ class PMeth
 	# Returns a new permutation that has had a randomly sized sub-section re-ordered by shuffle
 	def self.chunk_mutate(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 = rand(permutation.length) # 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)
 		end
@@ -35,7 +35,7 @@ class PMeth
 			x = division(permutation)
 		end
 		sliced = permutation.each_slice(x).to_a # permutation is sliced into chunks of size x
-		e = rand(sliced.length-1) # one of the chunks is chosen at random...
+		e = rand(sliced.length) # one of the chunks is chosen at random...
 		chunk = sliced[e]
 		until sliced[e] != chunk
 			sliced[e] = sliced[e].shuffle # ... and the objects within are shuffled
@@ -47,12 +47,12 @@ class PMeth
 		return mutant
 	end
 
-	# Returns a new permutation where two of the objects have swapped positions (indices)
+	# Returns a new permutation where two of the objects, chosen at random, have swapped positions (indices)
 	def self.swap_mutate(permutation)
 		a = b = x = y = 0
 		until a != b
-			x = rand(permutation.length-1) # randomly choose two indices x and y...
-			y = rand(permutation.length-1)
+			x = rand(permutation.length) # randomly choose two indices x and y...
+			y = rand(permutation.length)
 			a = permutation[x] # ... and call the objects at these indices a and b
 			b = permutation[y]
 		end
@@ -62,11 +62,26 @@ class PMeth
 		return mutant
 	end
 
+	# Returns a new permutation where an object, chosen at random, has swapped position with one of it's immediate neighbours
+	def self.adjacent_swap(permutation)
+		x = rand(permutation.length) # randomly choose an index
+		coin = rand(2) # a 50% chance for an object to swap with it's left or right neighbour
+		if x == 0 || coin == 0 # object at index 0 of array can only swap with index 1
+			y = x + 1
+		elsif x == permutation.length-1 || coin == 1 # object at index -1 of array can only swap with index -2
+			y = x - 1
+		end
+		mutant = permutation.dup
+		mutant[x] = permutation[y]
+		mutant[y] = permutation[x]
+		return mutant
+	end
+
 	# 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)
 		x = division(parent_1) # the randomly chosen size of chunks that permutations will be split into
 		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
+			ig = rand(parent_1.length) # 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...
 			parent_1_reduced.delete_at(ig); parent_2_reduced.delete_at(p2_ig) # .. and remove the ignored object from these duplicates
@@ -75,7 +90,7 @@ class PMeth
 		else
 			p1s, p2s = parent_1.each_slice(x).to_a, parent_2.each_slice(x).to_a # if permutation lengths are non-prime, just slice the parent permutations into chunks of size x
 		end
-		chosen = rand(p2s.length)-1 # choose a chunk to have parent_2 ordered objects in child permutation
+		chosen = rand(p2s.length) # choose a chunk to have parent_2 ordered objects in child permutation
 		child = p1s.flatten.dup # un-modified child permutation to accept chunk from parent_2 (and possibly ignored object)
 		p1s[chosen].each do |i| # place each object in chosen parent_1 chunk into the index it's corresponding object (from parent_2) occupies in parent_1:
 			index = p1s[chosen].index(i) # the index of each object in the chosen parent_1 chunk...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pmeth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Edward Chalstrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-27 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