[Avida-SVN] r2635 - in branches/collect: source/main source/targets/viewer-text tests/_exp_500u tests/_exp_500u/expected tests/_exp_500u/expected/data tests/default_classic_500u tests/demes_germline tests/demes_grid_repl tests/demes_torus_repl tests/energy_asex_1000u tests/energy_deme_level_res tests/midrun_classsic_30u tests/resources_9r tests/spatial_res_100u tests/string_match_embed3

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2008-06-10 13:02:41 -0400 (Tue, 10 Jun 2008)
New Revision: 2635

Added:
   branches/collect/tests/_exp_500u/expected/
   branches/collect/tests/_exp_500u/expected/data/
   branches/collect/tests/_exp_500u/expected/data/archive/
Removed:
   branches/collect/tests/_exp_500u/expected/data/
   branches/collect/tests/_exp_500u/expected/data/archive/
   branches/collect/tests/default_classic_500u/expected/
   branches/collect/tests/demes_germline/expected/
   branches/collect/tests/demes_grid_repl/expected/
   branches/collect/tests/demes_torus_repl/expected/
   branches/collect/tests/energy_asex_1000u/expected/
   branches/collect/tests/energy_deme_level_res/expected/
   branches/collect/tests/midrun_classsic_30u/expected/
   branches/collect/tests/resources_9r/expected/
   branches/collect/tests/spatial_res_100u/expected/
   branches/collect/tests/string_match_embed3/expected/
Modified:
   branches/collect/source/main/cSpatialResCount.cc
   branches/collect/source/targets/viewer-text/cDriver_TextViewer.cc
Log:
Porting r2306:2309 from development to collect branch


Modified: branches/collect/source/main/cSpatialResCount.cc
===================================================================
--- branches/collect/source/main/cSpatialResCount.cc	2008-06-10 16:48:24 UTC (rev 2634)
+++ branches/collect/source/main/cSpatialResCount.cc	2008-06-10 17:02:41 UTC (rev 2635)
@@ -184,6 +184,7 @@
 
   if (inflowX2 < inflowX1) { inflowX2 += world_x; }
   if (inflowY2 < inflowY1) { inflowY2 += world_y; }
+
   if (outflowX1 < 0) { 
     outflowX1 = 0; 
   } else if (outflowX1 > world_x) { 

Modified: branches/collect/source/targets/viewer-text/cDriver_TextViewer.cc
===================================================================
--- branches/collect/source/targets/viewer-text/cDriver_TextViewer.cc	2008-06-10 16:48:24 UTC (rev 2634)
+++ branches/collect/source/targets/viewer-text/cDriver_TextViewer.cc	2008-06-10 17:02:41 UTC (rev 2635)
@@ -41,6 +41,7 @@
 #include "cTextWindow.h"
 
 #include <cstdlib>
+#include <signal.h>
 
 using namespace std;
 
@@ -311,7 +312,7 @@
     m_main_window.Redraw();
     break;
   case 26: // CTRL-Z
-    kill(getpid(), SIGTSTP);
+    kill(getpid(), SIGTSTP); 
     break;
   case ERR:
     break;

Copied: branches/collect/tests/_exp_500u/expected (from rev 2309, development/tests/_exp_500u/expected)

Copied: branches/collect/tests/_exp_500u/expected/data (from rev 2309, development/tests/_exp_500u/expected/data)

Copied: branches/collect/tests/_exp_500u/expected/data/archive (from rev 2309, development/tests/_exp_500u/expected/data/archive)