[Avida-SVN] r2102 - in branches/dkdev: . source/cpu

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2007-09-24 19:21:03 -0400 (Mon, 24 Sep 2007)
New Revision: 2102

Modified:
   branches/dkdev/CMakeLists.txt
   branches/dkdev/source/cpu/cHardwareCPU.cc
   branches/dkdev/source/cpu/cTestCPU.h
Log:
Updates for building on the HPC.

Modified: branches/dkdev/CMakeLists.txt
===================================================================
--- branches/dkdev/CMakeLists.txt	2007-09-24 22:26:43 UTC (rev 2101)
+++ branches/dkdev/CMakeLists.txt	2007-09-24 23:21:03 UTC (rev 2102)
@@ -287,7 +287,6 @@
   ${ACTIONS_SRC_DIR}
   ${ANALYZE_SRC_DIR}
   ${ARCHIVE_SRC_DIR}
-  ${BOOST_SRC_DIR}
   ${CLASSIFICATION_SRC_DIR}
   ${CPU_SRC_DIR}
   ${DRIVERS_SRC_DIR}
@@ -304,7 +303,6 @@
   ${ACTIONS_BLD_DIR}
   ${ANALYZE_BLD_DIR}
   ${ARCHIVE_BLD_DIR}
-  ${BOOST_SERIALIZATION_BLD_DIR}
   ${CLASSIFICATION_BLD_DIR}
   ${CPU_BLD_DIR}
   ${DRIVERS_BLD_DIR}

Modified: branches/dkdev/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/dkdev/source/cpu/cHardwareCPU.cc	2007-09-24 22:26:43 UTC (rev 2101)
+++ branches/dkdev/source/cpu/cHardwareCPU.cc	2007-09-24 23:21:03 UTC (rev 2102)
@@ -3671,7 +3671,7 @@
 
 /*! Calculates the euclidean distance between two points. */
 double point_distance(const std::pair<int,int>& p1, const std::pair<int,int>& p2) {
-  return sqrt(pow(p1.first-p2.first,2) + pow(p1.second-p2.second,2));
+  return sqrt(pow((double)p1.first-p2.first,2) + pow((double)p1.second-p2.second,2));
 }
 
 

Modified: branches/dkdev/source/cpu/cTestCPU.h
===================================================================
--- branches/dkdev/source/cpu/cTestCPU.h	2007-09-24 22:26:43 UTC (rev 2101)
+++ branches/dkdev/source/cpu/cTestCPU.h	2007-09-24 23:21:03 UTC (rev 2102)
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "tArray.h"
+#include "cGenome.h"
 #include "cString.h"
 #include "cResourceCount.h"
 
@@ -23,7 +24,6 @@
 class cInstSet;
 class cResourceCount;
 class cCPUTestInfo;
-class cGenome;
 class cGenotype;
 class cWorld;