fix #549, survival() callback move did not update has_null_haplosomes_

Author: bhaller

VERSIONS

@@ -17,6 +17,7 @@ development head (in the master branch):
 	add a (numeric)sign(numeric x) function that returns the sign (-1, 0, 1) of each element
 	calcFST() with a windowed range (start/end) would error; was missing a unit test (#548)
 	calcSFS() with an integer (non-NULL) binCount would error in multi-chromosome models if mutations from multiple chromosomes (or NULL) were given
+	survival() callback that moves individuals did not correctly update has_null_haplosomes_, leading to a crash or a DEBUG raise (#549)
 
 
 version 5.0 (Eidos version 4.0):

core/population.cpp

@@ -477,6 +477,8 @@ void Population::ResolveSurvivalPhaseMovement(void)
 	}
 
 	// loop through subpops and append individuals that are arriving; we do this using Subpopulation::MergeReproductionOffspring()
+	int haplosome_count_per_individual = species_.HaplosomeCountPerIndividual();
+	
 	for (std::pair<const slim_objectid_t,Subpopulation*> &subpop_pair : subpops_)
 	{ 
 		Subpopulation *subpop = subpop_pair.second;
@@ -490,6 +492,23 @@ void Population::ResolveSurvivalPhaseMovement(void)
 			++subpop->gui_migrants_[individual->subpopulation_->subpopulation_id_];
 #endif
 
+			// has_null_haplosomes_ needs to reflect the presence of null haplosomes
+			if (!subpop->has_null_haplosomes_ && individual->subpopulation_->has_null_haplosomes_)
+			{
+				Haplosome **haplosomes = individual->haplosomes_;
+				
+				for (int haplosome_index = 0; haplosome_index < haplosome_count_per_individual; haplosome_index++)
+				{
+					Haplosome *haplosome = haplosomes[haplosome_index];
+					
+					if (haplosome->IsNull())
+					{
+						subpop->has_null_haplosomes_ = true;
+						break;
+					}
+				}
+			}
+			
 			individual->subpopulation_ = subpop;
 			individual->migrant_ = true;
 		}

core/subpopulation.cpp

@@ -8852,7 +8852,10 @@ EidosValue_SP Subpopulation::ExecuteMethod_takeMigrants(EidosGlobalStringID p_me
 					Haplosome *haplosome = haplosomes[haplosome_index];
 
 					if (haplosome->IsNull())
+					{
 						has_null_haplosomes_ = true;
+						break;
+					}
 				}
 			}
 

core/subpopulation.h

@@ -120,7 +120,7 @@ class Subpopulation : public EidosDictionaryUnretained
 	std::vector<Individual *> &individuals_junkyard_;	// NOT OWNED: individuals get put here when we're done with them, so we can reuse them quickly
 
 	int haplosome_count_per_individual_;					// inherits its value from species_.haplosome_count_per_individual_
-	bool has_null_haplosomes_ = false;					// inherits its value from species_.chromosomes_use_null_haplosomes_ but can additionally be false; use CouldContainNullHaplosomes() to check this flag
+	bool has_null_haplosomes_ = false;					// inherits its value from species_.chromosomes_use_null_haplosomes_ but can additionally be true; use CouldContainNullHaplosomes() to check this flag
 
 	slim_popsize_t parent_subpop_size_;				// parental subpopulation size
 	slim_popsize_t parent_first_male_index_ = INT_MAX;	// the index of the first male in the parental Haplosome vector (NOT premultiplied by 2!); equal to the number of females