Changeset 6141 for trunk/STAT/ST_ml.cxx

Timestamp:

14/08/09 16:29:27 (3 years ago)

Author:

westram

Message:

• spellchecked all (phew)

Files:

• trunk/STAT/ST_ml.cxx (modified) (5 diffs)

trunk/STAT/ST_ml.cxx

@@ -307 +307 @@
         if (distr > maxm)
             distr = maxm;
-        st_ml->rate_matrizes[distl].mult(lb, dest);
-        st_ml->rate_matrizes[distr].mult(rb, &hbv);
+        st_ml->rate_matrices[distl].mult(lb, dest);
+        st_ml->rate_matrices[distr].mult(rb, &hbv);
         dest->mult(&hbv);
         dest->check_overflow();
@@ -337 +337 @@
         if (distl > maxm)
             distl = maxm;
-        st_ml->rate_matrizes[distl].mult(lefts, out);
+        st_ml->rate_matrices[distl].mult(lefts, out);
 
         // correct frequencies
@@ -372 +372 @@
     delete[]base_frequencies;
     delete[]inv_base_frequencies;
-    delete[]rate_matrizes;
+    delete[]rate_matrices;
     if (!awt_csp) {
         delete rates;
@@ -476 +476 @@
 }
 
-void ST_ML::create_matrizes(double max_disti, int nmatrizes) {
+void ST_ML::create_matrices(double max_disti, int nmatrices) {
     max_dist = max_disti;
-    if (rate_matrizes)
-        delete rate_matrizes;
-    rate_matrizes = new ST_rate_matrix[nmatrizes];
-    max_matr = nmatrizes;
+    if (rate_matrices)
+        delete rate_matrices;
+    rate_matrices = new ST_rate_matrix[nmatrices];
+    max_matr = nmatrices;
     step_size = max_dist / max_matr;
     int i;
     for (i = 0; i < max_matr; i++) {
-        rate_matrizes[i].set((i + 1) * step_size, 0); // ttratio[i]
+        rate_matrices[i].set((i + 1) * step_size, 0); // ttratio[i]
     }
 }
@@ -611 +611 @@
     tree_root->tree->load_sequences_rek(alignment_name, GB_TRUE, GB_TRUE);
 
-    /* create matrizes */
-    create_matrizes(2.0, 1000);
+    /* create matrices */
+    create_matrices(2.0, 1000);
 
     ST_sequence_ml::tmp_out = new ST_base_vector[alignment_len];