Changeset 6143 for branches/stable_5.0/DIST

Timestamp:

15/08/09 14:13:42 (3 years ago)

Author:

westram

Message:

• backport [6141] (parts changing code, but only strings and comments)

Location:

branches/stable_5.0/DIST

Files:

• DI_matr.cxx (modified) (6 diffs)
• distanalyse.cxx (modified) (1 diff)

branches/stable_5.0/DIST/DI_matr.cxx

@@ -527 +527 @@
     if (!out) return "Cannot open file";
 
-    aw_openstatus("Calculating Distanz Matrix");
+    aw_openstatus("Calculating Distance Matrix");
     aw_status("Calculating global rate matrix");
 
@@ -548 +548 @@
     char *seq1,*seq2;
     s_len = tree_root->filter->real_len;
-    fprintf(out,"\nDistanzmatrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):");
+    fprintf(out,"\nDistance matrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):");
     fprintf(out,"\n%li",nentries);
     const int MAXDISTDEBUG = 1000;
@@ -652 +652 @@
         GB_ERROR error = haeschoe("outfile");
         if (error) return error;
-        return "Your matrizes have been written to 'outfile'\nSorry I can not make a tree";
+        return "Your matrices have been written to 'outfile'\nSorry I can not make a tree";
     }
     int user_matrix_enabled = awr->awar(AWAR_DIST_MATRIX_DNA_ENABLED)->read_int();
@@ -830 +830 @@
                             }
                             if (N==0) N=1;
-                            if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq inividually for each line
+                            if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq individually for each line
                                 S_square = 0.0;
                                 for (i=0;i<AP_MAX; i++) S_square+= frequencies[i]*frequencies[i];
@@ -1168 +1168 @@
 {
     AW_window_simple *aws = new AW_window_simple;
-    aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLOUM", "CANCEL SELECT");
+    aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLUMN", "CANCEL SELECT");
     aws->load_xfig("di_cancel.fig");
 
@@ -1388 +1388 @@
     }
 
-    aw_openstatus("Analysing data...");
+    aw_openstatus("Analyzing data...");
     aw_status("Read the database");
 

branches/stable_5.0/DIST/distanalyse.cxx

@@ -65 +65 @@
 
     if (min_len * 1.3 < max_len) {
-        aw_message("Warning: The length of sequences differ significantly\n"
-                   "        be carefull, neighbour joining is sensitiv to\n"
+        aw_message("Warning: The length of sequences differs significantly\n"
+                   "        be careful, neighbour joining is sensitive to\n"
                    "        this kind of error");
     }