cmfrec 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d16ab98cb7de22042eaf353a9d41d0b7a4214a631a373c553f73825418c026a
-  data.tar.gz: 9ab678a9d389b835b4dfd91d14c372d5acfef950bf068ac46d2d879af04f0fcc
+  metadata.gz: e6dbbc801e415a4f505ffc436be23ccf066d144da072669e782b88c02e14b0f8
+  data.tar.gz: 3851230f0a4dc4be9fbc24fe81681de0758bdbb583803780f8e07b10741f4bd1
 SHA512:
-  metadata.gz: 175d3c91056d2e8734af6961471c98be76e4d5f6b85faaecdfd3b39a220efafa70150983e9d74efb1a1211a29e6c867d6b1d7f482cc34c55500268d29b40158c
-  data.tar.gz: faaed621391ccc7d94f2e6309481b24f7db62fbe86eb6c1bbb35445dde0cabf32c41791af4ebcd25e530bdc1f6319f1b4477b6c4d6ca1bf77353d3a0c4ae8d5c
+  metadata.gz: 103c09a7c0e13fca3cb81dc68c667e776fc965a485cf358e0fc8f350a97474b54bdfc0910f4472051020dbe34b8c097908c1024d5fc036ad77d0444372885109
+  data.tar.gz: b107b36333f714106d981168f24fda48a2a211f288a2dbe01f570adb607b7d6a5215c18df4c67d159bb367d652f3d10faeb4dbc66688eaf117c5b7a1432ee951

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0 (2022-06-14)
+
+- Updated cmfrec to 3.4.2
+- Fixed missing item ids with `load_movielens`
+- Dropped support for Ruby < 2.7
+
 ## 0.1.7 (2022-03-22)
 
 - Improved ARM detection

data/README.md

@@ -13,7 +13,7 @@
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'cmfrec'
+gem "cmfrec"
 ```
 
 For Windows, also follow [these instructions](#windows-installation).
@@ -112,7 +112,7 @@ recommender.new_user_recs([], user_info: {cats: 0, dogs: 2})
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'ngt'
+gem "ngt"
 ```
 
 Get similar users

data/lib/cmfrec/data.rb

@@ -27,11 +27,12 @@ module Cmfrec
       movie_names = {}
       genres = %w(unknown action adventure animation childrens comedy crime documentary drama fantasy filmnoir horror musical mystery romance scifi thriller war western)
       CSV.parse(movies_str, col_sep: "|", converters: [:numeric]) do |row|
+        movies[row[0]] = row[1]
+
         # filter duplicates
         next if movie_names[row[1]]
         movie_names[row[1]] = true
 
-        movies[row[0]] = row[1]
         item = {item_id: row[1], year: row[2] ? Date.parse(row[2]).year : 1970}
         genres.each_with_index do |genre, i|
           item[:"genre_#{genre}"] = row[i + 5]

data/lib/cmfrec/ffi.rb

@@ -17,12 +17,13 @@ module Cmfrec
     typealias "int_t", "int"
     typealias "real_t", "double"
 
