[Avida-SVN] r3131 - development/source/actions

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2009-01-21 16:07:04 -0500 (Wed, 21 Jan 2009)
New Revision: 3131

Modified:
   development/source/actions/PopulationActions.cc
Log:
In C++ the '^' is the bitwiseOR operator.  It does not denote an exponent.

Modified: development/source/actions/PopulationActions.cc
===================================================================
--- development/source/actions/PopulationActions.cc	2009-01-20 18:55:02 UTC (rev 3130)
+++ development/source/actions/PopulationActions.cc	2009-01-21 21:07:04 UTC (rev 3131)
@@ -1658,7 +1658,7 @@
 	}
 
 	virtual double Fitness(const cDeme& deme) {
-		double fitness = deme.GetCurTaskExeCount()[_task_num]^2;///deme.GetInjectedCount());
+		double fitness = pow(deme.GetCurTaskExeCount()[_task_num], 2.0);///deme.GetInjectedCount());
     if (fitness == 0.0) fitness = 0.1;
     return fitness;
 	}