[Avida-SVN] r1924 - development/source/main

[jbarrick at myxo.css.msu.edu]

Author: jbarrick
Date: 2007-08-10 10:35:33 -0400 (Fri, 10 Aug 2007)
New Revision: 1924

Modified:
   development/source/main/cPhenPlastGenotype.cc
   development/source/main/cPopulation.cc
Log:
HPC doesn't like integers in log(2), use log (2.0)

Modified: development/source/main/cPhenPlastGenotype.cc
===================================================================
--- development/source/main/cPhenPlastGenotype.cc	2007-08-10 14:34:10 UTC (rev 1923)
+++ development/source/main/cPhenPlastGenotype.cc	2007-08-10 14:35:33 UTC (rev 1924)
@@ -96,7 +96,7 @@
       m_likely_fitness = fit;
     }
     m_avg_fitness += freq * fit;
-    m_phenotypic_entropy -= freq * log(freq) / log(2);
+    m_phenotypic_entropy -= freq * log(freq) / log(2.0);
     ++uit;
   }
   delete test_cpu;

Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc	2007-08-10 14:34:10 UTC (rev 1923)
+++ development/source/main/cPopulation.cc	2007-08-10 14:35:33 UTC (rev 1924)
@@ -3122,7 +3122,7 @@
   {
     if (GetCell(i).IsOccupied())
     {
-        double fitness = exp(log(2) * scaled_time *  (org_fitness[i] - highest_fitness));
+        double fitness = exp(log(2.0) * scaled_time *  (org_fitness[i] - highest_fitness));
         org_fitness[i] = fitness;
         total_fitness += fitness;
     }