edlib 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9cf154ed1668d991a4476b501981a245a9b758950699fcba36062f73d312dd
-  data.tar.gz: 716d869b8fc5dc870b9bbcdf3bfb2bceb99567b4e22197214cd99a948e850b86
+  metadata.gz: 41a9c8bdf279436f3ca2da4840a62d875c62ab5630c0411c7751446dd7c6db48
+  data.tar.gz: 62436d4433d308d71e76ec5095a57d85c1da88a3a6addf1531cb00e65ed37d72
 SHA512:
-  metadata.gz: b32f9755d963c17fba0c1b76364f9969f3a84fdb5c5e123020b02733699b313ff4d46e6203956640ad795c5686b0d00ff914645cd68a711add89e9d8250430eb
-  data.tar.gz: a776f6b8c67c9f9a7f16440cd8630688f2bba4bca8822e2b76b32f4b6f2095cf31ce259dbc92b6ea923503403c135becd85a8e7e953caa52a4c51df16e2bcbfa
+  metadata.gz: 9afed6c6ab4e8a59906a98441c464f093ad45a4b92464b0efba67166d925cf0243e4e484b063264940a2afb4867a181deb7dc55733cfb8ae0f082b472f47f286
+  data.tar.gz: c472407d2aa613f12c75c554d525c3adafa21f689921c82e9fac3d43395ce3759f5240fafa06fe4c6985bac7d6ba5bf42944c746e55c0584b067ba57d8b455fb

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/edlib.svg)](https://badge.fury.io/rb/edlib)
 [![test](https://github.com/kojix2/ruby-edlib/actions/workflows/ci.yml/badge.svg)](https://github.com/kojix2/ruby-edlib/actions/workflows/ci.yml)
+[![DOI](https://zenodo.org/badge/559318048.svg)](https://zenodo.org/badge/latestdoi/559318048)
 
 [Edlib](https://github.com/Martinsos/edlib) - A lightweight and super fast C/C++ library for sequence alignment using edit distance
 

data/ext/edlib/edlibext.c

@@ -1,58 +1,72 @@
 #include "ruby.h"
-#include "edlib.h"
+#include "edlibext.h"
 
 VALUE mEdlib;
 VALUE cAligner;
-EdlibEqualityPair *eqpairs;
 
-static size_t config_memsize(const void *ptr);
-static void config_free(void *ptr);
+// Aligner class
 
 static const rb_data_type_t config_type = {
-	.wrap_struct_name = "EdlibAlignConfig",
+	.wrap_struct_name = "RbAlignConfig",
 	.function = {
-		.dfree = config_free,
-		.dsize = config_memsize,
+		.dfree = aligner_config_free,
+		.dsize = aligner_config_memsize,
 	},
 	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 static VALUE
-config_allocate(VALUE klass)
+aligner_config_allocate(VALUE klass)
 {
-	EdlibAlignConfig *config;
-	VALUE obj = TypedData_Make_Struct(klass, EdlibAlignConfig,
-									  &config_type, config);
+	RbAlignConfig *aligner_config;
+
+	VALUE obj = TypedData_Make_Struct(klass, RbAlignConfig, &config_type, aligner_config);
+	aligner_config->config = (EdlibAlignConfig *)malloc(sizeof(EdlibAlignConfig));
+	aligner_config->equalityPairs = NULL;
 	return obj;
 }
 
 static void
-config_free(void *ptr)
+aligner_config_free(void *ptr)
 {
-	if (eqpairs != NULL)
+	RbAlignConfig *aligner_config = ptr;
+	if (aligner_config->config != NULL)
 	{
-		free(eqpairs);
-		eqpairs = NULL;
+		free(aligner_config->config);
 	}
-	xfree(ptr);
+	if (aligner_config->equalityPairs != NULL)
+	{
+		free(aligner_config->equalityPairs);
+	}
+
+	free(ptr);
 }
 
 static size_t
-config_memsize(const void *ptr)
+aligner_config_memsize(const void *ptr)
 {
-	const EdlibAlignConfig *config = ptr;
-	return sizeof(ptr) + 2 * sizeof(char) * (config->additionalEqualitiesLength);
+	const RbAlignConfig *aligner_config = ptr;
+	return sizeof(ptr) + sizeof(aligner_config->config) + 2 * sizeof(char) * aligner_config->config->additionalEqualitiesLength;
 }
 
 static EdlibAlignConfig *
-get_config(VALUE self)
+aligner_get_config(VALUE self)
 {
-	EdlibAlignConfig *ptr = NULL;
-	TypedData_Get_Struct(self, EdlibAlignConfig, &config_type, ptr);
+	RbAlignConfig *aligner_config = NULL;
+	TypedData_Get_Struct(self, RbAlignConfig, &config_type, aligner_config);
+	return aligner_config->config;
+}
 
-	return ptr;
+static EdlibEqualityPair *
+aligner_get_equalityPairs(VALUE self)
+{
+	RbAlignConfig *aligner_config = NULL;
+	TypedData_Get_Struct(self, RbAlignConfig, &config_type, aligner_config);
+	return aligner_config->equalityPairs;
 }
 
+// Config
+
 static VALUE
 get_k(EdlibAlignConfig *config)
 {
@@ -62,7 +76,7 @@ get_k(EdlibAlignConfig *config)
 static VALUE
 aligner_get_k(VALUE self)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return get_k(config);
 }
 
@@ -76,7 +90,7 @@ set_k(EdlibAlignConfig *config, VALUE k)
 static VALUE
 aligner_set_k(VALUE self, VALUE k)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return set_k(config, k);
 }
 
@@ -99,7 +113,7 @@ get_mode(EdlibAlignConfig *config)
 static VALUE
 aligner_get_mode(VALUE self)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return get_mode(config);
 }
 
@@ -148,7 +162,7 @@ set_mode(EdlibAlignConfig *config, VALUE mode)
 static VALUE
 aligner_set_mode(VALUE self, VALUE mode)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return set_mode(config, mode);
 }
 
@@ -171,7 +185,7 @@ get_task(EdlibAlignConfig *config)
 static VALUE
 aligner_get_task(VALUE self)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return get_task(config);
 }
 
@@ -220,7 +234,7 @@ set_task(EdlibAlignConfig *config, VALUE task)
 static VALUE
 aligner_set_task(VALUE self, VALUE task)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return set_task(config, task);
 }
 
@@ -244,18 +258,19 @@ get_additional_equalities(EdlibAlignConfig *config)
 static VALUE
 aligner_get_additional_equalities(VALUE self)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	return get_additional_equalities(config);
 }
 
 static VALUE
-set_additional_equalities(EdlibAlignConfig *config, VALUE equalities)
+set_additional_equalities(EdlibAlignConfig *config, EdlibEqualityPair *eqpairs, VALUE equalities)
 {
 	Check_Type(equalities, T_ARRAY);
 	int len = RARRAY_LEN(equalities);
 	if (len == 0)
 	{
-		if(eqpairs != NULL) {
+		if (eqpairs != NULL)
+		{
 			free(eqpairs);
 			eqpairs = NULL;
 		}
@@ -312,14 +327,15 @@ set_additional_equalities(EdlibAlignConfig *config, VALUE equalities)
 static VALUE
 aligner_set_additional_equalities(VALUE self, VALUE equalities)
 {
-	EdlibAlignConfig *config = get_config(self);
-	return set_additional_equalities(config, equalities);
+	EdlibAlignConfig *config = aligner_get_config(self);
+	EdlibEqualityPair *eqpairs = aligner_get_equalityPairs(self);
+	return set_additional_equalities(config, eqpairs, equalities);
 }
 
 static VALUE
 aligner_config_hash(VALUE self)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 
 	VALUE hash = rb_hash_new();
 
@@ -332,16 +348,17 @@ aligner_config_hash(VALUE self)
 }
 
 static VALUE
-aligner_initialize(VALUE self, VALUE k, VALUE mode, VALUE task, VALUE additional_equalities)
+aligner_initialize_raw(VALUE self, VALUE k, VALUE mode, VALUE task, VALUE additional_equalities)
 {
-	EdlibAlignConfig *config = get_config(self);
-
+	EdlibAlignConfig *config = aligner_get_config(self);
+	EdlibEqualityPair *eqpairs = aligner_get_equalityPairs(self);
 	config->k = NUM2INT(k);
 	set_mode(config, mode);
 	set_task(config, task);
+	
 	if (additional_equalities != Qnil)
 	{
-		set_additional_equalities(config, additional_equalities);
+		set_additional_equalities(config, eqpairs, additional_equalities);
 	}
 	else
 	{
@@ -355,7 +372,7 @@ aligner_initialize(VALUE self, VALUE k, VALUE mode, VALUE task, VALUE additional
 static VALUE
 aligner_align(VALUE self, VALUE query, VALUE target)
 {
-	EdlibAlignConfig *config = get_config(self);
+	EdlibAlignConfig *config = aligner_get_config(self);
 	if (!config)
 	{
 		rb_raise(rb_eRuntimeError, "config is NULL");
@@ -427,8 +444,8 @@ void Init_edlibext(void)
 {
 	mEdlib = rb_define_module("Edlib");
 	cAligner = rb_define_class_under(mEdlib, "Aligner", rb_cObject);
-	rb_define_alloc_func(cAligner, config_allocate);
-	rb_define_private_method(cAligner, "initialize_raw", aligner_initialize, 4);
+	rb_define_alloc_func(cAligner, aligner_config_allocate);
+	rb_define_private_method(cAligner, "initialize_raw", aligner_initialize_raw, 4);
 	rb_define_method(cAligner, "k", aligner_get_k, 0);
 	rb_define_method(cAligner, "k=", aligner_set_k, 1);
 	rb_define_method(cAligner, "mode", aligner_get_mode, 0);

data/ext/edlib/edlibext.h

@@ -0,0 +1,42 @@
+#ifndef EDLIBEXT_H
+#define EDLIBEXT_H
+
+#include "edlib.h"
+
+typedef struct
+{
+    EdlibAlignConfig *config;
+    EdlibEqualityPair *equalityPairs;
+} RbAlignConfig;
+
+static VALUE aligner_config_allocate(VALUE klass);
+static size_t aligner_config_memsize(const void *ptr);
+static void aligner_config_free(void *ptr);
+
+static EdlibAlignConfig *aligner_get_config(VALUE self);
+static EdlibEqualityPair *aligner_get_equalityPairs(VALUE self);
+
+static VALUE get_k(EdlibAlignConfig *config);
+static VALUE aligner_get_k(VALUE self);
+static VALUE set_k(EdlibAlignConfig *config, VALUE k);
+static VALUE aligner_set_k(VALUE self, VALUE k);
+static VALUE get_mode(EdlibAlignConfig *config);
+static VALUE aligner_get_mode(VALUE self);
+static VALUE set_mode(EdlibAlignConfig *config, VALUE mode);
+static VALUE aligner_set_mode(VALUE self, VALUE mode);
+static VALUE get_task(EdlibAlignConfig *config);
+static VALUE aligner_get_task(VALUE self);
+static VALUE set_task(EdlibAlignConfig *config, VALUE task);
+static VALUE aligner_set_task(VALUE self, VALUE task);
+static VALUE get_additional_equalities(EdlibAlignConfig *config);
+static VALUE aligner_get_additional_equalities(VALUE self);
+static VALUE set_additional_equalities(EdlibAlignConfig *config, EdlibEqualityPair *eqpairs, VALUE equalities);
+static VALUE aligner_set_additional_equalities(VALUE self, VALUE equalities);
+
+static VALUE aligner_config_hash(VALUE self);
+
+static VALUE aligner_initialize_raw(VALUE self, VALUE k, VALUE mode, VALUE task, VALUE additional_equalities);
+static VALUE aligner_align(VALUE self, VALUE query, VALUE target);
+void Init_edlibext(void);
+
+#endif // EDLIBEXT_H

data/lib/edlib/version.rb

@@ -1,3 +1,3 @@
 module Edlib
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edlib
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies: []
 description: 'Lightweight, super fast C/C++ library for sequence alignment using edit
   (Levenshtein) distance. '
@@ -23,6 +23,7 @@ files:
 - ext/edlib/edlib.cpp
 - ext/edlib/edlib.h
 - ext/edlib/edlibext.c
+- ext/edlib/edlibext.h
 - ext/edlib/extconf.rb
 - lib/edlib.rb
 - lib/edlib/version.rb