-    extern "int_t fit_collective_explicit_als(real_t *restrict biasA, real_t *restrict biasB, real_t *restrict A, real_t *restrict B, real_t *restrict C, real_t *restrict D, real_t *restrict Ai, real_t *restrict Bi, bool add_implicit_features, bool reset_values, int_t seed, real_t *restrict glob_mean, real_t *restrict U_colmeans, real_t *restrict I_colmeans, int_t m, int_t n, int_t k, int_t ixA[], int_t ixB[], real_t *restrict X, size_t nnz, real_t *restrict Xfull, real_t *restrict weight, bool user_bias, bool item_bias, bool center, real_t lam, real_t *restrict lam_unique, real_t l1_lam, real_t *restrict l1_lam_unique, bool scale_lam, bool scale_lam_sideinfo, real_t *restrict U, int_t m_u, int_t p, real_t *restrict II, int_t n_i, int_t q, int_t U_row[], int_t U_col[], real_t *restrict U_sp, size_t nnz_U, int_t I_row[], int_t I_col[], real_t *restrict I_sp, size_t nnz_I, bool NA_as_zero_X, bool NA_as_zero_U, bool NA_as_zero_I, int_t k_main, int_t k_user, int_t k_item, real_t w_main, real_t w_user, real_t w_item, real_t w_implicit, int_t niter, int_t nthreads, bool verbose, bool handle_interrupt, bool use_cg, int_t max_cg_steps, bool finalize_chol, bool nonneg, int_t max_cd_steps, bool nonneg_C, bool nonneg_D, bool precompute_for_predictions, bool include_all_X, real_t *restrict B_plus_bias, real_t *restrict precomputedBtB, real_t *restrict precomputedTransBtBinvBt, real_t *restrict precomputedBtXbias, real_t *restrict precomputedBeTBeChol, real_t *restrict precomputedBiTBi, real_t *restrict precomputedTransCtCinvCt, real_t *restrict precomputedCtCw)"
-    extern "int_t fit_collective_implicit_als(real_t *restrict A, real_t *restrict B, real_t *restrict C, real_t *restrict D, bool reset_values, int_t seed, real_t *restrict U_colmeans, real_t *restrict I_colmeans, int_t m, int_t n, int_t k, int_t ixA[], int_t ixB[], real_t *restrict X, size_t nnz, real_t lam, real_t *restrict lam_unique, real_t l1_lam, real_t *restrict l1_lam_unique, real_t *restrict U, int_t m_u, int_t p, real_t *restrict II, int_t n_i, int_t q, int_t U_row[], int_t U_col[], real_t *restrict U_sp, size_t nnz_U, int_t I_row[], int_t I_col[], real_t *restrict I_sp, size_t nnz_I, bool NA_as_zero_U, bool NA_as_zero_I, int_t k_main, int_t k_user, int_t k_item, real_t w_main, real_t w_user, real_t w_item, real_t *restrict w_main_multiplier, real_t alpha, bool adjust_weight, bool apply_log_transf, int_t niter, int_t nthreads, bool verbose, bool handle_interrupt, bool use_cg, int_t max_cg_steps, bool finalize_chol, bool nonneg, int_t max_cd_steps, bool nonneg_C, bool nonneg_D, bool precompute_for_predictions, real_t *restrict precomputedBtB, real_t *restrict precomputedBeTBe, real_t *restrict precomputedBeTBeChol)"
-    extern "int_t factors_collective_explicit_single(real_t *restrict a_vec, real_t *restrict a_bias,real_t *restrict u_vec, int_t p,real_t *restrict u_vec_sp, int_t u_vec_ixB[], size_t nnz_u_vec,real_t *restrict u_bin_vec, int_t pbin,bool NA_as_zero_U, bool NA_as_zero_X,bool nonneg,real_t *restrict C, real_t *restrict Cb,real_t glob_mean, real_t *restrict biasB,real_t *restrict U_colmeans,real_t *restrict Xa, int_t ixB[], size_t nnz,real_t *restrict Xa_dense, int_t n,real_t *restrict weight,real_t *restrict B,real_t *restrict Bi, bool add_implicit_features,int_t k, int_t k_user, int_t k_item, int_t k_main,real_t lam, real_t *restrict lam_unique,real_t l1_lam, real_t *restrict l1_lam_unique,bool scale_lam, bool scale_lam_sideinfo,real_t w_main, real_t w_user, real_t w_implicit,int_t n_max, bool include_all_X,real_t *restrict BtB,real_t *restrict TransBtBinvBt,real_t *restrict BtXbias,real_t *restrict BeTBeChol,real_t *restrict BiTBi,real_t *restrict CtCw,real_t *restrict TransCtCinvCt,real_t *restrict B_plus_bias)"
-    extern "int_t factors_collective_implicit_single(real_t *restrict a_vec,real_t *restrict u_vec, int_t p,real_t *restrict u_vec_sp, int_t u_vec_ixB[], size_t nnz_u_vec,bool NA_as_zero_U,bool nonneg,real_t *restrict U_colmeans,real_t *restrict B, int_t n, real_t *restrict C,real_t *restrict Xa, int_t ixB[], size_t nnz,int_t k, int_t k_user, int_t k_item, int_t k_main,real_t lam, real_t l1_lam, real_t alpha, real_t w_main, real_t w_user,real_t w_main_multiplier,bool apply_log_transf,real_t *restrict BeTBe,real_t *restrict BtB,real_t *restrict BeTBeChol)"
-    extern "int_t predict_X_old_collective_explicit(int_t row[], int_t col[], real_t *restrict predicted, size_t n_predict, real_t *restrict A, real_t *restrict biasA, real_t *restrict B, real_t *restrict biasB, real_t glob_mean, int_t k, int_t k_user, int_t k_item, int_t k_main, int_t m, int_t n_max, int_t nthreads)"
-    extern "int_t predict_X_old_collective_implicit(int_t row[], int_t col[], real_t *restrict predicted, size_t n_predict, real_t *restrict A, real_t *restrict B, int_t k, int_t k_user, int_t k_item, int_t k_main, int_t m, int_t n, int_t nthreads)"
-    extern "int_t topN(real_t *restrict a_vec, int_t k_user, real_t *restrict B, int_t k_item, real_t *restrict biasB, real_t glob_mean, real_t biasA, int_t k, int_t k_main, int_t *restrict include_ix, int_t n_include, int_t *restrict exclude_ix, int_t n_exclude, int_t *restrict outp_ix, real_t *restrict outp_score, int_t n_top, int_t n, int_t nthreads)"
+    extern "int_t fit_collective_explicit_als(real_t *restrict biasA, real_t *restrict biasB, real_t *restrict A, real_t *restrict B, real_t *restrict C, real_t *restrict D, real_t *restrict Ai, real_t *restrict Bi, bool add_implicit_features, bool reset_values, int_t seed, real_t *restrict glob_mean, real_t *restrict U_colmeans, real_t *restrict I_colmeans, int_t m, int_t n, int_t k, int_t ixA[], int_t ixB[], real_t *restrict X, size_t nnz, real_t *restrict Xfull, real_t *restrict weight, bool user_bias, bool item_bias, bool center, real_t lam, real_t *restrict lam_unique, real_t l1_lam, real_t *restrict l1_lam_unique, bool scale_lam, bool scale_lam_sideinfo, bool scale_bias_const, real_t *scaling_biasA, real_t *scaling_biasB, real_t *restrict U, int_t m_u, int_t p, real_t *restrict II, int_t n_i, int_t q, int_t U_row[], int_t U_col[], real_t *restrict U_sp, size_t nnz_U, int_t I_row[], int_t I_col[], real_t *restrict I_sp, size_t nnz_I, bool NA_as_zero_X, bool NA_as_zero_U, bool NA_as_zero_I, int_t k_main, int_t k_user, int_t k_item, real_t w_main, real_t w_user, real_t w_item, real_t w_implicit, int_t niter, int nthreads, bool verbose, bool handle_interrupt, bool use_cg, int_t max_cg_steps, bool precondition_cg, bool finalize_chol, bool nonneg, int_t max_cd_steps, bool nonneg_C, bool nonneg_D, bool precompute_for_predictions, bool include_all_X, real_t *restrict B_plus_bias, real_t *restrict precomputedBtB, real_t *restrict precomputedTransBtBinvBt, real_t *restrict precomputedBtXbias, real_t *restrict precomputedBeTBeChol, real_t *restrict precomputedBiTBi, real_t *restrict precomputedTransCtCinvCt, real_t *restrict precomputedCtCw, real_t *precomputedCtUbias)"
+    extern "int_t fit_collective_implicit_als(real_t *restrict A, real_t *restrict B, real_t *restrict C, real_t *restrict D, bool reset_values, int_t seed, real_t *restrict U_colmeans, real_t *restrict I_colmeans, int_t m, int_t n, int_t k, int_t ixA[], int_t ixB[], real_t *restrict X, size_t nnz, real_t lam, real_t *restrict lam_unique, real_t l1_lam, real_t *restrict l1_lam_unique, real_t *restrict U, int_t m_u, int_t p, real_t *restrict II, int_t n_i, int_t q, int_t U_row[], int_t U_col[], real_t *restrict U_sp, size_t nnz_U, int_t I_row[], int_t I_col[], real_t *restrict I_sp, size_t nnz_I, bool NA_as_zero_U, bool NA_as_zero_I, int_t k_main, int_t k_user, int_t k_item, real_t w_main, real_t w_user, real_t w_item, real_t *restrict w_main_multiplier, real_t alpha, bool adjust_weight, bool apply_log_transf, int_t niter, int nthreads, bool verbose, bool handle_interrupt, bool use_cg, int_t max_cg_steps, bool precondition_cg, bool finalize_chol, bool nonneg, int_t max_cd_steps, bool nonneg_C, bool nonneg_D, bool precompute_for_predictions, real_t *restrict precomputedBtB, real_t *restrict precomputedBeTBe, real_t *restrict precomputedBeTBeChol, real_t *precomputedCtUbias)"
+    extern "int_t predict_X_old_collective_explicit(int_t row[], int_t col[], real_t *restrict predicted, size_t n_predict, real_t *restrict A, real_t *restrict biasA, real_t *restrict B, real_t *restrict biasB, real_t glob_mean, int_t k, int_t k_user, int_t k_item, int_t k_main, int_t m, int_t n_max, int nthreads)"
+    extern "int_t predict_X_old_collective_implicit(int_t row[], int_t col[], real_t *restrict predicted, size_t n_predict, real_t *restrict A, real_t *restrict B, int_t k, int_t k_user, int_t k_item, int_t k_main, int_t m, int_t n, int nthreads)"
+    extern "int_t topN_old_collective_explicit(real_t *a_vec, real_t a_bias, real_t *A, real_t *biasA, int_t row_index, real_t *B, real_t *biasB, real_t glob_mean, int_t k, int_t k_user, int_t k_item, int_t k_main, int_t *include_ix, int_t n_include, int_t *exclude_ix, int_t n_exclude, int_t *outp_ix, real_t *outp_score, int_t n_top, int_t n, int_t n_max, bool include_all_X, int nthreads)"
+    extern "int_t topN_old_collective_implicit(real_t *a_vec, real_t *A, int_t row_index, real_t *B, int_t k, int_t k_user, int_t k_item, int_t k_main, int_t *include_ix, int_t n_include, int_t *exclude_ix, int_t n_exclude, int_t *outp_ix, real_t *outp_score, int_t n_top, int_t n, int nthreads)"
+    extern "int_t topN_new_collective_explicit(bool user_bias, real_t *u_vec, int_t p, real_t *u_vec_sp, int_t u_vec_X_col[], size_t nnz_u_vec, real_t *u_bin_vec, int_t pbin, bool NA_as_zero_U, bool NA_as_zero_X, bool nonneg, real_t *C, real_t *Cb, real_t glob_mean, real_t *biasB, real_t *U_colmeans, real_t *Xa, int_t X_col[], size_t nnz, real_t *Xa_dense, int_t n, real_t *weight, real_t *B, real_t *Bi, bool add_implicit_features, int_t k, int_t k_user, int_t k_item, int_t k_main, real_t lam, real_t *lam_unique, real_t l1_lam, real_t *l1_lam_unique, bool scale_lam, bool scale_lam_sideinfo, bool scale_bias_const, real_t scaling_biasA, real_t w_main, real_t w_user, real_t w_implicit, int_t n_max, bool include_all_X, real_t *BtB, real_t *TransBtBinvBt, real_t *BtXbias, real_t *BeTBeChol, real_t *BiTBi, real_t *CtCw, real_t *TransCtCinvCt, real_t *CtUbias, real_t *B_plus_bias, int_t *include_ix, int_t n_include, int_t *exclude_ix, int_t n_exclude, int_t *outp_ix, real_t *outp_score, int_t n_top, int nthreads)"
+    extern "int_t topN_new_collective_implicit(int_t n, real_t *u_vec, int_t p, real_t *u_vec_sp, int_t u_vec_X_col[], size_t nnz_u_vec, bool NA_as_zero_U, bool nonneg, real_t *U_colmeans, real_t *B, real_t *C, real_t *Xa, int_t X_col[], size_t nnz, int_t k, int_t k_user, int_t k_item, int_t k_main, real_t lam, real_t l1_lam, real_t alpha, real_t w_main, real_t w_user, real_t w_main_multiplier, bool apply_log_transf, real_t *BeTBe, real_t *BtB, real_t *BeTBeChol, real_t *CtUbias, int_t *include_ix, int_t n_include, int_t *exclude_ix, int_t n_exclude, int_t *outp_ix, real_t *outp_score, int_t n_top, int nthreads)"
   end
 end

