fdist 0.2.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acdb7ee899398741455c102bbc005a59e1c7315b
-  data.tar.gz: b77080f239a57b448311837414b561e4a30aab95
+  metadata.gz: 6aeede544638ecf3c21966d06b8f487907fe3d8c
+  data.tar.gz: 5da33101451107fa8c63cf05d750dae08fa88620
 SHA512:
-  metadata.gz: 129624a099944ec377294d2c982675af6ad3c0575ff515d6054479740b28c8516131c3a11300fa000ba999cdeda495552bb2b1c1bc7d64041d712664fbdb16b2
-  data.tar.gz: 18708a6a251d90b91b7af92e3b91cac207b1b2bcceb4fcd9fe5b52092d3ba4efea7b3ab7625930bc6af16e833279691e85fa76bc2843312ef3985c6b05445a75
+  metadata.gz: 8a2440896eb82a525eb6ee350297817ca3672273584b20445962e0c8811e14efc921956b6211a792dffba222d44586f71a76bfac9d52bdc23e92fe172d9a5861
+  data.tar.gz: 51d0013862246d3268ca378ec9c21d54482ee0c4b6a8468d1838de05e8bb744539d5b77ef9f74a7313330295672305410d1cedd7d76c679757d8a81068d665d7

data/VERSION

@@ -1 +1 @@
-0.2.5
+1.0.0

data/fdist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fdist"
-  s.version = "0.2.5"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael d. towle"]
-  s.date = "2013-12-03"
+  s.date = "2013-12-16"
   s.description = "Array methods now include :freq and :fdist, the first of which returns a Rational, and the second of which returns a hash of expression => count pairs"
   s.email = "gametheoretic@gmail.com"
   s.extra_rdoc_files = [

data/lib/fdist.rb

@@ -1,83 +1,19 @@
-require 'mathn'
 
-module Headers
-
-	def headers
-		begin
-			[0].keys
-		rescue
-			nil
-		end
-	end
-
-	def headers= param_list
-		if first.class != Hash
-			if first.class != String
-				map! do |val_set|
-					
-
-					hash = {}
-					val_set.each_with_index do |elem, idx|
-						hash[param_list[idx += 1]] = elem
-					end
-					hash
-				end
-			else
-				map! do |val_set|
-					
-
-					hash = {}
-					arrayify(val_set).each_with_index do |elem, idx|
-						hash[param_list[idx += 1]] = elem
-					end
-					hash
-				end
+module Enumerable
+	def set_headers param_list
+		map! do |arr|
+			param_list.zip(arr).inject({}) do |result,zipped|
+				result[zipped.first] = zipped.last
+				result
 			end
 		end
-		map! do |val_hash|
-			redo_headers(val_hash, param_list)
-		end
-		param_list
-	end
-
-private
-
-	def redo_headers old_hash, new_headers
-		new_hash = {}
-		new_headers.each_with_index do |new_header,idx|
-			new_hash[new_header] = old_hash.values[idx]
-		end
-		new_hash
 	end
 
-	def arrayify thing
-		begin
-			thing.values
-		rescue
-			thing.strip.split ","
+	def fdist &block
+		temp = self.map &block
+		temp.inject({}) do |result,element|
+			result[element] = temp.count element
+			result
 		end
-	end
-end
-
-
-module Frequency
-
-	def freq &expression
-		Rational.instance_eval("#{count(&expression)}/#{length}")
-	end
-
-	def fdist
-		memo = {}
-		uniq.sort_by{|x| count(x)}.each do |x|
-			memo[x] = count(x)
-		end
-		memo
-	end
-
-
-end
-
-class Array
-	include Frequency
-	include Headers
+	end	
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fdist
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.0
 platform: ruby
 authors:
 - michael d. towle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler