Changeset 6141 for trunk/AWT/AWT_tree_cmp.cxx

Timestamp:

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

Author:

westram

Message:

• spellchecked all (phew)

Files:

• trunk/AWT/AWT_tree_cmp.cxx (modified) (4 diffs)

trunk/AWT/AWT_tree_cmp.cxx

@@ -79 +79 @@
 
 int AWT_species_set_root::search(AWT_species_set *set,FILE *log_file){
-    long netto_cost;
+    long net_cost;
     double best_cost;
-    AWT_species_set *bs = this->search(set,&netto_cost);
-    best_cost = netto_cost + set->unfound_species_count * 0.0001;
+    AWT_species_set *bs = this->search(set,&net_cost);
+    best_cost = net_cost + set->unfound_species_count * 0.0001;
     if (best_cost < bs->best_cost){
         bs->best_cost = best_cost;
@@ -88 +88 @@
     }
     if (log_file){
-        if ( netto_cost){
+        if ( net_cost){
             fprintf(log_file, "Node '%s' placed not optimal, %li errors\n",
                     set->node->name,
-                    netto_cost);
-        }
-    }
-    return netto_cost;
+                    net_cost);
+        }
+    }
+    return net_cost;
 }
 
@@ -195 +195 @@
 }
 
-GB_ERROR AWT_species_set_root::copy_node_infos(FILE *log, bool delete_old_nodes, bool nodes_with_marked_only) {
+GB_ERROR AWT_species_set_root::copy_node_information(FILE *log, bool delete_old_nodes, bool nodes_with_marked_only) {
     GB_ERROR error = 0;
     long j;
@@ -307 +307 @@
 
                 if (!compare_node_info) {
-                    aw_status("Copy Node Informations");
-                    ssr->copy_node_infos(log, delete_old_nodes, nodes_with_marked_only);
+                    aw_status("Copy Node Information");
+                    ssr->copy_node_information(log, delete_old_nodes, nodes_with_marked_only);
                 }