data/lib/cmfrec/recommender.rb

@@ -70,7 +70,7 @@ module Cmfrec
         a_vec = @a[user * @k * Fiddle::SIZEOF_DOUBLE, @k * Fiddle::SIZEOF_DOUBLE]
         a_bias = @bias_a ? @bias_a[user * Fiddle::SIZEOF_DOUBLE, Fiddle::SIZEOF_DOUBLE].unpack1("d") : 0
         # @rated[user] will be nil for recommenders saved before 0.1.5
-        top_n(a_vec: a_vec, a_bias: a_bias, count: count, rated: (@rated[user] || {}).keys, item_ids: item_ids)
+        top_n(a_vec: a_vec, a_bias: a_bias, count: count, rated: (@rated[user] || {}).keys, item_ids: item_ids, row_index: user)
       else
         # no items if user is unknown
         # TODO maybe most popular items
@@ -81,8 +81,137 @@ module Cmfrec
     def new_user_recs(data, count: 5, user_info: nil, item_ids: nil)
       check_fit
 
-      a_vec, a_bias, rated = factors_warm(data, user_info: user_info)
-      top_n(a_vec: a_vec, a_bias: a_bias, count: count, rated: rated, item_ids: item_ids)
+      data = to_dataset(data)
+      user_info = to_dataset(user_info) if user_info
+
+      # remove unknown items
+      data, unknown_data = data.partition { |d| @item_map[d[:item_id]] }
+
+      if unknown_data.any?
+        # TODO warn for unknown items?
+        # warn "[cmfrec] Unknown items: #{unknown_data.map { |d| d[:item_id] }.join(", ")}"
+      end
+
+      rated_ids = data.map { |d| @item_map[d[:item_id]] }
+
+      nnz = data.size
+
+      u_vec_sp = []
+      u_vec_x_col = []
+      if user_info
+        user_info.each do |k, v|
+          next if k == :user_id
+
+          uc = @user_info_map[k]
+          raise "Bad key: #{k}" unless uc
+
+          u_vec_x_col << uc
+          u_vec_sp << v
+        end
+      end
+      p_ = @user_info_map.size
+      nnz_u_vec = u_vec_sp.size
+      u_vec_x_col = int_ptr(u_vec_x_col)
+      u_vec_sp = real_ptr(u_vec_sp)
+
+      u_vec = nil
+      u_bin_vec = nil
+      pbin = 0
+
+      weight = nil
+      lam_unique = nil
+      l1_lam_unique = nil
+      n_max = @n
+
+      if data.any?
+        if @implicit
+          ratings = data.map { |d| d[:value] || 1 }
+        else
+          ratings = data.map { |d| d[:rating] }
+          check_ratings(ratings)
+        end
+        xa = real_ptr(ratings)
+        x_col = int_ptr(rated_ids)
+      else
+        xa = nil
+        x_col = nil
+      end
+      xa_dense = nil
+
+      rated = rated_ids.uniq
+
+      prep = prepare_top_n(count: count, rated: rated, item_ids: item_ids)
+      return [] if prep.empty?
+      include_ix, n_include, exclude_ix, n_exclude, outp_ix, outp_score, count = prep
+
+      if @implicit
+        args = [
+          @n,
+          u_vec, p_,
+          u_vec_sp, u_vec_x_col, nnz_u_vec,
+          @na_as_zero_user,
+          @nonneg,
+          @u_colmeans,
+          @b, @c,
+          xa, x_col, nnz,
+          @k, @k_user, @k_item, @k_main,
+          @lambda_, @l1_lambda, @alpha, @w_main, @w_user,
+          @w_main_multiplier,
+          @apply_log_transf,
+          nil, #BeTBe,
+          nil, #BtB,
+          nil, #BeTBeChol,
+          nil, #CtUbias,
+          include_ix, n_include,
+          exclude_ix, n_exclude,
+          outp_ix, outp_score,
+          count, @nthreads
+        ]
+        check_status FFI.topN_new_collective_implicit(*fiddle_args(args))
+      else
+        cb = nil
+        scaling_bias_a = 0
+
+        args = [
+          @user_bias,
+          u_vec, p_,
+          u_vec_sp, u_vec_x_col, nnz_u_vec,
+          u_bin_vec, pbin,
+          @na_as_zero_user, @na_as_zero,
+          @nonneg,
+          @c, cb,
+          @global_mean, @bias_b,
+          @u_colmeans,
+          xa, x_col, nnz,
+          xa_dense, @n,
+          weight,
+          @b,
+          @bi, @add_implicit_features,
+          @k, @k_user, @k_item, @k_main,
+          @lambda_, lam_unique,
+          @l1_lambda, l1_lam_unique,
+          @scale_lam, @scale_lam_sideinfo,
+          @scale_bias_const, scaling_bias_a,
+          @w_main, @w_user, @w_implicit,
+          n_max, @include_all_x,
+          nil, #BtB,
+          nil, #TransBtBinvBt,
+          nil, #BtXbias,
+          nil, #BeTBeChol,
+          nil, #BiTBi,
+          nil, #CtCw,
+          nil, #TransCtCinvCt,
+          nil, #CtUbias,
+          nil, #B_plus_bias,
+          include_ix, n_include,
+          exclude_ix, n_exclude,
+          outp_ix, outp_score,
+          count, @nthreads
+        ]
+        check_status FFI.topN_new_collective_explicit(*fiddle_args(args))
+      end
+
+      top_n_output(outp_ix, outp_score)
     end
 
     def user_ids
