[Avida-SVN] r2991 - branches/matt/PairwiseEpistasis/source/analyze

[ruppmatt at myxo.css.msu.edu]

Author: ruppmatt
Date: 2008-12-02 10:50:03 -0500 (Tue, 02 Dec 2008)
New Revision: 2991

Modified:
   branches/matt/PairwiseEpistasis/source/analyze/cAnalyze.cc
Log:
Added more phenotypic plasticity metrics to LandscapeBackground.

Modified: branches/matt/PairwiseEpistasis/source/analyze/cAnalyze.cc
===================================================================
--- branches/matt/PairwiseEpistasis/source/analyze/cAnalyze.cc	2008-12-02 15:40:22 UTC (rev 2990)
+++ branches/matt/PairwiseEpistasis/source/analyze/cAnalyze.cc	2008-12-02 15:50:03 UTC (rev 2991)
@@ -7077,11 +7077,21 @@
     df.WriteAnonymous("# Character\n");
     df.WriteAnonymous("# Average Fitness\n");
     df.WriteAnonymous("# Phenotypic Entorpy\n");
+    df.WriteAnonymous("# Minimum Fitness\n");
+    df.WriteAnonymous("# Minimum Fitness Freq\n");
+    df.WriteAnonymous("# Maximum Fitness\n");
+    df.WriteAnonymous("# Maximum Fitness Freq\n");
+    df.WriteAnonymous("# Likely Fitness\n");
+    df.WriteAnonymous("# Likely Fitness Freq\n");
     
     //Write our initial fitness to the top line
     cPhenPlastGenotype pA(genotype_A->GetGenome(), num_trials, m_world, m_ctx);
     cString Line;
-    Line.Set("# %d %c %g %g\n", -1, '-', pA.GetAverageFitness(), pA.GetPhenotypicEntropy());
+    Line.Set("# %d %c %g %g %g %g %g \n", 
+               -1, '-', pA.GetAverageFitness(), pA.GetPhenotypicEntropy(), 
+               pA.GetMinimumFitness(), pA.GetMinimumFitnessFrequency(),
+               pA.GetMaximumFitness(), pA.GetMaximumFitnessFrequency(),
+               pA.GetLikelyFitness(), pA.GetMaximumFrequency());
     df.WriteAnonymous(Line);
     df.Endl();