[Avida-SVN] r3421 - in development: source/main tests/bgs_dyn_mutrates_births/expected/data tests/bgs_dyn_mutrates_fit/expected/data tests/bgs_dyn_mutrates_rank/expected/data tests/sex/expected/data tests/sex-asex/expected/data tests/sex-modular/expected/data
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed Sep 23 09:17:05 PDT 2009
Author: brysonda
Date: 2009-09-23 12:17:05 -0400 (Wed, 23 Sep 2009)
New Revision: 3421
Modified:
development/source/main/cStats.cc
development/tests/bgs_dyn_mutrates_births/expected/data/stats.dat
development/tests/bgs_dyn_mutrates_fit/expected/data/stats.dat
development/tests/bgs_dyn_mutrates_rank/expected/data/stats.dat
development/tests/sex-asex/expected/data/stats.dat
development/tests/sex-modular/expected/data/stats.dat
development/tests/sex/expected/data/stats.dat
Log:
Alter stats.dat generation to avoid negative zeros (-0). This should reduce output variance between GCC and ICC.
THIS DOES AFFECT CONSISTENCY.
Affected expected results have been updated.
Modified: development/source/main/cStats.cc
===================================================================
--- development/source/main/cStats.cc 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/source/main/cStats.cc 2009-09-23 16:17:05 UTC (rev 3421)
@@ -808,8 +808,8 @@
void cStats::PrintStatsData(const cString& filename)
{
const int genotype_change = num_genotypes - num_genotypes_last;
- const double log_ave_fid = (ave_fidelity > 0) ? -Log(ave_fidelity) : 0.0;
- const double log_dom_fid = (dom_fidelity > 0) ? -Log(dom_fidelity) : 0.0;
+ const double log_ave_fid = (ave_fidelity > 0.0 && ave_fidelity != 1.0) ? -Log(ave_fidelity) : 0.0;
+ const double log_dom_fid = (dom_fidelity > 0.0 && ave_fidelity != 1.0) ? -Log(dom_fidelity) : 0.0;
cDataFile& df = m_world->GetDataFile(filename);
Modified: development/tests/bgs_dyn_mutrates_births/expected/data/stats.dat
===================================================================
--- development/tests/bgs_dyn_mutrates_births/expected/data/stats.dat 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/tests/bgs_dyn_mutrates_births/expected/data/stats.dat 2009-09-23 16:17:05 UTC (rev 3421)
@@ -13,14 +13,14 @@
# 11: Total number of resamplings this generation
# 12: Total number of organisms that failed to resample this generation
-0 0 0 0 -0 -0 1 0 0 0 0 0
-10 0 0 0 -0 -0 0 1.60944 0 0 0 0
-20 0 0 0 -0 -0 0 2.74429 0 0 0 0
-30 0.000903795 0 0 -0 -0 0 3.33993 0 0 0 0
-40 0.00248952 0 0 -0 -0 14 3.67267 0 0 0 0
-50 0.00423631 0 0 -0 -0 4 3.76264 0 0 0 0
-60 0.00455258 0 0 -0 -0 0 2.99016 0 0 0 0
-70 0.00467863 0 0 -0 -0 0 3.30479 0 0 0 0
-80 0.00805013 0 0 -0 -0 0 3.56741 0 0 0 0
-90 0.00699338 0 0 -0 -0 7 3.6584 0 0 0 0
-100 0.00981583 0 0 -0 -0 2 3.71704 0 0 0 0
+0 0 0 0 0 0 1 0 0 0 0 0
+10 0 0 0 0 0 0 1.60944 0 0 0 0
+20 0 0 0 0 0 0 2.74429 0 0 0 0
+30 0.000903795 0 0 0 0 0 3.33993 0 0 0 0
+40 0.00248952 0 0 0 0 14 3.67267 0 0 0 0
+50 0.00423631 0 0 0 0 4 3.76264 0 0 0 0
+60 0.00455258 0 0 0 0 0 2.99016 0 0 0 0
+70 0.00467863 0 0 0 0 0 3.30479 0 0 0 0
+80 0.00805013 0 0 0 0 0 3.56741 0 0 0 0
+90 0.00699338 0 0 0 0 7 3.6584 0 0 0 0
+100 0.00981583 0 0 0 0 2 3.71704 0 0 0 0
Modified: development/tests/bgs_dyn_mutrates_fit/expected/data/stats.dat
===================================================================
--- development/tests/bgs_dyn_mutrates_fit/expected/data/stats.dat 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/tests/bgs_dyn_mutrates_fit/expected/data/stats.dat 2009-09-23 16:17:05 UTC (rev 3421)
@@ -13,14 +13,14 @@
# 11: Total number of resamplings this generation
# 12: Total number of organisms that failed to resample this generation
-0 0 0 0 -0 -0 1 0 0 0 0 0
-10 0 0 0 -0 -0 0 1.60944 0 0 0 0
-20 0 0 0 -0 -0 0 2.74429 0 0 0 0
-30 0.000903795 0 0 -0 -0 0 3.33993 0 0 0 0
-40 0.00248952 0 0 -0 -0 14 3.67267 0 0 0 0
-50 0.00423631 0 0 -0 -0 4 3.76264 0 0 0 0
-60 0.00361634 0 0 -0 -0 0 3.02094 0 0 0 0
-70 0.00376764 0 0 -0 -0 0 3.33458 0 0 0 0
-80 0.00596007 0 0 -0 -0 0 3.49396 0 0 0 0
-90 0.00497302 0 0 -0 -0 11 3.60284 0 0 0 0
-100 0.00695473 0 0 -0 -0 5 3.68906 0 0 0 0
+0 0 0 0 0 0 1 0 0 0 0 0
+10 0 0 0 0 0 0 1.60944 0 0 0 0
+20 0 0 0 0 0 0 2.74429 0 0 0 0
+30 0.000903795 0 0 0 0 0 3.33993 0 0 0 0
+40 0.00248952 0 0 0 0 14 3.67267 0 0 0 0
+50 0.00423631 0 0 0 0 4 3.76264 0 0 0 0
+60 0.00361634 0 0 0 0 0 3.02094 0 0 0 0
+70 0.00376764 0 0 0 0 0 3.33458 0 0 0 0
+80 0.00596007 0 0 0 0 0 3.49396 0 0 0 0
+90 0.00497302 0 0 0 0 11 3.60284 0 0 0 0
+100 0.00695473 0 0 0 0 5 3.68906 0 0 0 0
Modified: development/tests/bgs_dyn_mutrates_rank/expected/data/stats.dat
===================================================================
--- development/tests/bgs_dyn_mutrates_rank/expected/data/stats.dat 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/tests/bgs_dyn_mutrates_rank/expected/data/stats.dat 2009-09-23 16:17:05 UTC (rev 3421)
@@ -13,14 +13,14 @@
# 11: Total number of resamplings this generation
# 12: Total number of organisms that failed to resample this generation
-0 0 0 0 -0 -0 1 0 0 0 0 0
-10 0 0 0 -0 -0 0 1.60944 0 0 0 0
-20 0 0 0 -0 -0 0 2.74429 0 0 0 0
-30 0.000903795 0 0 -0 -0 0 3.33993 0 0 0 0
-40 0.00248952 0 0 -0 -0 14 3.67267 0 0 0 0
-50 0.00423631 0 0 -0 -0 4 3.76264 0 0 0 0
-60 -0.00156778 0 0 -0 -0 0 3.62167 0 0 0 0
-70 0.00776291 0 0 -0 -0 3 4.60517 0 0 0 0
-80 0.0102721 0 0 -0 -0 0 5.1188 0 0 0 0
-90 0.0116833 0 0 -0 -0 15 5.38116 0 0 0 0
-100 0.0178442 0 0 -0 -0 13 5.47125 0 0 0 0
+0 0 0 0 0 0 1 0 0 0 0 0
+10 0 0 0 0 0 0 1.60944 0 0 0 0
+20 0 0 0 0 0 0 2.74429 0 0 0 0
+30 0.000903795 0 0 0 0 0 3.33993 0 0 0 0
+40 0.00248952 0 0 0 0 14 3.67267 0 0 0 0
+50 0.00423631 0 0 0 0 4 3.76264 0 0 0 0
+60 -0.00156778 0 0 0 0 0 3.62167 0 0 0 0
+70 0.00776291 0 0 0 0 3 4.60517 0 0 0 0
+80 0.0102721 0 0 0 0 0 5.1188 0 0 0 0
+90 0.0116833 0 0 0 0 15 5.38116 0 0 0 0
+100 0.0178442 0 0 0 0 13 5.47125 0 0 0 0
Modified: development/tests/sex/expected/data/stats.dat
===================================================================
--- development/tests/sex/expected/data/stats.dat 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/tests/sex/expected/data/stats.dat 2009-09-23 16:17:05 UTC (rev 3421)
@@ -13,5 +13,5 @@
# 11: Total number of resamplings this generation
# 12: Total number of organisms that failed to resample this generation
-0 0 0 0 -0 -0 1 0 0 0 0 0
-100 0.00244521 0 0 -0 -0 1 2.84437 0 0 0 0
+0 0 0 0 0 0 1 0 0 0 0 0
+100 0.00244521 0 0 0 0 1 2.84437 0 0 0 0
Modified: development/tests/sex-asex/expected/data/stats.dat
===================================================================
--- development/tests/sex-asex/expected/data/stats.dat 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/tests/sex-asex/expected/data/stats.dat 2009-09-23 16:17:05 UTC (rev 3421)
@@ -13,5 +13,5 @@
# 11: Total number of resamplings this generation
# 12: Total number of organisms that failed to resample this generation
-0 0 0 0 -0 -0 1 0 0 0 0 0
-100 0.00531726 0 0 -0 -0 0 3.37233 0 0 0 0
+0 0 0 0 0 0 1 0 0 0 0 0
+100 0.00531726 0 0 0 0 0 3.37233 0 0 0 0
Modified: development/tests/sex-modular/expected/data/stats.dat
===================================================================
--- development/tests/sex-modular/expected/data/stats.dat 2009-09-23 15:38:38 UTC (rev 3420)
+++ development/tests/sex-modular/expected/data/stats.dat 2009-09-23 16:17:05 UTC (rev 3421)
@@ -13,5 +13,5 @@
# 11: Total number of resamplings this generation
# 12: Total number of organisms that failed to resample this generation
-0 0 0 0 -0 -0 1 0 0 0 0 0
-100 0.00268366 0 0 -0 -0 1 2.86318 0 0 0 0
+0 0 0 0 0 0 1 0 0 0 0 0
+100 0.00268366 0 0 0 0 1 2.86318 0 0 0 0
More information about the Avida-cvs
mailing list