@@ -210,7 +339,6 @@ module Cmfrec
       x_full = nil
       weight = nil
       lam_unique = nil
-      l1_lambda = 0
       l1_lam_unique = nil
 
       uu = nil
@@ -247,7 +375,7 @@ module Cmfrec
           @m, @n, @k,
           x_row, x_col, x, nnz,
           @lambda_, lam_unique,
-          l1_lambda, l1_lam_unique,
+          @l1_lambda, l1_lam_unique,
           uu, @m_u, p_,
           ii, @n_i, q,
           u_row, u_col, u_sp, nnz_u,
@@ -257,12 +385,13 @@ module Cmfrec
           @w_main, @w_user, @w_item, real_ptr([@w_main_multiplier]),
           @alpha, @adjust_weight, @apply_log_transf,
           @niter, @nthreads, @verbose, @handle_interrupt,
-          @use_cg, @max_cg_steps, @finalize_chol,
+          @use_cg, @max_cg_steps, @precondition_cg, @finalize_chol,
           @nonneg, @max_cd_steps, @nonneg_c, @nonneg_d,
           @precompute_for_predictions,
           nil, #precomputedBtB,
           nil, #precomputedBeTBe,
-          nil  #precomputedBeTBeChol
+          nil, #precomputedBeTBeChol
+          nil  #precomputedCtUbias
         ]
         check_status FFI.fit_collective_implicit_als(*fiddle_args(args))
 
