visualize_helper 0.0.10.32 → 0.0.10.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e414a7b8decab1b583f69cd57863410b55402cad
-  data.tar.gz: 35dbe6d75b22b276fd958bec3a8c9ec1db0f2cf2
+  metadata.gz: 7c1f5946747909eafa7b58d8102ea43b7cac144a
+  data.tar.gz: f60656e08b7c5f1439d58205651b70cba44308d0
 SHA512:
-  metadata.gz: 7184bb954f59822440150def37d4ca637ed001f146571a68e67e3e8f3b5006c8a541296e67637652cb384b8992fcd265b07a02dfe7706f2ea7ff2193d532f80f
-  data.tar.gz: 149e3ad5a488fece5118d8eb463dde47d0c8748a2d30907fd2a17f82a3a85281df485da7fe20536eb3435fea02832554199c62bf915a144554008ba4eb4a53fb
+  metadata.gz: 7b14cb82285fa6da31c55bce011c977e1eae3bd3b06475e2758bccaef4cac16bfb936bfbe19f9c2da8a6e955b60429fcf77fb67b7ef867121052d277a5d5b72e
+  data.tar.gz: 491b65740274a19f7ae924efea287a3cd6a25470110a68dab1268ae24f8b63ce2fa74f06c7de5401f20246acc630f2b9b3c23b193f37556fd4682132e015d2fa

data/ext/visualize_helper/visualize_helper.c

@@ -65,7 +65,6 @@ static char* join(VALUE strings){
   int string_total_size = 0;
   VALUE string_temp;
   VALUE result;
-  //FILE *f = fopen("file.txt", "w");
   
 
 
@@ -89,10 +88,6 @@ static char* join(VALUE strings){
 
   }
   strcat(joined,"\0");
-  //result = rb_str_new2(joined);  
-  //free(joined);
-  //fprintf(f,"%s\n",joined);
-  //fclose(f);
   return  joined;
 }
 
@@ -156,26 +151,20 @@ static int encontra_min_max_period(VALUE days, VALUE traj, VALUE array){
   int max_c = FIX2INT(rb_ary_entry(array,1));
   int period;
   int traj_size;
-  //FILE *f = fopen("/tmp/aggr.txt", "a+");
 
 
   if (days_c < first_interval_c) {
     if (min_c > days_c) {
       min_c = days_c;
-      //rb_ary_store(array,0,days);
     }
     period = 0;
-    //rb_ary_store(array,2,INT2FIX(0));
   }else if (days_c == 0) {
     period = findIndex(intervals,intervals_size,0)+1;
-    //rb_ary_store(array,2,INT2FIX(index+1));
 
   }else if (days_c > last_interval_c ) {
     if (max_c < days_c) {
       max_c = days_c;
-      //rb_ary_store(array,1,days);
     }
-    //rb_ary_store(array,2,INT2FIX(aggr_size -1));
     period = aggr_size -1;
   }else {  
     for ( int index = 0 ; index < intervals_size ; index++){
@@ -184,49 +173,23 @@ static int encontra_min_max_period(VALUE days, VALUE traj, VALUE array){
         if ( intervals_index_plus_1 <= 0  ){
           if (( days_c >= FIX2INT(rb_ary_entry(intervals,index))) && (days_c < intervals_index_plus_1)) {
             period = index +1;
-            //rb_ary_store(array,2,INT2FIX(i+1));
             break;
           }  
         }else if ( (days_c > FIX2INT(rb_ary_entry(intervals,index)) ) && (days_c <= intervals_index_plus_1) ) {
           period = index + 2;
-          //rb_ary_store(array,2,INT2FIX(i+2));
           break;
         }   
       }  
     }
   }
 
-  
-
   rb_ary_store(array,0,INT2FIX(min_c));
   rb_ary_store(array,1,INT2FIX(max_c));
   traj_size = RARRAY_LEN(traj);
-
   for ( int i =0; i < traj_size; i++){
     rb_ary_push(rb_ary_entry(aggr,period),rb_ary_entry(traj,i));
   }  
 
-  // FOR DEBUG
-  //for (int i = 0; i < aggr_size; i++) {
-  //  fprintf(f, "[");
-  //  VALUE temp =  rb_ary_entry(aggr,i);
-  //  int temp_size = RARRAY_LEN(temp);
-  //  for (int j = 0; j < temp_size; j++){
-  //    VALUE temp_string =  rb_ary_entry(temp,j);
-  //    fprintf(f, "%s", StringValuePtr(temp_string));
-  //    if ( j != temp_size -1 ){
-  //      fprintf(f, ",");
-  //    }  
-  //  }
-  //  fprintf(f, "]");
-  //  if ( i != aggr_size -1 ){
-  //    fprintf(f, ",");
-  //  }  
-  //}
-
-  //fprintf(f, "\n");
-  //fclose(f);
-
   return ST_CONTINUE;
 }  
 
@@ -305,6 +268,7 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE aggr, VALUE boxes, VALUE
      if (period < aggr_size - 1) {
       prox_key = rb_ary_new();
      } 
+
      seq = rb_ary_entry(aggr,period);
      seq_size = (int) RARRAY_LEN(seq);
 
@@ -312,14 +276,13 @@ static VALUE generate_boxes_and_links(VALUE self, VALUE aggr, VALUE boxes, VALUE
       if (seq_size == 0) {
         rb_ary_push(seq_key,rb_hash_aref(dict, rb_str_new2("M-2"))); 
       }else{
-
         for(int i = 0; i < seq_size; i++ ) {
           rb_ary_push(seq_key,rb_hash_aref(dict,rb_ary_entry(seq,i)));  
         }  
       }
 
     // agroup by unique or not
-    if ( strcmp(StringValuePtr(type_agroupment),"s") == 0 ) {
+    if ( strcmp(StringValuePtr(type_agroupment),"n") == 0 ) {
       //sort with uniq 
       seq_key = sort_uniq(seq_key,1);
     }else{

data/lib/visualize_helper/version.rb

@@ -1,3 +1,3 @@
 module VisualizeHelper
-  VERSION = "0.0.10.32"
+  VERSION = "0.0.10.33"
 end

metadata

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