libmf 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b8ba1c7cf9de8e19fa9775ecdb445bc0f2f4323401cccbf016ff6a81a04a00
-  data.tar.gz: 9ff88bdafac8bbfe0c99ccc0c0b7dfb7a9092246de1105c7f99ccade29b9c88b
+  metadata.gz: 510156ab4bccb39a99441002dd80f3540b643934294bc5724dca91987b4effba
+  data.tar.gz: 03a1f04e4679ec60cb2f1d2a96e2add0b9adba03fe5715bc4f10309ab795bcc1
 SHA512:
-  metadata.gz: 021eca76e96ceca2cd484b7f7796a649529f3b20c80d494143cfaf43e617d23ac55ae50bdcd345808e277b31d304ea6e6a53c937b3e9a200f47ae226f27e4f2b
-  data.tar.gz: 916b78a5e62d19e4d6a9e1433350bb26982d43393029e4e883ed803f89a03f6db766ab10718120a73db1f0ad7ac80607d475a10a7c203d117ca1706e80618345
+  metadata.gz: eb862c0cf91a077ba2e9a0ed3f93491297cdc9801683e3587b91125c7e0b79123d0f942aea6bf3cef42fbbb43f5e8f822758a894f25a7eedf2fd9ee7b5ea4920
+  data.tar.gz: b4d74a6b3d4160f3b1165f90496a9f93c6b59ca99e5f3cc0094f022a0807fc8a34af3d9b0edeeff463264a60c19901ceaa171c3cea944d860103208e2d26dbf2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.0 (2022-08-07)
+
+- Added metrics
+- Prefer `save` over `save_model`
+- Prefer `load` over `load_model`
+- Dropped support for Ruby < 2.7
+
 ## 0.2.6 (2021-12-02)
 
 - Improved ARM detection

data/LICENSE.txt

@@ -1,30 +1,33 @@
 BSD 3-Clause License
 
-Copyright (c) 2014-2015, The LIBMF Project
-Copyright (c) 2019-2021, Andrew Kane
+Copyright (c) 2014-2015 The LIBMF Project.
+Copyright (c) 2019-2022 Andrew Kane.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions
+are met:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+3. Neither name of copyright holders nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -11,7 +11,7 @@ Check out [Disco](https://github.com/ankane/disco) for higher-level collaborativ
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'libmf'
+gem "libmf"
 ```
 
 ## Getting Started
@@ -54,13 +54,13 @@ model.bias
 Save the model to a file
 
 ```ruby
-model.save_model("model.txt")
+model.save("model.txt")
 ```
 
 Load the model from a file
 
 ```ruby
-model.load_model("model.txt")
+model = Libmf::Model.load("model.txt")
 ```
 
 Pass a validation set
@@ -99,7 +99,7 @@ Libmf::Model.new(
   lambda_q1: 0,           # coefficient of L1-norm regularization on Q
   lambda_q2: 0.1,         # coefficient of L2-norm regularization on Q
   learning_rate: 0.1,     # learning rate
-  alpha: 0.1,             # importance of negative entries
+  alpha: 1,               # importance of negative entries
   c: 0.0001,              # desired value of negative entries
   nmf: false,             # perform non-negative MF (NMF)
   quiet: false            # no outputs to stdout
@@ -126,6 +126,50 @@ For one-class matrix factorization
 - `:one_class_col` - column-oriented pair-wise logarithmic loss
 - `:one_class_l2` - squared error (L2-norm)
 
+## Metrics
+
+Calculate RMSE (for real-valued MF)
+
+```ruby
+model.rmse(data)
+```
+
+Calculate MAE (for real-valued MF)
+
+```ruby
+model.mae(data)
+```
+
+Calculate generalized KL-divergence (for non-negative real-valued MF)
+
+```ruby
+model.gkl(data)
+```
+
+Calculate logarithmic loss (for binary MF)
+
+```ruby
+model.logloss(data)
+```
+
+Calculate accuracy (for binary MF)
+
+```ruby
+model.accuracy(data)
+```
+
+Calculate MPR (for one-class MF)
+
+```ruby
+model.mpr(data, transpose)
+```
+
+Calculate AUC (for one-class MF)
+
+```ruby
+model.auc(data, transpose)
+```
+
 ## Performance
 
 For performance, read data directly from files
@@ -172,7 +216,7 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 To get started with development:
 
 ```sh
-git clone --recursive https://github.com/ankane/libmf-ruby.git
+git clone https://github.com/ankane/libmf-ruby.git
 cd libmf-ruby
 bundle install
 bundle exec rake vendor:all

data/lib/libmf/ffi.rb

@@ -59,7 +59,14 @@ module Libmf
     attach_function :mf_destroy_model, [:pointer], :void
     attach_function :mf_train, [Problem.by_ref, Parameter.by_value], Model.auto_ptr
     attach_function :mf_train_with_validation, [Problem.by_ref, Problem.by_ref, Parameter.by_value], Model.auto_ptr
-    attach_function :mf_predict, [Model.by_ref, :int, :int], :float
     attach_function :mf_cross_validation, [Problem.by_ref, :int, Parameter.by_value], :double
+    attach_function :mf_predict, [Model.by_ref, :int, :int], :float
+    attach_function :calc_rmse, [Problem.by_ref, Model.by_ref], :double
+    attach_function :calc_mae, [Problem.by_ref, Model.by_ref], :double
+    attach_function :calc_gkl, [Problem.by_ref, Model.by_ref], :double
+    attach_function :calc_logloss, [Problem.by_ref, Model.by_ref], :double
+    attach_function :calc_accuracy, [Problem.by_ref, Model.by_ref], :double
+    attach_function :calc_mpr, [Problem.by_ref, Model.by_ref, :bool], :double
+    attach_function :calc_auc, [Problem.by_ref, Model.by_ref, :bool], :double
   end
 end

data/lib/libmf/model.rb

@@ -35,6 +35,13 @@ module Libmf
       status = FFI.mf_save_model(model, path)
       raise Error, "Cannot save model" if status != 0
     end
+    alias_method :save, :save_model
+
+    def self.load(path)
+      model = Model.new
+      model.load_model(path)
+      model
+    end
 
     def load_model(path)
       @model = FFI.mf_load_model(path)
@@ -65,6 +72,34 @@ module Libmf
       _factors(model[:q], columns, format)
     end
 
+    def rmse(data)
+      FFI.calc_rmse(create_problem(data), model)
+    end
+
+    def mae(data)
+      FFI.calc_mae(create_problem(data), model)
+    end
+
+    def gkl(data)
+      FFI.calc_gkl(create_problem(data), model)
+    end
+
+    def logloss(data)
+      FFI.calc_logloss(create_problem(data), model)
+    end
+
+    def accuracy(data)
+      FFI.calc_accuracy(create_problem(data), model)
+    end
+
+    def mpr(data, transpose)
+      FFI.calc_mpr(create_problem(data), model, transpose)
+    end
+
+    def auc(data, transpose)
+      FFI.calc_auc(create_problem(data), model, transpose)
+    end
+
     private
 
     def _factors(ptr, n, format)

data/lib/libmf/version.rb

@@ -1,3 +1,3 @@
 module Libmf
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libmf
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -58,14 +58,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Large-scale sparse matrix factorization for Ruby