@@ -281,9 +410,9 @@ module Cmfrec
 
         glob_mean = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE)
 
-        center = true
-        scale_lam = false
-        scale_lam_sideinfo = false
+        # TODO add
+        scaling_bias_a = nil
+        scaling_bias_b = nil
 
         args = [
           @bias_a, @bias_b,
@@ -298,10 +427,11 @@ module Cmfrec
           x_row, x_col, x, nnz,
           x_full,
           weight,
-          @user_bias, @item_bias, center,
+          @user_bias, @item_bias, @center,
           @lambda_, lam_unique,
-          l1_lambda, l1_lam_unique,
-          scale_lam, scale_lam_sideinfo,
+          @l1_lambda, l1_lam_unique,
+          @scale_lam, @scale_lam_sideinfo,
+          @scale_bias_const, scaling_bias_a, scaling_bias_b,
           uu, @m_u, p_,
           ii, @n_i, q,
           u_row, u_col, u_sp, nnz_u,
@@ -310,7 +440,7 @@ module Cmfrec
           @k_main, @k_user, @k_item,
           @w_main, @w_user, @w_item, @w_implicit,
           @niter, @nthreads, @verbose, @handle_interrupt,
-          @use_cg, @max_cg_steps, @finalize_chol,
+          @use_cg, @max_cg_steps, @precondition_cg, @finalize_chol,
           @nonneg, @max_cd_steps, @nonneg_c, @nonneg_d,
           @precompute_for_predictions,
           @include_all_x,
@@ -321,7 +451,8 @@ module Cmfrec
           nil, #precomputedBeTBeChol,
           nil, #precomputedBiTBi,
           nil, #precomputedTransCtCinvCt,
-          nil  #precomputedCtCw
+          nil, #precomputedCtCw
+          nil, #precomputedCtUbias
         ]
         check_status FFI.fit_collective_explicit_als(*fiddle_args(args))
 
