cofi_cost 0.0.8 → 0.0.9

data/.gitignore

@@ -1 +1,3 @@
 *.txt
+*.swp
+*.gem

data/cofi_cost.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'cofi_cost'
-  s.version     = '0.0.8'
+  s.version     = '0.0.9'
   s.date        = '2013-11-18'
   s.summary     = "Collaborative filtering"
   s.description = "Playground for collaborative filtering in Ruby using NArray and rb-gsl."

data/lib/cofi_cost.rb

@@ -6,14 +6,15 @@ include GSL::MultiMin
 
 class CofiCost
 
-	attr_accessor :ratings, :num_features, :regularization, :iterations, :features, :theta, :max_rating
+	attr_accessor :ratings, :num_features, :regularization, :iterations, :features, :theta, :max_rating, :min_rating
 	attr_reader :boolean_rated, :num_tracks, :num_users, :ratings_mean, :ratings_norm, :predictions, :cost
 	
-	def initialize(ratings, num_features = 2, regularization = 1, iterations = 10, max_rating = 5, features = nil, theta = nil)
+	def initialize(ratings, num_features = 2, regularization = 1, iterations = 10, max_rating = 5, min_rating = 0, features = nil, theta = nil)
 		@ratings = ratings.to_f	# make sure it's a float for correct normalization
 		@num_features = num_features
 		@cost = 0
 		@max_rating = max_rating
+		@min_rating = min_rating
 		@boolean_rated = @ratings > 0 # return 0 for all rated and 1 for all unrated
 		@boolean_unrated = @boolean_rated.eq 0 # return 1 for all unrated and 0 for all unrated
 		@num_tracks = @ratings.shape[1] # @ratings is users x tracks
@@ -124,12 +125,14 @@ class CofiCost
 	
 	def calc_predictions
 		predicts = NArray.ref(NMatrix.ref(@features) * NMatrix.ref(@theta.transpose(1,0))) + @ratings_mean
-		set_max_predictions(predicts)
+		set_max_min_predictions(predicts)
 	end
 
-	def set_max_predictions(predicts)
-		a = predicts > @max_rating
-		predicts[a] = @max_rating
+	def set_max_min_predictions(predicts)
+		over_max = predicts > @max_rating
+		under_min = predicts < @min_rating
+		predicts[over_max] = @max_rating
+		predicts[under_min] = @min_rating
 		predicts
 	end
 

data/spec/cofi_cost_spec.rb

@@ -7,9 +7,10 @@ describe CofiCost do
 		regularization = 1
 		iterations = 10
 		max_rating = 5
+		min_rating = 0
 		theta = NArray[[0.28544,-1.68427,0.26294],[0.50501,-0.45465,0.31746],[-0.43192,-0.47880,0.84671],[0.72860,-0.27189,0.32684]]
 		features = NArray[[1.048686,-0.400232,1.194119],[0.780851,-0.385626,0.521198],[0.641509,-0.547854,-0.083796],[0.453618,-0.800218,0.680481],[0.937538,0.106090,0.361953]]
-		@cofi = CofiCost.new(ratings, num_features, regularization, iterations, max_rating, features, theta)
+		@cofi = CofiCost.new(ratings, num_features, regularization, iterations, max_rating, min_rating, features, theta)
 	end
   
 	describe "#normalize_ratings" do
@@ -68,10 +69,10 @@ describe CofiCost do
 		end
 	end
 
-	describe "#set_max_predictions(predicts)" do
-		it "does not allow any prediction greater than self.max_rating" do
-			test = NArray[[6.0,4.0,0.0,0.0],[3.0,0.0,6.5,0.0],[4.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0]]
-			@cofi.set_max_predictions(test).to_a.should == [[5.0,4.0,0.0,0.0],[3.0,0.0,5.0,0.0],[4.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0]]
+	describe "#set_max_min_predictions(predicts)" do
+		it "does not allow any prediction greater than self.max_rating or less than self.min_rating" do
+			test = NArray[[6.0,4.0,-1.0,0.0],[3.0,0.0,6.5,0.0],[4.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0]]
+			@cofi.set_max_min_predictions(test).to_a.should == [[5.0,4.0,0.0,0.0],[3.0,0.0,5.0,0.0],[4.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0],[3.0,0.0,0.0,0.0]]
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cofi_cost
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: