outliertree 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2c75c112439d30795757595ab3d34de3fbe80049f1b03e7168f0d1eed405417
-  data.tar.gz: e08ddb70bdf7b1be287b2986fc9364aa554db465fc2ef11b193b8f2adbd7af19
+  metadata.gz: fd25a8154076c68420d1908a6dcb29cf0b9d1fec972cbc24063c3c4cf6de63e4
+  data.tar.gz: a834dcb5791ee8083d7ae8721cb22abfb468e123ae78940143a33df0d2ef0f98
 SHA512:
-  metadata.gz: 8bf35fb1fad7023c10b5b7514281d6db9c57faacfa8fcbaaa5e39a2aefb43508f5ed1c9c4cac7dd7e96052fac5e0c6036de201223ec3df7241051426e67a349c
-  data.tar.gz: 36d0ffa632d62be0f2ebe73bb7cace6b4f31eddf6202f26afe8250f27a8bbf25606be9ca8e9b5c89a2596b3acdc0c7124cf039d7b5e9557902a08ae233416293
+  metadata.gz: 0ab3d03adf97e689d188a91ceb86b77fbe69bbc45ca64426f84ae93360df2cdd395f5c1b66d7d8f371d1212c4a615c2466bdb8d041ef60d200d092967bbd3341
+  data.tar.gz: eb60aee1c0bb479db304491c804209e9c3ea51a5d089c5c05b90f1490c0190339b7a8f7c8b64c20b82ffafa7853f8f3cce2493647d95f0d86cbc890df4226987

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.2 (2025-10-26)
+
+- Fixed error with Rice 4.7
+
 ## 0.4.1 (2025-04-23)
 
 - Updated OutlierTree to 1.10.0

data/ext/outliertree/ext.cpp

@@ -1,73 +1,83 @@
+#include <complex>
+#include <vector>
+
 // outliertree
 #include <outlier_tree.hpp>
 
+// fix warning
+#undef restrict
+
 // rice
 #include <rice/rice.hpp>
 #include <rice/stl.hpp>
 
 using Rice::Array;
 using Rice::Hash;
-using Rice::Module;
 using Rice::Object;
 using Rice::String;
 using Rice::Symbol;
-using Rice::define_class_under;
-using Rice::define_module;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<typename T>
-  class To_Ruby<std::vector<T>>
-  {
+  class To_Ruby<std::vector<T>> {
   public:
-    VALUE convert(std::vector<T> const & x)
-    {
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
+    VALUE convert(std::vector<T> const & x) {
       auto a = rb_ary_new2(x.size());
       for (const auto& v : x) {
         rb_ary_push(a, To_Ruby<T>().convert(v));
       }
       return a;
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
-  class To_Ruby<std::vector<signed char>>
-  {
+  class To_Ruby<std::vector<signed char>> {
   public:
-    VALUE convert(std::vector<signed char> const & x)
-    {
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
+    VALUE convert(std::vector<signed char> const & x) {
       auto a = rb_ary_new2(x.size());
       for (const auto& v : x) {
         rb_ary_push(a, To_Ruby<signed char>().convert(v));
       }
       return a;
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
-  struct Type<std::vector<signed char>>
-  {
-    static bool verify()
-    {
+  struct Type<std::vector<signed char>> {
+    static bool verify() {
       return true;
     }
   };
 
   template<>
-  struct Type<ColType>
-  {
-    static bool verify()
-    {
+  struct Type<ColType> {
+    static bool verify() {
       return true;
     }
   };
 
   template<>
-  class To_Ruby<ColType>
-  {
+  class To_Ruby<ColType> {
   public:
-    VALUE convert(ColType const & x)
-    {
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
+    VALUE convert(ColType const & x) {
       switch (x) {
         case Numeric: return Symbol("numeric");
         case Categorical: return Symbol("categorical");
@@ -76,23 +86,26 @@ namespace Rice::detail
       }
       throw std::runtime_error("Unknown column type");
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
-  struct Type<SplitType>
-  {
-    static bool verify()
-    {
+  struct Type<SplitType> {
+    static bool verify() {
       return true;
     }
   };
 
   template<>
-  class To_Ruby<SplitType>
-  {
+  class To_Ruby<SplitType> {
   public:
-    VALUE convert(SplitType const & x)
-    {
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
+    VALUE convert(SplitType const & x) {
       switch (x) {
         case LessOrEqual: return Symbol("less_or_equal");
         case Greater: return Symbol("greater");
@@ -107,16 +120,18 @@ namespace Rice::detail
       }
       throw std::runtime_error("Unknown split type");
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
-}
+} // namespace Rice::detail
 
 extern "C"
-void Init_ext()
-{
-  Module rb_mOutlierTree = define_module("OutlierTree");
-  Module rb_mExt = define_module_under(rb_mOutlierTree, "Ext");
+void Init_ext() {
+  Rice::Module rb_mOutlierTree = Rice::define_module("OutlierTree");
+  Rice::Module rb_mExt = Rice::define_module_under(rb_mOutlierTree, "Ext");
 
-  define_class_under<Cluster>(rb_mExt, "Cluster")
+  Rice::define_class_under<Cluster>(rb_mExt, "Cluster")
     .define_method("upper_lim", [](Cluster& self) { return self.upper_lim; })
     .define_method("display_lim_high", [](Cluster& self) { return self.display_lim_high; })
     .define_method("perc_below", [](Cluster& self) { return self.perc_below; })
@@ -133,7 +148,7 @@ void Init_ext()
     .define_method("has_na_branch", [](Cluster& self) { return self.has_NA_branch; })
     .define_method("col_num", [](Cluster& self) { return self.col_num; });
 
-  define_class_under<ClusterTree>(rb_mExt, "ClusterTree")
+  Rice::define_class_under<ClusterTree>(rb_mExt, "ClusterTree")
     .define_method("parent_branch", [](ClusterTree& self) { return self.parent_branch; })
     .define_method("parent", [](ClusterTree& self) { return self.parent; })
     .define_method("all_branches", [](ClusterTree& self) { return self.all_branches; })
@@ -143,7 +158,7 @@ void Init_ext()
     .define_method("split_subset", [](ClusterTree& self) { return self.split_subset; })
     .define_method("split_lev", [](ClusterTree& self) { return self.split_lev; });
 
-  define_class_under<ModelOutputs>(rb_mExt, "ModelOutputs")
+  Rice::define_class_under<ModelOutputs>(rb_mExt, "ModelOutputs")
     .define_method("outlier_scores_final", [](ModelOutputs& self) { return self.outlier_scores_final; })
     .define_method("outlier_columns_final", [](ModelOutputs& self) { return self.outlier_columns_final; })
     .define_method("outlier_clusters_final", [](ModelOutputs& self) { return self.outlier_clusters_final; })

data/lib/outliertree/model.rb

@@ -1,11 +1,20 @@
 module OutlierTree
   class Model
     def initialize(
-      max_depth: 4, min_gain: 0.01, z_norm: 2.67, z_outlier: 8.0, pct_outliers: 0.01,
-      min_size_numeric: 25, min_size_categ: 50, categ_split: "binarize", categ_outliers: "tail",
-      numeric_split: "raw", follow_all: false, gain_as_pct: true, nthreads: -1
+      max_depth: 4,
+      min_gain: 0.01,
+      z_norm: 2.67,
+      z_outlier: 8.0,
+      pct_outliers: 0.01,
+      min_size_numeric: 25,
+      min_size_categ: 50,
+      categ_split: "binarize",
+      categ_outliers: "tail",
+      numeric_split: "raw",
+      follow_all: false,
+      gain_as_pct: true,
+      nthreads: -1
     )
-
       # TODO validate values
       @max_depth = max_depth
       @min_gain = min_gain

data/lib/outliertree/version.rb

@@ -1,3 +1,3 @@
 module OutlierTree
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outliertree
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Kane
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Explainable outlier/anomaly detection for Ruby
 test_files: []