named_vector 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTcxMWZkZWY1MDA4MzhlZDgzNzIwNGRlMWRhNzQ3NDIxZTMzZWYxNA==
+    NTIyYTE5Y2VlODc2OTY2Y2I4Yjc3YjhmY2FjNzA5MjhjMGI4OWJkMw==
   data.tar.gz: !binary |-
-    MjYxYjUzOWNjOWM0MWY1NWRkYzQzODVlNTFlZjUxYjRkOTJlN2E5Ng==
+    MmMxMGI2ZDg0MmYyMWU3NzJhM2FmMjNkODI2NTliY2Y2NjI3MTM2Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZjdmZTgwYzkyYzVhNjA1ZjdmYzJkNTMzNmU3N2ZhZWJjYjE5NzYxMjA1ZmY0
-    MWM5YThiMzkyZWFjY2MyOTJiMTRiMThkZWQ3MzQxMTAwZGJmMWQxMDg5ODVj
-    YjJjNDYwOGI0ZGM2MzFjMTU2ODk1ZDU4YzM0OGY1NmUwMjk4ZTA=
+    YmY3NDRhYjY5MWZjOWNmYzMyNTkwZjIyMjA0M2FiNDI4NzJjYWUwNjM0YTQ1
+    ZTZkODQ4YjJlY2VmMmIwMDIxNTYxZmZiN2U2ZGU5MTYxN2JiYzlmMjQwZDFm
+    MjM1MDNkN2EzYWM1NDk2ZTA2ZGZjYjQ2MTZlNDE2ODBkZTczNjk=
   data.tar.gz: !binary |-
-    ZGE3ZGZmMDU3MzYxNGE1MWZjYTA5OGE3YzE4ZDdjODA2NDQzMDE2NGMzYjNi
-    YTY4M2IyYTkwZTdlM2YwNDUwNzUxODAyN2E3NzJlZGJkZjRiNzgxNGYwMTlk
-    MWRiZjYxMTA5MzIzNDdmOGVmOTViN2E5YmYzZjJlYTllY2M2ODk=
+    YmUzMDczMjZjOTNlNzU2ZmJlNDRjOTA1MzRkNDM5NzA1MWVlZDQzYjQzYjBj
+    MGZiZmY1NDkxNWRjMzJlOTgyZGI5N2Q0NTlmZDRhNGI1MDdmOGE2MDMyOWRk
+    MDM1Mzc2OTA3MzRhMjFiYzI3MmJlZDY3YzE0ZTJhYmYxZTllZTY=

data/lib/named_vector.rb

@@ -141,6 +141,27 @@ class NamedVector
 		norm
 	end
 
+	def eql?(other)
+		false unless other.keys == @keys
+		all_keys = other.keys.merge(@keys)
+		all_keys.each do |key|
+			if other[key] != self[key] then return false end
+		end
+		true
+	end
+
+	def to_s
+		"<#NamedVector @keys=\"#{@keys.inspect}\", @vector=\"#{@vector.inspect}\">"
+	end
+
+	def to_a
+		@vector.to_a
+	end
+
+	alias :to_ary :to_a
+
+	alias :== :eql?
+
 	# the Euclidean norm of a vector
 	def norm
 		Math.sqrt(squared_norm)
@@ -150,21 +171,29 @@ class NamedVector
 	def normalize
 		current_norm = norm
 		if current_norm > 0 then self*(1.0/current_norm) end
+		self
 	end
 
-	# Mongo conversion
-	def to_mongo
-		{"keys"=> @keys, "dimensions"=> @keys.map {|i| self[i]}}
+	# Mongo retrieval
+	# @param doc [BSON::OrderedHash] the mongo document to retrieve the vector from.
+	def self.to_mongo(hash)
+		if hash.is_a?(Hash) then hash
+		else
+			{"keys"=> hash.keys.to_a, "dimensions" => hash.keys.map {|i| hash[i]}}
+		end
 	end
 
-	# Mongo retrieval
+	# Mongo conversion
 	# @param doc [BSON::OrderedHash] the mongo document to retrieve the vector from.
 	def self.from_mongo(doc)
-		hash = {}
-		doc["keys"].each_with_index do |k, index|
-			hash[k] = doc["dimensions"][index]
+		if doc.is_a?(self) then doc
+		else
+			hash = {}
+			doc["keys"].each_with_index do |k, index|
+				hash[k] = doc["dimensions"][index]
+			end
+			NamedVector.new(hash)
 		end
-		self.new hash
 	end
 
 	private :new_dimension

data/specs/initialization.rb

@@ -55,7 +55,7 @@ describe 'Initialization' do
 	end
 
 	it 'should allow sums of vectors to be used for initilization' do
-		vector = NamedVector.new(["a","a","a", "b", "b"])
+		vector = NamedVector.new(%w(a a a b b))
 		vector.a.should eq 3
 		vector.b.should eq 2
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: named_vector
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jonathan Raiman