Changeset 6141 for trunk/DIST/DI_matr.cxx
- Timestamp:
- 14/08/09 16:29:27 (3 years ago)
- Files:
-
- 1 modified
-
trunk/DIST/DI_matr.cxx (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/DIST/DI_matr.cxx
r6100 r6141 527 527 if (!out) return "Cannot open file"; 528 528 529 aw_openstatus("Calculating Distan zMatrix");529 aw_openstatus("Calculating Distance Matrix"); 530 530 aw_status("Calculating global rate matrix"); 531 531 … … 548 548 char *seq1,*seq2; 549 549 s_len = tree_root->filter->real_len; 550 fprintf(out,"\nDistan zmatrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):");550 fprintf(out,"\nDistance matrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):"); 551 551 fprintf(out,"\n%li",nentries); 552 552 const int MAXDISTDEBUG = 1000; … … 652 652 GB_ERROR error = haeschoe("outfile"); 653 653 if (error) return error; 654 return "Your matri zes have been written to 'outfile'\nSorry I can not make a tree";654 return "Your matrices have been written to 'outfile'\nSorry I can not make a tree"; 655 655 } 656 656 int user_matrix_enabled = awr->awar(AWAR_DIST_MATRIX_DNA_ENABLED)->read_int(); … … 830 830 } 831 831 if (N==0) N=1; 832 if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq in ividually for each line832 if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq individually for each line 833 833 S_square = 0.0; 834 834 for (i=0;i<AP_MAX; i++) S_square+= frequencies[i]*frequencies[i]; … … 1168 1168 { 1169 1169 AW_window_simple *aws = new AW_window_simple; 1170 aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COL OUM", "CANCEL SELECT");1170 aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLUMN", "CANCEL SELECT"); 1171 1171 aws->load_xfig("di_cancel.fig"); 1172 1172 … … 1388 1388 } 1389 1389 1390 aw_openstatus("Analy sing data...");1390 aw_openstatus("Analyzing data..."); 1391 1391 aw_status("Read the database"); 1392 1392
