visualize_helper 0.0.10.28 → 0.0.10.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4100947c618bdc4518f2f89923495306bfbecfb
-  data.tar.gz: 04e6517f9f601470538a1f11fc706df5fa593752
+  metadata.gz: 2081c92edf54016d0da84ba7aa9ffff919a91047
+  data.tar.gz: 5658ac102b330baeeb445893283cf0342cd3416f
 SHA512:
-  metadata.gz: a86285f6896472865180c8ce1e303eb2d4752698aad4a0e55744bd1ebcf5058409294c8852f576b82581903471dcbd8b74414a57cc44277951ac179c1831c9cc
-  data.tar.gz: 7d534c2c3bf23c1d72b329a39ec105124a02feb129dee77adee43969f2e73a9011c8df3266070d0fd0c5d87350ca9781e1d3f92858abe2e7588b7d0b024312c1
+  metadata.gz: 8dd622af5cb8ee68bac527d43e3c064f6d50781756efdf195e42e8a3c83a847a061504d93ae2ad03c672f72d563898438451da59c48ef6cefa1610284220b152
+  data.tar.gz: 96493a67b86f2c5fae8dd8529a8001aade1c5e72c63d71e2ec911b31b9b41014fe2bd9b91cde9cad736eff2ccf310e96419ae6ac2cc80e91dd83a107fc46a2af

data/README.md

@@ -24,7 +24,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/visualize_helper/fork )
+1. Fork it ( https://github.com/raphaottoni/visualize_helper/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/ext/visualize_helper/visualize_helper.c

@@ -43,32 +43,41 @@ static VALUE uniq(VALUE sorted_array){
 }
 
 //static VALUE join(VALUE self, VALUE strings){
-static VALUE join(VALUE strings){
+static char* join(VALUE strings){
 
   // initial variables
   char* joined;
   int strings_size = RARRAY_LEN(strings);
   int string_size;
+  int string_total_size = 0;
   VALUE string_temp;
   VALUE result;
+  //FILE *f = fopen("file.txt", "w");
   
-  string_temp = rb_ary_entry(strings,0);
+
+
+  // calculate the exact size of malloc
+  for ( int i = 0; i < strings_size; i++) {
+      string_temp = rb_ary_entry(strings,i);
+      string_total_size += strlen(StringValuePtr(string_temp));
+  }
+
+  joined = (char*) malloc( string_total_size +  strings_size + 1);
   string_size = strlen(StringValuePtr(string_temp));
-  joined = (char*) malloc(strings_size + 1);
   sprintf(joined,"%s", StringValuePtr(string_temp));
 
+
   for (int i = 1 ; i < strings_size; i++) {
     
     string_temp = rb_ary_entry(strings,i);
-    string_size = strlen(StringValuePtr(string_temp));
-      
-    joined = (char*)  realloc(joined, string_size + strlen(joined) + 1);
     sprintf(joined,"%s,%s", joined, StringValuePtr(string_temp));
 
   }
-  result = rb_str_new2(joined);  
-  free(joined);
-  return  result;
+  //result = rb_str_new2(joined);  
+  //free(joined);
+  //fprintf(f,"%s\n",joined);
+  //fclose(f);
+  return  joined;
 }
 
 
@@ -225,8 +234,8 @@ static VALUE remove_entry_from_array (VALUE strings, char* element){
 static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE aggr, VALUE boxes, VALUE links, VALUE dict, VALUE type_agroupment, VALUE value)
 {
 
-  VALUE seq_key_result;
-  VALUE prox_key_result;
+  char* seq_key_result;
+  char* prox_key_result;
   // Initial Variables
   int length_seq_sorted;
   int length_prox_sorted;
@@ -283,11 +292,11 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE ag
     seq_key_result = join(seq_key);
 
     //
-    boxes_period_value = rb_hash_aref(rb_ary_entry(boxes,period),seq_key_result);
+    boxes_period_value = rb_hash_aref(rb_ary_entry(boxes,period),rb_str_new2(seq_key_result));
     if (boxes_period_value  == Qnil) {
-      rb_hash_aset(rb_ary_entry(boxes,period),seq_key_result, value);
+      rb_hash_aset(rb_ary_entry(boxes,period),rb_str_new2(seq_key_result), value);
     }else {
-      rb_hash_aset(rb_ary_entry(boxes,period),seq_key_result,INT2FIX(FIX2INT(boxes_period_value) + FIX2INT(value)));
+      rb_hash_aset(rb_ary_entry(boxes,period),rb_str_new2(seq_key_result),INT2FIX(FIX2INT(boxes_period_value) + FIX2INT(value)));
     }    
 
     prox = period +1;
@@ -327,8 +336,8 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE ag
       prox_s = ( prox == 0 ) ? (char*) malloc(1)  : (char*) malloc(floor(log10(abs(prox))) + 1);
       sprintf(period_s,"%d",period);
       sprintf(prox_s,"%d",prox);
-      link_key =  (char*) malloc( strlen(period_s) + strlen(StringValuePtr(seq_key_result)) + strlen(prox_s) + strlen(StringValuePtr(prox_key_result)) + 3);
-      sprintf(link_key,"%s_%s;%s_%s", period_s,StringValuePtr(seq_key_result),prox_s,StringValuePtr(prox_key_result));
+      link_key =  (char*) malloc( strlen(period_s) + strlen(seq_key_result) + strlen(prox_s) + strlen(prox_key_result) + 3);
+      sprintf(link_key,"%s_%s;%s_%s", period_s,seq_key_result,prox_s,prox_key_result);
 
       links_period_value = rb_hash_aref(rb_ary_entry(links,period),rb_str_new2(link_key));
       if (links_period_value  == Qnil) {
@@ -337,15 +346,14 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE ag
         rb_hash_aset(rb_ary_entry(links,period),rb_str_new2(link_key), INT2FIX(FIX2INT(links_period_value) + FIX2INT(value)));
       }    
 
-
+      free(period_s); 
+      free(prox_s); 
+      free(link_key); 
 
     }//end prox < aggr_size
 
   }// end for 
 
-  VALUE ab = rb_ary_new();
-  rb_ary_push(ab,1);
-  rb_ary_push(ab,2);
   //return result_final;
   return Qnil;
 }  
@@ -368,5 +376,5 @@ void Init_visualize_helper(void) {
   rb_define_singleton_method(mVisualizeHelper, "sort_uniq", sort_uniq, 2 );
 
   // Register the method sort
-  rb_define_singleton_method(mVisualizeHelper, "join", join, 1 );
+  //rb_define_singleton_method(mVisualizeHelper, "join", join, 1 );
 }

data/lib/visualize_helper/version.rb

@@ -1,3 +1,3 @@
 module VisualizeHelper
-  VERSION = "0.0.10.28"
+  VERSION = "0.0.10.29"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualize_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.10.28
+  version: 0.0.10.29
 platform: ruby
 authors:
 - Raphael Ottoni Santiago Machado de Faria