@@ -336,21 +467,20 @@ module Cmfrec
     end
 
     def set_params(
-      k: 40, lambda_: 1e+1, method: "als", use_cg: true, user_bias: true,
-      item_bias: true, add_implicit_features: false,
+      k: 40, lambda_: 10.0, method: "als", use_cg: true,
+      user_bias: true, item_bias: true, center: true, add_implicit_features: false,
+      scale_lam: false, scale_lam_sideinfo: false, scale_bias_const: false,
       k_user: 0, k_item: 0, k_main: 0,
       w_main: 1.0, w_user: 1.0, w_item: 1.0, w_implicit: 0.5,
+      l1_lambda: 0.0, center_u: true, center_i: true,
       maxiter: 800, niter: 10, parallelize: "separate", corr_pairs: 4,
-      max_cg_steps: 3, finalize_chol: true,
+      max_cg_steps: 3, precondition_cg: false, finalize_chol: true,
       na_as_zero: false, na_as_zero_user: false, na_as_zero_item: false,
       nonneg: false, nonneg_c: false, nonneg_d: false, max_cd_steps: 100,
       precompute_for_predictions: true, include_all_x: true,
-      use_float: false,
-      random_state: 1, verbose: true, print_every: 10,
-      handle_interrupt: true, produce_dicts: false,
-      copy_data: true, nthreads: -1
+      use_float: true, random_state: 1, verbose: true, print_every: 10,
+      handle_interrupt: true, produce_dicts: false, nthreads: -1
     )
-
       @k = k
       @k_user = k_user
       @k_item = k_item
@@ -386,9 +516,17 @@ module Cmfrec
       @random_state = random_state.to_i
       @produce_dicts = !!produce_dicts
       @handle_interrupt = !!handle_interrupt
-      @copy_data = !!copy_data
       nthreads = Etc.nprocessors if nthreads < 0
       @nthreads = nthreads
+
+      @center = center
+      @scale_lam = scale_lam
+      @scale_lam_sideinfo = scale_lam_sideinfo
+      @scale_bias_const = scale_bias_const
+      @l1_lambda = l1_lambda
+      @precondition_cg = precondition_cg
+
+      # TODO center_u, center_i
     end
 
     def update_maps(train_set)
@@ -462,7 +600,7 @@ module Cmfrec
       end
     end
 
-    def top_n(a_vec:, a_bias:, count:, rated: nil, item_ids: nil)
+    def prepare_top_n(count: nil, rated: nil, item_ids: nil)
       if item_ids
         # remove missing ids
         item_ids = item_ids.map { |v| @item_map[v] }.compact
@@ -471,8 +609,7 @@ module Cmfrec
         include_ix = int_ptr(item_ids)
         n_include = item_ids.size
 
-        # TODO uncomment in 0.2.0
-        count = n_include # if n_include < count
+        count = n_include if n_include < count
       else
         include_ix = nil
         n_include = 0
@@ -494,145 +631,54 @@ module Cmfrec
       outp_ix = Fiddle::Pointer.malloc(count * Fiddle::SIZEOF_INT)
       outp_score = Fiddle::Pointer.malloc(count * Fiddle::SIZEOF_DOUBLE)
 
-      check_status FFI.topN(
-        a_vec, @k_user,
-        @b, @k_item,
-        @bias_b, @global_mean, a_bias,
-        @k, @k_main,
-        include_ix, n_include,
-        exclude_ix, n_exclude,
-        outp_ix, outp_score,
-        count, @n,
-        @nthreads
-      )
-
-      imap = @item_map.map(&:reverse).to_h
-      item_ids = int_array(outp_ix).map { |v| imap[v] }
-      scores = real_array(outp_score)
-
-      item_ids.zip(scores).map do |item_id, score|
-        {item_id: item_id, score: score}
-      end
+      [include_ix, n_include, exclude_ix, n_exclude, outp_ix, outp_score, count]
     end
 
