Changeset 6141 for trunk/PARSIMONY/AP_tree_nlen.cxx

Timestamp:

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

Author:

westram

Message:

• spellchecked all (phew)

Files:

• trunk/PARSIMONY/AP_tree_nlen.cxx (modified) (6 diffs)

trunk/PARSIMONY/AP_tree_nlen.cxx

@@ -866 +866 @@
 ********************************************************/
 
-void            AP_tree_nlen::
-kernighan_rek(int rek_deep, int *rek_2_width, int rek_2_width_max, const int rek_deep_max,
-              double(*funktion) (double, double *, int), double *param_liste, int param_anz,
-              AP_FLOAT pars_best, AP_FLOAT pars_start, AP_FLOAT pars_prev,
-              AP_KL_FLAG rek_width_type, AP_BOOL *abort_flag)
+void AP_tree_nlen::kernighan_rek(int rek_deep, int *rek_2_width, int rek_2_width_max, const int rek_deep_max,
+                                 double(*function) (double, double *, int), double *param_liste, int param_anz,
+                                 AP_FLOAT pars_best, AP_FLOAT pars_start, AP_FLOAT pars_prev,
+                                 AP_KL_FLAG rek_width_type, AP_BOOL *abort_flag)
 {
     //
-    // rek_deep Rekursionstiefe
-    // rek_2_width Verzweigungsgrad
-    // neg_counter zaehler fuer die Aeste in denen Kerninghan Lin schon angewendet wurde
-    // funktino Funktion fuer den dynamischen Schwellwert
-    // pars_ Verschiedene Parsimonywerte
+    // rek_deep         Rekursionstiefe
+    // rek_2_width      Verzweigungsgrad
+    // neg_counter      zaehler fuer die Aeste in denen Kerninghan Lin schon angewendet wurde
+    // function         Funktion fuer den dynamischen Schwellwert
+    // pars_            Verschiedene Parsimonywerte
 
     AP_FLOAT help, pars[8];
@@ -890 +889 @@
     //
     int             rek_width, rek_width_static = 0, rek_width_dynamic = 0;
-    AP_FLOAT        schwellwert = funktion(rek_deep, param_liste, param_anz) + pars_start;
+    AP_FLOAT        schwellwert = function(rek_deep, param_liste, param_anz) + pars_start;
 
     //parameterausgabe
@@ -921 +920 @@
         pars_refpntr[4] = pars_refpntr[5] = 0;
         pars_refpntr[6] = pars_refpntr[7] = 0;
-        //      cout << "NEW REKURSION\n\n";
+        //      cout << "NEW RECURSION\n\n";
     }else{
         pars_refpntr[0] = pars_refpntr[1] = static_cast<AP_tree_nlen *>(this->leftson);
@@ -1058 +1057 @@
                 pars_refpntr[pars_ref[i]]->kernighan_rek(rek_deep + 1, rek_2_width,
                                                          rek_2_width_max, rek_deep_max + 4,
-                                                         funktion, param_liste, param_anz,
+                                                         function, param_liste, param_anz,
                                                          pars_best, pars_start, pars[i],
                                                          AP_STATIC, &flag);
@@ -1067 +1066 @@
                 pars_refpntr[pars_ref[i]]->kernighan_rek(rek_deep + 1, rek_2_width,
                                                          rek_2_width_max, rek_deep_max,
-                                                         funktion, param_liste, param_anz,
+                                                         function, param_liste, param_anz,
                                                          pars_best, pars_start, pars[i],
                                                          rek_width_type, abort_flag);
@@ -1079 +1078 @@
             cout << "\n";
             if (!rek_deep){
-                cout << "NEW REKURSION\n\n";
+                cout << "NEW RECURSION\n\n";
             }
             cout.flush();