shaq_lib 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb132b1dbcc0e5a2bad94e9b8ec73f83bbad068e
-  data.tar.gz: c953f84542a7b4c89dd8c0afb096e0cb95ae892c
+  metadata.gz: c6983dfff11ad58d69b2ec28cf964e24cd7ce0ed
+  data.tar.gz: 77bf99e586699ff6563171382fbea1fbd341f7ce
 SHA512:
-  metadata.gz: 2a0820198df89944c0590054b8c291c3bf7c48d5952f79ea1cea81a74b34b0bebe1642bee16f13b497c9eb634e8c0b538dd08d6868e5f12aa1f7f1dec80ed952
-  data.tar.gz: a7aa47731d8ebf3a51a89c73c9e369e2853adbdc27e4ca0a0136da7b4e0da5690a51d1a7c26b593d3ddf9b49b13d6eaec29b1858c612f4993106f93cf2b03677
+  metadata.gz: cc9fe0259c78bb427323ac47b27644782c89d72e8ad5860c3655a20158b3bb8e29a73f3ef112dafc3d336725f6a0ab4766601b890f531564dd1357491a057708
+  data.tar.gz: c7666b414eadd48950542468fc2edd8bcccda592559b852579c9f341d77d35d287bf2c28178517588e21cdb9f6ec723239c03a067d85c7cd20983dfc8e7130ee

data/ext/shaq_lib/shaq_lib.c

@@ -3,22 +3,11 @@
 static VALUE kmers(VALUE klass, VALUE str, VALUE ksize)
 {
   long i = 0;
-  long j = 0;
   long k = NUM2LONG(ksize);
   long num_kmers = RSTRING_LEN(str) - k + 1;
 
-  char *c_str = RSTRING_PTR(str);
-
   for (i = 0; i < num_kmers; ++i) {
-    char substr[k+1];
-
-    for (j = 0; j < k; ++j) {
-      substr[j] = c_str[i+j];
-    }
-    substr[j] = '\0';
-
-    /* for this, put the length without the null char */
-    rb_yield(rb_str_new(substr, k));
+    rb_yield(rb_str_substr(str, i, k));
   }
 
   return str;
@@ -26,34 +15,35 @@ static VALUE kmers(VALUE klass, VALUE str, VALUE ksize)
 
 static VALUE submers(VALUE klass, VALUE str)
 {
-  long ksize = RSTRING_LEN(str) - 1;
-  long i = 0;
+  long strlen = RSTRING_LEN(str);
+  VALUE s1, s2;
 
-  char k1[ksize+1];
-  char k2[ksize+1];
-
-  char *c_str = RSTRING_PTR(str);
-
-  for (i = 0; i < ksize; ++i) {
-    k1[i] = c_str[i];
-    k2[i] = c_str[i+1];
-  }
-  k1[i] = '\0';
-  k2[i] = '\0';
-
-  VALUE k1_r = rb_str_new(k1, ksize);
-  VALUE k2_r = rb_str_new(k2, ksize);
+  s1 = rb_str_substr(str, 0, strlen-1);
+  s2 = rb_str_substr(str, 1, strlen-1);
 
   VALUE ary = rb_ary_new2(2);
-  rb_ary_push(ary, k1_r);
-  rb_ary_push(ary, k2_r);
+
+  rb_ary_push(ary, s1);
+  rb_ary_push(ary, s2);
 
   return ary;
 }
 
+/* static VALUE count(VALUE klass, VALUE ary) */
+/* { */
+/*   long len = RARRAY_LEN(ary); */
+
+/*   VALUE hash = rb_hash_new(); */
+
+/*   rb_hash_aset(hash, rb_str_new2("mykey"), rb_str_new2("myvalue")); */
+
+/*   return len; */
+/* } */
+
 void Init_shaq_lib(void)
 {
   VALUE ModuleShaqLib = rb_define_module("ShaqLib");
   rb_define_singleton_method(ModuleShaqLib, "kmers", kmers, 2);
   rb_define_singleton_method(ModuleShaqLib, "submers", submers, 1);
+  /* rb_define_singleton_method(ModuleShaqLib, "count", count, 1); */
 }

data/lib/shaq_lib/version.rb

@@ -1,3 +1,3 @@
 module ShaqLib
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaq_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryan Moore