-    def factors_warm(data, user_info: nil)
-      data = to_dataset(data)
-      user_info = to_dataset(user_info) if user_info
-
-      # remove unknown items
-      data, unknown_data = data.partition { |d| @item_map[d[:item_id]] }
-
-      if unknown_data.any?
-        # TODO warn for unknown items?
-        # warn "[cmfrec] Unknown items: #{unknown_data.map { |d| d[:item_id] }.join(", ")}"
-      end
-
-      item_ids = data.map { |d| @item_map[d[:item_id]] }
-
-      nnz = data.size
-      a_vec = Fiddle::Pointer.malloc((@k_user + @k + @k_main) * Fiddle::SIZEOF_DOUBLE)
-      bias_a = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE)
-
-      u_vec_sp = []
-      u_vec_x_col = []
-      if user_info
-        user_info.each do |k, v|
-          next if k == :user_id
-
-          uc = @user_info_map[k]
-          raise "Bad key: #{k}" unless uc
-
-          u_vec_x_col << uc
-          u_vec_sp << v
-        end
-      end
-      p_ = @user_info_map.size
-      nnz_u_vec = u_vec_sp.size
-      u_vec_x_col = int_ptr(u_vec_x_col)
-      u_vec_sp = real_ptr(u_vec_sp)
-
-      u_vec = nil
-      u_bin_vec = nil
-      pbin = 0
-
-      weight = nil
-      lam_unique = nil
-      l1_lambda = 0
-      l1_lam_unique = nil
-      n_max = @n
-
-      if data.any?
-        if @implicit
-          ratings = data.map { |d| d[:value] || 1 }
-        else
-          ratings = data.map { |d| d[:rating] }
-          check_ratings(ratings)
-        end
-        xa = real_ptr(ratings)
-        x_col = int_ptr(item_ids)
-      else
-        xa = nil
-        x_col = nil
-      end
-      xa_dense = nil
+    def top_n(a_vec:, a_bias:, count:, rated: nil, item_ids: nil, row_index:)
+      prep = prepare_top_n(count: count, rated: rated, item_ids: item_ids)
+      return [] if prep.empty?
+      include_ix, n_include, exclude_ix, n_exclude, outp_ix, outp_score, count = prep
 
       if @implicit
-        args = [
+        check_status FFI.topN_old_collective_implicit(
           a_vec,
-          u_vec, p_,
-          u_vec_sp, u_vec_x_col, nnz_u_vec,
-          @na_as_zero_user,
-          @nonneg,
-          @u_colmeans,
-          @b, @n, @c,
-          xa, x_col, nnz,
+          @a, row_index,
+          @b,
           @k, @k_user, @k_item, @k_main,
-          @lambda_, l1_lambda, @alpha,
-          @w_main, @w_user, @w_main_multiplier,
-          @apply_log_transf,
-          nil, #BeTBe,
-          nil, #BtB
-          nil  #BeTBeChol
-        ]
-        check_status FFI.factors_collective_implicit_single(*fiddle_args(args))
+          include_ix, n_include,
+          exclude_ix, n_exclude,
+          outp_ix, outp_score,
+          count, @n, @nthreads
+        )
       else
-        cb = nil
-
-        scale_lam = false
-        scale_lam_sideinfo = false
-
-        args = [
-          a_vec, bias_a,
-          u_vec, p_,
-          u_vec_sp, u_vec_x_col, nnz_u_vec,
-          u_bin_vec, pbin,
-          @na_as_zero_user, @na_as_zero,
-          @nonneg,
-          @c, cb,
-          @global_mean, @bias_b, @u_colmeans,
-          xa, x_col, nnz, xa_dense,
-          @n, weight, @b, @bi,
-          @add_implicit_features,
+        # TODO add param
+        n_max = @n
+
+        check_status FFI.topN_old_collective_explicit(
+          a_vec, a_bias,
+          @a, @bias_a, row_index,
+          @b,
+          @bias_b,
+          @global_mean,
           @k, @k_user, @k_item, @k_main,
-          @lambda_, lam_unique,
-          l1_lambda, l1_lam_unique,
-          scale_lam, scale_lam_sideinfo,
-          @w_main, @w_user, @w_implicit,
-          n_max,
-          @include_all_x,
-          nil, #BtB,
-          nil, #TransBtBinvBt,
-          nil, #BtXbias,
-          nil, #BeTBeChol,
-          nil, #BiTBi,
-          nil, #CtCw,
-          nil, #TransCtCinvCt,
-          nil  #B_plus_bias
-        ]
-        check_status FFI.factors_collective_explicit_single(*fiddle_args(args))
+          include_ix, n_include,
+          exclude_ix, n_exclude,
+          outp_ix, outp_score,
+          count, @n, n_max, @include_all_x ? 1 : 0, @nthreads
+        )
       end
 
-      [a_vec, real_array(bias_a).first, item_ids.uniq]
+      top_n_output(outp_ix, outp_score)
+    end
+
+    def top_n_output(outp_ix, outp_score)
+      imap = @item_map.map(&:reverse).to_h
+      item_ids = int_array(outp_ix).map { |v| imap[v] }
+      scores = real_array(outp_score)
+
+      item_ids.zip(scores).map do |item_id, score|
+        {item_id: item_id, score: score}
+      end
     end
 
     # convert boolean to int

