midas-edge 0.2.1 → 0.3.2

data/vendor/MIDAS/src/RelationalCore.hpp

@@ -17,21 +17,19 @@
 #pragma once
 
 #include <cmath>
-#include <algorithm>
 
-#include "EdgeHash.hpp"
-#include "NodeHash.hpp"
+#include "CountMinSketch.hpp"
 
 namespace MIDAS {
 struct RelationalCore {
-	int timestampCurrent = 1;
+	int timestamp = 1;
 	const float factor;
 	int* const indexEdge; // Pre-compute the index to-be-modified, thanks to the same structure of CMSs
 	int* const indexSource;
 	int* const indexDestination;
-	EdgeHash numCurrentEdge, numTotalEdge;
-	NodeHash numCurrentSource, numTotalSource;
-	NodeHash numCurrentDestination, numTotalDestination;
+	CountMinSketch numCurrentEdge, numTotalEdge;
+	CountMinSketch numCurrentSource, numTotalSource;
+	CountMinSketch numCurrentDestination, numTotalDestination;
 
 	RelationalCore(int numRow, int numColumn, float factor = 0.5):
 		factor(factor),
@@ -56,19 +54,19 @@ struct RelationalCore {
 	}
 
 	float operator()(int source, int destination, int timestamp) {
-		if (timestamp > timestampCurrent) {
+		if (this->timestamp < timestamp) {
 			numCurrentEdge.MultiplyAll(factor);
 			numCurrentSource.MultiplyAll(factor);
 			numCurrentDestination.MultiplyAll(factor);
-			timestampCurrent = timestamp;
+			this->timestamp = timestamp;
 		}
-		numCurrentEdge.Hash(source, destination, indexEdge);
+		numCurrentEdge.Hash(indexEdge, source, destination);
 		numCurrentEdge.Add(indexEdge);
 		numTotalEdge.Add(indexEdge);
-		numCurrentSource.Hash(source, indexSource);
+		numCurrentSource.Hash(indexSource, source);
 		numCurrentSource.Add(indexSource);
 		numTotalSource.Add(indexSource);
-		numCurrentDestination.Hash(destination, indexDestination);
+		numCurrentDestination.Hash(indexDestination, destination);
 		numCurrentDestination.Add(indexDestination);
 		numTotalDestination.Add(indexDestination);
 		return std::max({
@@ -78,4 +76,4 @@ struct RelationalCore {
 		});
 	}
 };
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midas-edge
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-06-08 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
+description:
+email: andrew@ankane.org
 executables: []
 extensions:
 - ext/midas/extconf.rb
@@ -107,21 +51,21 @@ files:
 - README.md
 - ext/midas/ext.cpp
 - ext/midas/extconf.rb
+- ext/midas/numo.hpp
 - lib/midas-edge.rb
 - lib/midas/detector.rb
 - lib/midas/version.rb
 - vendor/MIDAS/LICENSE
 - vendor/MIDAS/README.md
-- vendor/MIDAS/src/EdgeHash.hpp
+- vendor/MIDAS/src/CountMinSketch.hpp
 - vendor/MIDAS/src/FilteringCore.hpp
-- vendor/MIDAS/src/NodeHash.hpp
 - vendor/MIDAS/src/NormalCore.hpp
 - vendor/MIDAS/src/RelationalCore.hpp
 homepage: https://github.com/ankane/midas
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,15 +73,15 @@ 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.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Edge stream anomaly detection for Ruby
 test_files: []

data/vendor/MIDAS/src/NodeHash.hpp

@@ -1,104 +0,0 @@
-// -----------------------------------------------------------------------------
-// Copyright 2020 Rui Liu (liurui39660) and Siddharth Bhatia (bhatiasiddharth)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// -----------------------------------------------------------------------------
-
-#pragma once
-
-#include <algorithm>
-
-namespace MIDAS {
-struct NodeHash {
-	// Fields
-	// --------------------------------------------------------------------------------
-
-	const int r, c;
-	const int lenData;
-	int* const param1;
-	int* const param2;
-	float* const data;
-	constexpr static float infinity = std::numeric_limits<float>::infinity();
-
-	// Methods
-	// --------------------------------------------------------------------------------
-
-	NodeHash() = delete;
-	NodeHash& operator=(const NodeHash& b) = delete;
-
-	NodeHash(int numRow, int numColumn):
-		r(numRow),
-		c(numColumn),
-		lenData(r * c),
-		param1(new int[r]),
-		param2(new int[r]),
-		data(new float[lenData]) {
-		for (int i = 0; i < r; i++) {
-			param1[i] = rand() + 1; // ×0 is not a good idea, see Hash()
-			param2[i] = rand();
-		}
-		std::fill(data, data + lenData, 0);
-	}
-
-	NodeHash(const NodeHash& b):
-		r(b.r),
-		c(b.c),
-		lenData(b.lenData),
-		param1(new int[r]),
-		param2(new int[r]),
-		data(new float[lenData]) {
-		std::copy(b.param1, b.param1 + r, param1);
-		std::copy(b.param2, b.param2 + r, param2);
-		std::copy(b.data, b.data + lenData, data);
-	}
-
-	~NodeHash() {
-		delete[] param1;
-		delete[] param2;
-		delete[] data;
-	}
-
-	void ClearAll(float with = 0) const {
-		std::fill(data, data + lenData, with);
-	}
-
-	void MultiplyAll(float by) const {
-		std::for_each(data, data + lenData, [&](float& a) { a *= by; }); // Magic of vectorization
-	}
-
-	void Hash(int a, int* indexOut) const {
-		for (int i = 0; i < r; i++) {
-			indexOut[i] = (a * param1[i] + param2[i]) % c;
-			indexOut[i] += i * c + (indexOut[i] < 0 ? c : 0);
-		}
-	}
-
-	float operator()(const int* index) const {
-		float least = infinity;
-		for (int i = 0; i < r; i++)
-			least = std::min(least, data[index[i]]);
-		return least;
-	}
-
-	float Assign(const int* index, float to) const {
-		for (int i = 0; i < r; i++)
-			data[index[i]] = to;
-		return to;
-	}
-
-	void Add(const int* index, float by = 1) const {
-		for (int i = 0; i < r; i++)
-			data[index[i]] += by;
-	}
-};
-}