isotree 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5974c65c4adc4fd79ee7770f324c906a2788534f3fe6f381d61711e7cdce78c
-  data.tar.gz: d401e7c5aaabcd5dcffd5e4f54d93ea4d0966698854e70d3475fd79a92e1e241
+  metadata.gz: 95dc93ac1b84a5a37539b335da0457955ee8868997a34a9c249f7c54927f4b04
+  data.tar.gz: eff22a02afce64167248e967d384b0c9b2259f2f5248cfad5bd37acd8bc44e2a
 SHA512:
-  metadata.gz: d00de0c3902b4f7fd3e13e08f0738ec4daf8be173f60cf46f49318e76f5be3c4ef3edd925f83074e03b4fe181aa6384d43c749f5f72247cf08d44f6811a6fe80
-  data.tar.gz: 70195ae442c2e4762b2f900a82a891d8f991ace1e521d625f910a1b5e3482334a299674c255e1aebf855728ee169ab5886428baf6df9a5e436bc73f3aff6dda6
+  metadata.gz: 9f410b78af1ae72f4cd166511b6b676f3b71bc39ce92641c455879a3aa88172abb7d1c37ffc953d505fdd59db07d355c9ffba20c3577a1d9b2311c5959a4c87f
+  data.tar.gz: 4804ec4aa11997fb91bcd714a0569e0571970bf06d4ad9b491f0e450c33183c86d37a922577ec296765708e9599272863cfa7f775f7dca4d9d18346ed8a38d87

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0 (2021-05-17)
+
+- Updated to Rice 4
+- Dropped support for Ruby < 2.6
+
 ## 0.1.5 (2021-03-14)
 
 - Updated Isotree to 0.1.25

data/ext/isotree/ext.cpp

@@ -2,12 +2,7 @@
 #include <isotree.hpp>
 
 // rice
-#include <rice/Array.hpp>
-#include <rice/Hash.hpp>
-#include <rice/Module.hpp>
-#include <rice/Object.hpp>
-#include <rice/String.hpp>
-#include <rice/Symbol.hpp>
+#include <rice/rice.hpp>
 
 using Rice::Array;
 using Rice::Hash;
@@ -18,62 +13,89 @@ using Rice::Symbol;
 using Rice::define_class_under;
 using Rice::define_module;
 
-template<>
-NewCategAction from_ruby<NewCategAction>(Object x)
+namespace Rice::detail
 {
-  auto value = x.to_s().str();
-  if (value == "weighted") return Weighted;
-  if (value == "smallest") return Smallest;
-  if (value == "random") return Random;
-  throw std::runtime_error("Unknown new categ action: " + value);
-}
+  template<>
+  class From_Ruby<NewCategAction>
+  {
+  public:
+    NewCategAction convert(VALUE x)
+    {
+      auto value = Object(x).to_s().str();
+      if (value == "weighted") return Weighted;
+      if (value == "smallest") return Smallest;
+      if (value == "random") return Random;
+      throw std::runtime_error("Unknown new categ action: " + value);
+    }
+  };
 
-template<>
-MissingAction from_ruby<MissingAction>(Object x)
-{
-  auto value = x.to_s().str();
-  if (value == "divide") return Divide;
-  if (value == "impute") return Impute;
-  if (value == "fail") return Fail;
-  throw std::runtime_error("Unknown missing action: " + value);
-}
+  template<>
+  class From_Ruby<MissingAction>
+  {
+  public:
+    MissingAction convert(VALUE x)
+    {
+      auto value = Object(x).to_s().str();
+      if (value == "divide") return Divide;
+      if (value == "impute") return Impute;
+      if (value == "fail") return Fail;
+      throw std::runtime_error("Unknown missing action: " + value);
+    }
+  };
 
-template<>
-CategSplit from_ruby<CategSplit>(Object x)
-{
-  auto value = x.to_s().str();
-  if (value == "subset") return SubSet;
-  if (value == "single_categ") return SingleCateg;
-  throw std::runtime_error("Unknown categ split: " + value);
-}
+  template<>
+  class From_Ruby<CategSplit>
+  {
+  public:
+    CategSplit convert(VALUE x)
+    {
+      auto value = Object(x).to_s().str();
+      if (value == "subset") return SubSet;
+      if (value == "single_categ") return SingleCateg;
+      throw std::runtime_error("Unknown categ split: " + value);
+    }
+  };
 
-template<>
-CoefType from_ruby<CoefType>(Object x)
-{
-  auto value = x.to_s().str();
-  if (value == "uniform") return Uniform;
-  if (value == "normal") return Normal;
-  throw std::runtime_error("Unknown coef type: " + value);
-}
+  template<>
+  class From_Ruby<CoefType>
+  {
+  public:
+    CoefType convert(VALUE x)
+    {
+      auto value = Object(x).to_s().str();
+      if (value == "uniform") return Uniform;
+      if (value == "normal") return Normal;
+      throw std::runtime_error("Unknown coef type: " + value);
+    }
+  };
 
-template<>
-UseDepthImp from_ruby<UseDepthImp>(Object x)
-{
-  auto value = x.to_s().str();
-  if (value == "lower") return Lower;
-  if (value == "higher") return Higher;
-  if (value == "same") return Same;
-  throw std::runtime_error("Unknown depth imp: " + value);
-}
+  template<>
+  class From_Ruby<UseDepthImp>
+  {
+  public:
+    UseDepthImp convert(VALUE x)
+    {
+      auto value = Object(x).to_s().str();
+      if (value == "lower") return Lower;
+      if (value == "higher") return Higher;
+      if (value == "same") return Same;
+      throw std::runtime_error("Unknown depth imp: " + value);
+    }
+  };
 
-template<>
-WeighImpRows from_ruby<WeighImpRows>(Object x)
-{
-  auto value = x.to_s().str();
-  if (value == "inverse") return Inverse;
-  if (value == "prop") return Prop;
-  if (value == "flat") return Flat;
-  throw std::runtime_error("Unknown weight imp rows: " + value);
+  template<>
+  class From_Ruby<WeighImpRows>
+  {
+  public:
+    WeighImpRows convert(VALUE x)
+    {
+      auto value = Object(x).to_s().str();
+      if (value == "inverse") return Inverse;
+      if (value == "prop") return Prop;
+      if (value == "flat") return Flat;
+      throw std::runtime_error("Unknown weight imp rows: " + value);
+    }
+  };
 }
 
 extern "C"
@@ -85,9 +107,9 @@ void Init_ext()
   define_class_under<ExtIsoForest>(rb_mExt, "ExtIsoForest");
 
   rb_mExt
-    .define_singleton_method(
+    .define_singleton_function(
       "fit_iforest",
-      *[](Hash options) {
+      [](Hash options) {
         // model
         ExtIsoForest iso;
 
@@ -204,9 +226,9 @@ void Init_ext()
 
         return iso;
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "predict_iforest",
-      *[](ExtIsoForest& iso, Hash options) {
+      [](ExtIsoForest& iso, Hash options) {
         // data
         size_t nrows = options.get<size_t, Symbol>("nrows");
         size_t ncols_numeric = options.get<size_t, Symbol>("ncols_numeric");
@@ -260,9 +282,9 @@ void Init_ext()
         }
         return ret;
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "serialize_ext_isoforest",
-      *[](ExtIsoForest& iso, String path) {
+      [](ExtIsoForest& iso, String path) {
         #ifdef _MSC_VER
         // TODO convert to wchar_t
         throw std::runtime_error("Not supported on Windows yet");
@@ -270,9 +292,9 @@ void Init_ext()
         serialize_ext_isoforest(iso, path.c_str());
         #endif
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "deserialize_ext_isoforest",
-      *[](String path) {
+      [](String path) {
         ExtIsoForest iso;
 
         #ifdef _MSC_VER

data/ext/isotree/extconf.rb

@@ -1,6 +1,6 @@
 require "mkmf-rice"
 
-$CXXFLAGS += " -std=c++11 -D_USE_MERSENNE_TWISTER -D_ENABLE_CEREAL"
+$CXXFLAGS += " -std=c++17 -D_USE_MERSENNE_TWISTER -D_ENABLE_CEREAL"
 
 apple_clang = RbConfig::CONFIG["CC_VERSION_MESSAGE"] =~ /apple clang/i
 

data/lib/isotree/version.rb

@@ -1,3 +1,3 @@
 module IsoTree
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isotree
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
 description:
 email: andrew@ankane.org
 executables: []
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="