data/lib/cmfrec/version.rb

@@ -1,3 +1,3 @@
 module Cmfrec
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/cmfrec.rb

@@ -15,19 +15,19 @@ module Cmfrec
   class << self
     attr_accessor :ffi_lib
   end
-  lib_name =
+  lib_path =
     if Gem.win_platform?
-      "cmfrec.dll"
+      "x64-mingw/cmfrec.dll"
     elsif RbConfig::CONFIG["host_os"] =~ /darwin/i
       if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
-        "libcmfrec.arm64.dylib"
+        "arm64-darwin/libcmfrec.dylib"
       else
-        "libcmfrec.dylib"
+        "x86_64-darwin/libcmfrec.dylib"
       end
     else
-      "libcmfrec.so"
+      "x86_64-linux/libcmfrec.so"
     end
-  vendor_lib = File.expand_path("../vendor/#{lib_name}", __dir__)
+  vendor_lib = File.expand_path("../vendor/#{lib_path}", __dir__)
   self.ffi_lib = [vendor_lib]
 
   # friendlier error message

data/vendor/arm64-darwin/COPYRIGHTS

@@ -0,0 +1,57 @@
+For the included LFBGS library (files "lbfgs.h", "lbfgs.c", "arithmetic_ansi.h"):
+
+The MIT License
+
+Copyright (c) 1990 Jorge Nocedal
+Copyright (c) 2007-2010 Naoaki Okazaki
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For the included ziggurat tables (file "ziggurat.h"):
+
+Copyright (c) 2005-2022, NumPy Developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    * 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.
+
+    * Neither the name of the NumPy Developers nor the names of any
+       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
+OWNER 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/vendor/arm64-darwin/LICENSE

@@ -0,0 +1,23 @@
+MIT License
+
+Copyright (c) 2020-2022 David Cortes
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

data/vendor/x86_64-darwin/COPYRIGHTS

@@ -0,0 +1,57 @@
+For the included LFBGS library (files "lbfgs.h", "lbfgs.c", "arithmetic_ansi.h"):
+
+The MIT License
+
+Copyright (c) 1990 Jorge Nocedal
+Copyright (c) 2007-2010 Naoaki Okazaki
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For the included ziggurat tables (file "ziggurat.h"):
+
+Copyright (c) 2005-2022, NumPy Developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    * 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.
+
+    * Neither the name of the NumPy Developers nor the names of any
+       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
+OWNER 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/vendor/x86_64-darwin/LICENSE

@@ -0,0 +1,23 @@
+MIT License
+
+Copyright (c) 2020-2022 David Cortes
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

data/vendor/x86_64-linux/COPYRIGHTS

@@ -0,0 +1,57 @@
+For the included LFBGS library (files "lbfgs.h", "lbfgs.c", "arithmetic_ansi.h"):
+
+The MIT License
+
+Copyright (c) 1990 Jorge Nocedal
+Copyright (c) 2007-2010 Naoaki Okazaki
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For the included ziggurat tables (file "ziggurat.h"):
+
+Copyright (c) 2005-2022, NumPy Developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    * 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.
+
+    * Neither the name of the NumPy Developers nor the names of any
+       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
+OWNER 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/vendor/x86_64-linux/LICENSE

@@ -0,0 +1,23 @@
+MIT License
+
+Copyright (c) 2020-2022 David Cortes
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmfrec
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org
@@ -24,10 +24,15 @@ files:
 - lib/cmfrec/ffi.rb
 - lib/cmfrec/recommender.rb
 - lib/cmfrec/version.rb
-- vendor/LICENSE.txt
-- vendor/libcmfrec.arm64.dylib
-- vendor/libcmfrec.dylib
-- vendor/libcmfrec.so
+- vendor/arm64-darwin/COPYRIGHTS
+- vendor/arm64-darwin/LICENSE
+- vendor/arm64-darwin/libcmfrec.dylib
+- vendor/x86_64-darwin/COPYRIGHTS
+- vendor/x86_64-darwin/LICENSE
+- vendor/x86_64-darwin/libcmfrec.dylib
+- vendor/x86_64-linux/COPYRIGHTS
+- vendor/x86_64-linux/LICENSE
+- vendor/x86_64-linux/libcmfrec.so
 homepage: https://github.com/ankane/cmfrec-ruby
 licenses:
 - MIT
@@ -40,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/vendor/LICENSE.txt

@@ -1,74 +0,0 @@
-MIT License
-
-Copyright (c) 2020 David Cortes
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
----
-
-ANSI C implementation of vector operations.
-
-Copyright (c) 2007-2010 Naoaki Okazaki
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-C library of Limited memory BFGS (L-BFGS).
-
-Copyright (c) 1990, Jorge Nocedal
-Copyright (c) 2007-2010 Naoaki Okazaki
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.