Changeset 6141 for trunk/PROBE_SET/ps_find_probes.cxx

Timestamp:

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

Author:

westram

Message:

• spellchecked all (phew)

Files:

• trunk/PROBE_SET/ps_find_probes.cxx (modified) (8 diffs)

trunk/PROBE_SET/ps_find_probes.cxx

@@ -152 +152 @@
 //  count of trues per species) higher than the lowest count
 //  of trues for the species in __SOURCE_ID_SET
-#define __TRESHOLD_PERCENTAGE_NEXT_SOURCE_ID_SET  5
+#define __THRESHOLD_PERCENTAGE_NEXT_SOURCE_ID_SET  5
 //  target_id must be at least in 95% of total target_id_sets
 //  to be in __TARGET_ID_SET
-#define __TRESHOLD_PERCENTAGE_NEXT_TARGET_ID_SET 95
+#define __THRESHOLD_PERCENTAGE_NEXT_TARGET_ID_SET 95
 
 SpeciesID               __MIN_SETS_ID;
@@ -308 +308 @@
 
     //
-    // dont look at path until ID is greater than lowest ID in the sets of IDs
-    // also dont use a node if its already used as candidate
+    // don't look at path until ID is greater than lowest ID in the sets of IDs
+    // also don't use a node if its already used as candidate
     //
     if ((id >= __MIN_SETS_ID) && has_probes && !_candidate_parent->alreadyUsedNode(_ps_node)) {
@@ -407 +407 @@
     SpeciesID highest_count;
     SpeciesID lowest_count;
-    float     treshold;
+    float     threshold;
     SpeciesID count;
 
-    // first pass -- get lowest count of trues and calc treshold
+    // first pass -- get lowest count of trues and calc threshold
     lowest_count  = __SPECIES_COUNT;
     highest_count = 0;
@@ -421 +421 @@
         if (count < lowest_count)  lowest_count  = count;
     }
-    treshold = ( ((__SPECIES_COUNT-lowest_count) * __TRESHOLD_PERCENTAGE_NEXT_SOURCE_ID_SET) / 100.0 ) + lowest_count;
-    printf( "PS_calc_next_speciesid_sets() : SOURCE count 1's [%i..%i]  treshold (%.3f)", lowest_count, highest_count, treshold );
-
-    // second pass -- get IDs where count is below or equal treshold
+    threshold = ( ((__SPECIES_COUNT-lowest_count) * __THRESHOLD_PERCENTAGE_NEXT_SOURCE_ID_SET) / 100.0 ) + lowest_count;
+    printf( "PS_calc_next_speciesid_sets() : SOURCE count 1's [%i..%i]  threshold (%.3f)", lowest_count, highest_count, threshold );
+
+    // second pass -- get IDs where count is below or equal threshold
     __SOURCE_ID_SET.clear();
     for ( SpeciesID id = __MIN_ID;
           id <= __MAX_ID;
           ++id) {
-        if (__MAP->getCountFor( id ) <= treshold) __SOURCE_ID_SET.insert( id );
+        if (__MAP->getCountFor( id ) <= threshold) __SOURCE_ID_SET.insert( id );
     }
     PS_print_set_ranges( " __SOURCE_ID_SET", __SOURCE_ID_SET );
@@ -457 +457 @@
     //PS_print_map_ranges( "PS_calc_next_speciesid_sets() : count_falses_per_id", count_falses_per_id, false );
 
-    // second -- get highest count of falses and calc treshold
+    // second -- get highest count of falses and calc threshold
     lowest_count  = __SPECIES_COUNT;
     highest_count = 0;
@@ -787 +787 @@
 //     //PS_print_map_ranges( "PS_calc_next_speciesid_sets_for_candidate() : count_falses_per_id", count_falses_per_id, false );
 
-//     // second -- get highest count of falses and calc treshold
+//     // second -- get highest count of falses and calc threshold
 //     lowest_count  = __SPECIES_COUNT;
 //     highest_count = 0;
@@ -907 +907 @@
 
     //
-    // dont look at path until ID is greater than lowest ID in the sets of IDs
-    // also dont use a node if its already used as candidate
+    // don't look at path until ID is greater than lowest ID in the sets of IDs
+    // also don't use a node if its already used as candidate
     //
     if ((id >= __MIN_SETS_ID) && has_probes) {
@@ -931 +931 @@
                                    __CANDIDATES_FINISHED ); fflush( stdout );
 
-            // next leaf-candidate if __PATH doesnt fulfill matching criteria
+            // next leaf-candidate if __PATH doesn't fulfill matching criteria
             unsigned long matches = candidate->matchPathOnOneFalseIDs( __PATH );
             if (matches < candidate->one_false_IDs_matches) continue;