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

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2009-07-01 16:34:14 -0400 (Wed, 01 Jul 2009)
New Revision: 3349

Modified:
   development/source/main/cWorld.cc
Log:

Fixing some conversion warnings.


Modified: development/source/main/cWorld.cc
===================================================================
--- development/source/main/cWorld.cc	2009-07-01 20:25:20 UTC (rev 3348)
+++ development/source/main/cWorld.cc	2009-07-01 20:34:14 UTC (rev 3349)
@@ -161,13 +161,13 @@
 // If no nops or no resources, return 0
 int cWorld::GetNumResourceSpecs()
 {
-  int num_resources = (double)GetEnvironment().GetResourceLib().GetSize();
-  int num_nops = (double)GetHardwareManager().GetInstSet().GetNumNops();
+  int num_resources = GetEnvironment().GetResourceLib().GetSize();
+  int num_nops = GetHardwareManager().GetInstSet().GetNumNops();
   
   if (num_resources <= 0 || num_nops <= 0) { return 0; }
   
   double most_nops_needed = ceil(log((double)num_resources)/log((double)num_nops));
-  double numerator = pow(num_nops, most_nops_needed + 1) - 1;
+  double numerator = pow((double)num_nops, most_nops_needed + 1) - 1;
   double denominator = (double)(num_nops - 1);
   return (int)(numerator / denominator);
 }