[Avida-SVN] r2146 - in branches/dkdev: Avida.xcodeproj source/main

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2007-10-22 09:35:03 -0400 (Mon, 22 Oct 2007)
New Revision: 2146

Modified:
   branches/dkdev/Avida.xcodeproj/project.pbxproj
   branches/dkdev/source/main/cPopulation.cc
Log:
Randomly-sized regions.

Modified: branches/dkdev/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/dkdev/Avida.xcodeproj/project.pbxproj	2007-10-21 22:30:39 UTC (rev 2145)
+++ branches/dkdev/Avida.xcodeproj/project.pbxproj	2007-10-22 13:35:03 UTC (rev 2146)
@@ -758,7 +758,7 @@
 		DCC315CF076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
 		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
-		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
 		E03F28DA0B8A2840009966B8 /* cDeme.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cDeme.cc; sourceTree = "<group>"; };
 		E03F28DB0B8A2840009966B8 /* cDeme.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cDeme.h; sourceTree = "<group>"; };
 		E08178B90B3DCB9600B474B6 /* cTopology.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cTopology.h; sourceTree = "<group>"; };
@@ -1912,13 +1912,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_MODEL_CPU = G4;
-				HEADER_SEARCH_PATHS = "/usr/local/include/boost-1_33_1";
+				HEADER_SEARCH_PATHS = /usr/local/include;
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					suppress,
 				);
 				PRODUCT_NAME = avida;
-				USER_HEADER_SEARCH_PATHS = "source//";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Development;
 		};
@@ -1926,7 +1926,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_MODEL_CPU = G4;
-				HEADER_SEARCH_PATHS = "/usr/local/include/boost-1_33_1";
+				HEADER_SEARCH_PATHS = /usr/local/include;
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					suppress,
@@ -2047,7 +2047,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_MODEL_CPU = G4;
-				HEADER_SEARCH_PATHS = "/usr/local/include/boost-1_33_1";
+				HEADER_SEARCH_PATHS = /usr/local/include;
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					suppress,
@@ -2061,7 +2061,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_MODEL_CPU = G4;
-				HEADER_SEARCH_PATHS = "/usr/local/include/boost-1_33_1";
+				HEADER_SEARCH_PATHS = /usr/local/include;
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					suppress,
@@ -2176,7 +2176,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_MODEL_CPU = G4;
-				HEADER_SEARCH_PATHS = "/usr/local/include/boost-1_33_1";
+				HEADER_SEARCH_PATHS = /usr/local/include;
 				OTHER_LDFLAGS = (
 					"-multiply_defined",
 					suppress,

Modified: branches/dkdev/source/main/cPopulation.cc
===================================================================
--- branches/dkdev/source/main/cPopulation.cc	2007-10-21 22:30:39 UTC (rev 2145)
+++ branches/dkdev/source/main/cPopulation.cc	2007-10-22 13:35:03 UTC (rev 2146)
@@ -62,13 +62,16 @@
     assert(cell.IsOccupied());
     cOrganism* organism = cell.GetOrganism();
     assert(organism != 0);
-    std::pair<int,int> deme_xy = std::make_pair(_deme.GetWidth(), _deme.GetHeight());
+    //std::pair<int,int> deme_xy = std::make_pair(_deme.GetWidth(), _deme.GetHeight());
+    
+    std::pair<int,int> cells = _deme.GetCellsToLink();
+    std::pair<int,int> cell1_xy = _deme.GetCellPosition(cells.first);    
     std::pair<int,int> self_xy = _deme.GetCellPosition(organism->GetCellID());
 
     // Has the organism declared correctly or not?  If so, increment result.
-    if((self_xy.second >= (deme_xy.second/2)) && (organism->GetRegion()==1)) {
+    if((self_xy.second >= (cell1_xy.second)) && (organism->GetRegion()==1)) {
       result += 1.0;
-    } else if((self_xy.second <= (deme_xy.second/2)) && (organism->GetRegion()==0)) {
+    } else if((self_xy.second <= (cell1_xy.second)) && (organism->GetRegion()==0)) {
       result += 1.0;
     }