[PD-cvs] externals/frankenstein common.c, 1.13, 1.14 rhythms_memory.c, 1.2, 1.3

[dmorelli]

Update of /cvsroot/pure-data/externals/frankenstein
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13505

Modified Files:
	common.c rhythms_memory.c 
Log Message:
minor fixes but main bug still present

Index: rhythms_memory.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/rhythms_memory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rhythms_memory.c	7 Dec 2005 18:38:20 -0000	1.2
--- rhythms_memory.c	8 Dec 2005 01:29:55 -0000	1.3
***************
*** 97,101 ****
  	while(currEvent)
  	{
! 		fduration = currEvent->when / x->measure_length;
  		if (x->seq_initialized)
  		{
--- 97,101 ----
  	while(currEvent)
  	{
! 		fduration = (float) (((float) currEvent->when) / ((float) x->measure_length));
  		if (x->seq_initialized)
  		{

Index: common.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/common.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** common.c	7 Dec 2005 18:38:20 -0000	1.13
--- common.c	8 Dec 2005 01:29:55 -0000	1.14
***************
*** 119,122 ****
--- 119,123 ----
  	newElement->start.denominator = res.denominator;
  	*firstEvent = newElement;
+ 	post("DEBUG setFirstBeat: %i %i", res.numerator, res.denominator);
  }
  
***************
*** 142,145 ****
--- 143,147 ----
  	newElement->start.numerator = res.numerator;
  	newElement->start.denominator = res.denominator;
+ 	post("DEBUG concatenateBeat: %i %i", res.numerator, res.denominator);
  }
  
***************
*** 425,429 ****
  			this_weight_int = this_rep->transitions[i].weight;
  			this_weight_float = (float) (((float) this_weight_int) / ((float) this_rep->max_weight));
! 			post("DEBUG: transition %i this_weight_float=%f", i, this_weight_float);
  			if (this_weight_float > min_to_be_main_rhythm_beat)
  			{
--- 427,431 ----
  			this_weight_int = this_rep->transitions[i].weight;
  			this_weight_float = (float) (((float) this_weight_int) / ((float) this_rep->max_weight));
! 			post("DEBUG: transition %i this_weight_int=%i max_weight=%i this_weight_float=%f", i, this_weight_int, this_rep->max_weight, this_weight_float);
  			if (this_weight_float > min_to_be_main_rhythm_beat)
  			{
***************
*** 532,546 ****
  	while(this_rep)
  	{
! 		compare_rhythm_vs_representation(this_rep, 
! 			src_rhythm, 
! 			&curr_subid, 
! 			&curr_closeness, 
! 			&curr_sub_closeness);
! 		if (curr_closeness > best_closeness)
  		{
! 			best_closeness = curr_closeness;
! 			best_id = this_rep->id;
! 			best_sub_closeness = curr_sub_closeness;
! 			best_subid = curr_subid;
  		}
  		this_rep = this_rep->next;
--- 534,552 ----
  	while(this_rep)
  	{
! 		// if max_weight maxweight == 0 then there are no rhythms and no table
! 		if (this_rep->max_weight)
  		{
! 			compare_rhythm_vs_representation(this_rep, 
! 				src_rhythm, 
! 				&curr_subid, 
! 				&curr_closeness, 
! 				&curr_sub_closeness);
! 			if (curr_closeness > best_closeness)
! 			{
! 				best_closeness = curr_closeness;
! 				best_id = this_rep->id;
! 				best_sub_closeness = curr_sub_closeness;
! 				best_subid = curr_subid;
! 			}
  		}
  		this_rep = this_rep->next;