midas-edge 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b32a1851488ba989ccc792af8922d1148f0c0f4585574821ea1759c908ad41
-  data.tar.gz: a4b9105e96a3407708d8e64a31c33e93dbbb8c9127c1f99f802044cdd4aa6818
+  metadata.gz: 5d4056b117cffbbbf0e5f9f97988789f9b2d53fc78753122ce7a03a45f532eff
+  data.tar.gz: f218bd317db9c4b3a792924e4312e35d84233bcb81198ea0a8f2a2551ef83452
 SHA512:
-  metadata.gz: 28149251ec92a2b24e07c7745ad0b759c23ff4d957fa56298d6c6a92384f798e0651086a524b3b95e7911ed5500405929ef6627059429d41f3126381b73e479e
-  data.tar.gz: 2146d83339cd7c466d053f82f937a44ceb16d609d31034cd740b90425601ea12861e9bd1377a8696c5655af929a8dc1201fae6e79bed3addfd96125931e2f674
+  metadata.gz: eede2417d3bce099af436eee2fb97497675c7056ae7adf5b496cfaf7e170533242a32f0dcda017c58847eb279af48f2dc1b61bff0bab81e0397250f8200518ed
+  data.tar.gz: 5b2bf24281919ae2f80f460bb7566bdf9d25b8bec145f2b43e59c8abb24a4f30e62c0d5ac2a8b6ecb8561d76e993a0facd6b0b2f177c3cee476daf2809bc4f7c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 (2021-05-17)
+
+- Updated to Rice 4
+- Dropped support for Ruby < 2.6
+
 ## 0.2.3 (2020-11-17)
 
 - Updated MIDAS to 1.1.2

data/NOTICE.txt

@@ -1,5 +1,5 @@
 Copyright 2020 Rui Liu (liurui39660) and Siddharth Bhatia (bhatiasiddharth)
-Copyright 2020 Andrew Kane
+Copyright 2020-2021 Andrew Kane
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -2,11 +2,11 @@
 
 [MIDAS](https://github.com/bhatiasiddharth/MIDAS) - edge stream anomaly detection - for Ruby
 
-[![Build Status](https://travis-ci.org/ankane/midas.svg?branch=master)](https://travis-ci.org/ankane/midas)
+[![Build Status](https://github.com/ankane/midas/workflows/build/badge.svg?branch=master)](https://github.com/ankane/midas/actions)
 
 ## Installation
 
-Add these lines to your application’s Gemfile:
+Add this line to your application’s Gemfile:
 
 ```ruby
 gem 'midas-edge'

data/ext/midas/ext.cpp

@@ -8,15 +8,10 @@
 #include <RelationalCore.hpp>
 
 // rice
-#include <rice/Module.hpp>
-#include <rice/String.hpp>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
-using Rice::Module;
-using Rice::String;
-using Rice::define_module;
-using Rice::define_class_under;
-
-void load_str(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& times, std::string input, bool directed) {
+void load_str(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& times, const std::string& input, bool directed) {
   int* input_ptr = (int*) input.data();
   size_t n = input.size() / sizeof(int);
 
@@ -41,8 +36,7 @@ void load_str(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& ti
 // load_data from main.cpp
 // modified to throw std::runtime_error when cannot find file
 // instead of exiting
-void load_file(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& times, std::string input_file, bool undirected)
-{
+void load_file(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& times, const std::string& input_file, bool undirected) {
   FILE* infile = fopen(input_file.c_str(), "r");
   if (infile == NULL) {
     throw std::runtime_error("Could not read file: " + input_file);
@@ -56,8 +50,7 @@ void load_file(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& t
       dst.push_back(d);
       times.push_back(t);
     }
-  }
-  else {
+  } else {
     while (fscanf(infile, "%d,%d,%d", &s, &d, &t) == 3) {
       src.push_back(s);
       dst.push_back(d);
@@ -67,12 +60,15 @@ void load_file(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& t
       times.push_back(t);
     }
   }
+
+  fclose(infile);
 }
 
 std::string fit_predict(std::vector<int>& src, std::vector<int>& dst, std::vector<int>& times, int num_rows, int num_buckets, float factor, float threshold, bool relations, int seed) {
   srand(seed);
   size_t n = src.size();
-  const auto result = new float[n];
+  std::vector<float> result;
+  result.reserve(n);
 
   if (!std::isnan(threshold)) {
     MIDAS::FilteringCore midas(num_rows, num_buckets, threshold, factor);
@@ -90,25 +86,26 @@ std::string fit_predict(std::vector<int>& src, std::vector<int>& dst, std::vecto
       result[i] = midas(src[i], dst[i], times[i]);
     }
   }
-  return std::string((char*) result, sizeof(float) / sizeof(char) * n);
+
+  // std::string copies data
+  return std::string((char*) result.data(), sizeof(float) / sizeof(char) * n);
 }
 
 extern "C"
-void Init_ext()
-{
-  Module rb_mMidas = define_module("Midas");
+void Init_ext() {
+  auto rb_mMidas = Rice::define_module("Midas");
 
-  define_class_under(rb_mMidas, "Detector")
-    .define_method(
+  Rice::define_class_under(rb_mMidas, "Detector")
+    .define_function(
       "_fit_predict_str",
-      *[](std::string input, int num_rows, int num_buckets, float factor, float threshold, bool relations, bool directed, int seed) {
+      [](const std::string& input, int num_rows, int num_buckets, float factor, float threshold, bool relations, bool directed, int seed) {
         std::vector<int> src, dst, times;
         load_str(src, dst, times, input, directed);
         return fit_predict(src, dst, times, num_rows, num_buckets, factor, threshold, relations, seed);
       })
-    .define_method(
+    .define_function(
       "_fit_predict_file",
-      *[](std::string input, int num_rows, int num_buckets, float factor, float threshold, bool relations, bool directed, int seed) {
+      [](const std::string& input, int num_rows, int num_buckets, float factor, float threshold, bool relations, bool directed, int seed) {
         std::vector<int> src, dst, times;
         load_file(src, dst, times, input, !directed);
         return fit_predict(src, dst, times, num_rows, num_buckets, factor, threshold, relations, seed);

data/ext/midas/extconf.rb

@@ -1,6 +1,6 @@
 require "mkmf-rice"
 
-$CXXFLAGS << " -std=c++11"
+$CXXFLAGS << " -std=c++17"
 
 midas = File.expand_path("../../vendor/MIDAS/src", __dir__)
 $INCFLAGS << " -I#{midas}"

data/lib/midas/version.rb

@@ -1,3 +1,3 @@
 module Midas
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midas-edge
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 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
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
@@ -38,64 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables: []
 extensions:
 - ext/midas/extconf.rb
@@ -128,14 +72,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Edge stream anomaly detection for Ruby