visualize_helper 0.0.10.29 → 0.0.10.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2081c92edf54016d0da84ba7aa9ffff919a91047
-  data.tar.gz: 5658ac102b330baeeb445893283cf0342cd3416f
+  metadata.gz: 9a43f8362f89d2ee8afeb4b22eacedb3d793fdce
+  data.tar.gz: 5f319c533271e960fc3d8d91c34f53f8747624dd
 SHA512:
-  metadata.gz: 8dd622af5cb8ee68bac527d43e3c064f6d50781756efdf195e42e8a3c83a847a061504d93ae2ad03c672f72d563898438451da59c48ef6cefa1610284220b152
-  data.tar.gz: 96493a67b86f2c5fae8dd8529a8001aade1c5e72c63d71e2ec911b31b9b41014fe2bd9b91cde9cad736eff2ccf310e96419ae6ac2cc80e91dd83a107fc46a2af
+  metadata.gz: a097988bed352e2e1ac6619a27420dbb75c166b93931aecb634f23d1887a0c568e60f27a87f7aff933b55d1b4502faa760fa374f4da48e7efddfb30cd3040d93
+  data.tar.gz: 0f2bf89d43064f67439042d9af694e2fe55972014b114a3e835cbae4f04131e786e9d45cc62d26b945481cfba0c2bcc916fff3e1dec692fc970fa85f976d0bc5

data/ext/visualize_helper/visualize_helper.c

@@ -4,6 +4,19 @@
 #include <stdio.h>
 #include <math.h>
 
+void RemoveSpaces(char* source)
+{
+  char* i = source;
+  char* j = source;
+  while(*j != 0)
+  {
+    *i = *j++;
+    if(*i != ' ')
+      i++;
+  }
+  *i = 0;
+}
+
 
 int myCompare (const void * a, const void * b ) {
     const char *pa = *(const char**)a;
@@ -62,8 +75,10 @@ static char* join(VALUE strings){
       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(string_total_size +strings_size + 1);
+  string_temp = rb_ary_entry(strings,0);
+  //string_size = strlen(StringValuePtr(string_temp));
   sprintf(joined,"%s", StringValuePtr(string_temp));
 
 
@@ -73,6 +88,7 @@ static char* join(VALUE strings){
     sprintf(joined,"%s,%s", joined, StringValuePtr(string_temp));
 
   }
+  strcat(joined,"\0");
   //result = rb_str_new2(joined);  
   //free(joined);
   //fprintf(f,"%s\n",joined);
@@ -85,7 +101,7 @@ static char* join(VALUE strings){
 // Receive  an array of unsorted strings with repeated strings and return a single a sorted array with unique elementes or with all
 // strings = array of strings
 // unique =  0 or 1  if want to call unique or not
-static VALUE sort_uniq(VALUE self, VALUE strings, int unique)
+static VALUE sort_uniq(VALUE strings, int unique)
 {
     int strings_size = RARRAY_LEN(strings);
     const char *input[strings_size];
@@ -231,7 +247,7 @@ static VALUE remove_entry_from_array (VALUE strings, char* element){
 }
 
 // Function to generate the boxes and links of each trajectory
-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)
+static VALUE generate_boxes_and_links(VALUE self, VALUE aggr, VALUE boxes, VALUE links, VALUE dict, VALUE type_agroupment, VALUE value)
 {
 
   char* seq_key_result;
@@ -250,9 +266,10 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE ag
   int aggr_prox_size;
   int prox;
   int aggr_size = RARRAY_LEN(aggr);
-  char* link_key;
+  char* link_key = (char*) malloc(1000);
   char* period_s;
   char* prox_s;
+  //FILE *f = fopen("/tmp/file.txt", "a");
 
   for(int period = 0; period < aggr_size; period++ ){
      seq_key = rb_ary_new();
@@ -276,10 +293,10 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE ag
     // agroup by unique or not
     if ( strcmp(StringValuePtr(type_agroupment),"s") == 0 ) {
       //sort with uniq 
-      seq_key = sort_uniq(self,seq_key,1);
+      seq_key = sort_uniq(seq_key,1);
     }else{
       //sort without uniq
-      seq_key = sort_uniq(self,seq_key,0);
+      seq_key = sort_uniq(seq_key,0);
     }
 
     // if there is "no-event" and other one selected, remove the "no-event"
@@ -315,15 +332,16 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE min, VALUE max, VALUE ag
        // agroup by unique or not
       if ( strcmp(StringValuePtr(type_agroupment),"n") == 0 ) {
         //sort with uniq
-        prox_key = sort_uniq(self,prox_key,1);
-      }else{
-        //sort without uniq
-        prox_key = prox_key;
+        prox_key = sort_uniq(prox_key,1);
       }
+      //else{
+      //  //sort without uniq
+      //  prox_key = prox_key;
+      //}
 
   //    
       // if there is "no-event" and other one selected, remove the "no-event"
-      length_prox_sorted  =  (strcmp(StringValuePtr(type_agroupment),"n") == 0 ) ? RARRAY_LEN(prox_key)  : RARRAY_LEN(sort_uniq(self,prox_key,1)) ;
+      length_prox_sorted  =  (strcmp(StringValuePtr(type_agroupment),"n") == 0 ) ? RARRAY_LEN(prox_key)  : RARRAY_LEN(sort_uniq(prox_key,1)) ;
       if (length_prox_sorted != 1) {
         prox_key = remove_entry_from_array(prox_key,"M-3");
       }
@@ -336,8 +354,16 @@ 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(seq_key_result) + strlen(prox_s) + strlen(prox_key_result) + 3);
+      //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);
+      RemoveSpaces(link_key);
+      
+      //fprintf(f,"Composicao key:\n");
+      //fprintf(f,"period_s: %s\n",period_s);
+      //fprintf(f,"seq_key: %s\n",seq_key_result);
+      //fprintf(f,"prox_s : %s\n",prox_s);
+      //fprintf(f,"prox_key_result: %s\n",prox_key_result);
+      //fprintf(f,"chave final : %s\n",link_key);
 
       links_period_value = rb_hash_aref(rb_ary_entry(links,period),rb_str_new2(link_key));
       if (links_period_value  == Qnil) {
@@ -346,19 +372,26 @@ 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 
 
+  free(period_s); 
+  free(prox_s); 
+  free(link_key); 
+
+  //fclose(f);
   //return result_final;
   return Qnil;
 }  
 
 
+static VALUE join_teste(VALUE self, VALUE strings){
+
+    return rb_str_new2(join(strings));
+}
+
 
 // Main function called when the gem is loaded 
 void Init_visualize_helper(void) {
@@ -370,11 +403,11 @@ void Init_visualize_helper(void) {
   rb_define_singleton_method(mVisualizeHelper, "min_max_period", min_max_period, 5);
 
   // Register the method generate_boxes_and_links
-  rb_define_singleton_method(mVisualizeHelper, "generate_boxes_and_links", generate_boxes_and_links, 8);
+  rb_define_singleton_method(mVisualizeHelper, "generate_boxes_and_links", generate_boxes_and_links, 6);
 
   // Register the method sort
   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_teste", join_teste, 1 );
 }

data/lib/visualize_helper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visualize_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.10.29
+  version: 0.0.10.30
 platform: ruby
 authors:
 - Raphael Ottoni Santiago Machado de Faria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler