Commit 28ccc213 authored by Leonardo Solis's avatar Leonardo Solis

corrected assignment of map_angle to genes in LS

parent 373befc2
......@@ -151,9 +151,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3); }
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3); }}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3); }
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3); }}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS1_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -177,9 +180,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3); }
else { tmp3 = map_angle_360(tmp3); }}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3); }
else { tmp3 = map_angle_360(tmp3); }}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS1_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS2_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS2_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3); }
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3); }}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3); }
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3); }}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS3_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS3_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS4_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS4_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS5_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS5_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS6_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS6_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS7_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,13 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS7_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS8_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS8_genotype, tmp3);
......
......@@ -154,9 +154,12 @@ while(valid) {
fixedpt fixpt_tmp2 = fixpt_tmp1 + tmp_bias;
fixedpt fixpt_tmp3 = (positive_direction == true)? (genotype [i] + fixpt_tmp2):
(genotype [i] - fixpt_tmp2);
/*
if (i>3) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
*/
if (i>2) {if (i==4) { fixpt_tmp3 = fixedpt_map_angle_180(fixpt_tmp3);}
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
write_channel_altera(chan_LS2Conf_LS9_genotype, fixedpt_tofloat(fixpt_tmp3));
......@@ -180,9 +183,12 @@ while(valid) {
float tmp2 = tmp1 + tmp_bias;
float tmp3 = (positive_direction == true)? (genotype [i] + tmp2): (genotype [i] - tmp2);
/*
if (i>3) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
*/
if (i>2) {if (i==4) { tmp3 = map_angle_180(tmp3);}
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
write_channel_altera(chan_LS2Conf_LS9_genotype, tmp3);
......
  • This runs correctly on sauron and it is 10 sec slower (for 100 runs) than FSP version.

  • DC4b (FPL/FSP) This commit (DC4b + smoothing + simplified chann igl2conf + corrected cutoff + corrected angle_map)
    Freq 187.5 MHz 184.8 MHz
    Best E, Best clusterSize, Time (Kcal/mol), (no units), (sec)
    3ptb -5.53, 66/100, 211 -5.53, 69/100, 222
    1stp -7.76, 69/100, 385 -7.47, 54/100, 391
    4hmg -4.11, 25/100, 623 -2.28, 18/100, 604
    3ce3 -10.88, 48/100, 1077 -11.45, 30/100, 1085
    3c1x -12.61, 22/100, 1487 -13.31, 41/100, 1499
    Edited by Leonardo Solis
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment