Show
Ignore:
Timestamp:
14/08/09 16:29:27 (3 years ago)
Author:
westram
Message:
  • spellchecked all (phew)
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/DIST/DI_matr.cxx

    r6100 r6141  
    527527    if (!out) return "Cannot open file"; 
    528528 
    529     aw_openstatus("Calculating Distanz Matrix"); 
     529    aw_openstatus("Calculating Distance Matrix"); 
    530530    aw_status("Calculating global rate matrix"); 
    531531 
     
    548548    char *seq1,*seq2; 
    549549    s_len = tree_root->filter->real_len; 
    550     fprintf(out,"\nDistanzmatrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):"); 
     550    fprintf(out,"\nDistance matrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):"); 
    551551    fprintf(out,"\n%li",nentries); 
    552552    const int MAXDISTDEBUG = 1000; 
     
    652652        GB_ERROR error = haeschoe("outfile"); 
    653653        if (error) return error; 
    654         return "Your matrizes 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"; 
    655655    } 
    656656    int user_matrix_enabled = awr->awar(AWAR_DIST_MATRIX_DNA_ENABLED)->read_int(); 
     
    830830                            } 
    831831                            if (N==0) N=1; 
    832                             if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq inividually for each line 
     832                            if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq individually for each line 
    833833                                S_square = 0.0; 
    834834                                for (i=0;i<AP_MAX; i++) S_square+= frequencies[i]*frequencies[i]; 
     
    11681168{ 
    11691169    AW_window_simple *aws = new AW_window_simple; 
    1170     aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLOUM", "CANCEL SELECT"); 
     1170    aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLUMN", "CANCEL SELECT"); 
    11711171    aws->load_xfig("di_cancel.fig"); 
    11721172 
     
    13881388    } 
    13891389 
    1390     aw_openstatus("Analysing data..."); 
     1390    aw_openstatus("Analyzing data..."); 
    13911391    aw_status("Read the database"); 
    13921392