fix bug in Individual trait property access

Author: bhaller

core/individual.cpp

@@ -2627,7 +2627,7 @@ void Individual::SetProperty(EidosGlobalStringID p_property_id, const EidosValue
 			Species &species = subpopulation_->species_;
 			Trait *trait = species.TraitFromStringID(p_property_id);
 
-			if (trait)
+			if (trait)				// ACCELERATED
 			{
 				trait_info_[trait->Index()].value_ = (slim_effect_t)p_value.FloatAtIndex_NOCAST(0, nullptr);
 				return;
@@ -3039,7 +3039,7 @@ void Individual::SetProperty_Accelerated_age(EidosGlobalStringID p_property_id,
 
 void Individual::SetProperty_Accelerated_TRAIT_VALUE(EidosGlobalStringID p_property_id, EidosObject **p_values, size_t p_values_size, const EidosValue &p_source, size_t p_source_size)
 {
-#pragma unused (p_property_id, p_source_size)
+#pragma unused (p_property_id)
 	const Individual **individuals_buffer = (const Individual **)p_values;
 	Species *species = Community::SpeciesForIndividualsVector(individuals_buffer, (int)p_values_size);
 	const double *source_data = p_source.FloatData();
@@ -3049,23 +3049,53 @@ void Individual::SetProperty_Accelerated_TRAIT_VALUE(EidosGlobalStringID p_prope
 		Trait *trait = species->TraitFromStringID(p_property_id);
 		int64_t trait_index = trait->Index();
 
-		for (size_t value_index = 0; value_index < p_values_size; ++value_index)
+		if (p_source_size == 1)
 		{
-			const Individual *value = individuals_buffer[value_index];
+			slim_effect_t source_value = (slim_effect_t)source_data[0];
 
-			value->trait_info_[trait_index].value_ = (slim_effect_t)source_data[value_index];
+			for (size_t value_index = 0; value_index < p_values_size; ++value_index)
+			{
+				const Individual *value = individuals_buffer[value_index];
+				
+				value->trait_info_[trait_index].value_ = source_value;
+			}
+		}
+		else
+		{
+			for (size_t value_index = 0; value_index < p_values_size; ++value_index)
+			{
+				const Individual *value = individuals_buffer[value_index];
+				
+				value->trait_info_[trait_index].value_ = (slim_effect_t)source_data[value_index];
+			}
 		}
 	}
 	else
 	{
 		// with a mixed-species target, the species and trait have to be looked up for each individual
-		for (size_t value_index = 0; value_index < p_values_size; ++value_index)
+		if (p_source_size == 1)
 		{
-			const Individual *value = individuals_buffer[value_index];
-			Trait *trait = value->subpopulation_->species_.TraitFromStringID(p_property_id);
-			int64_t trait_index = trait->Index();
+			slim_effect_t source_value = (slim_effect_t)source_data[0];
 
-			value->trait_info_[trait_index].value_ = (slim_effect_t)source_data[value_index];
+			for (size_t value_index = 0; value_index < p_values_size; ++value_index)
+			{
+				const Individual *value = individuals_buffer[value_index];
+				Trait *trait = value->subpopulation_->species_.TraitFromStringID(p_property_id);
+				int64_t trait_index = trait->Index();
+				
+				value->trait_info_[trait_index].value_ = source_value;
+			}
+		}
+		else
+		{
+			for (size_t value_index = 0; value_index < p_values_size; ++value_index)
+			{
+				const Individual *value = individuals_buffer[value_index];
+				Trait *trait = value->subpopulation_->species_.TraitFromStringID(p_property_id);
+				int64_t trait_index = trait->Index();
+				
+				value->trait_info_[trait_index].value_ = (slim_effect_t)source_data[value_index];
+			}
 		}
 	}
 }

core/slim_test_genetics.cpp

@@ -1085,6 +1085,8 @@ late() { sim.killIndividuals(p1.subsetIndividuals(minAge=1)); }
 		SLiMAssertScriptSuccess(mt_base_p1 + "1 late() { if (!identical(p1.individuals.weight, rep(0.0, 5))) stop(); }");
 		SLiMAssertScriptSuccess(mt_base_p1 + "1 late() { p1.individuals.height = 10.0; if (!identical(p1.individuals.height, rep(10.0, 5))) stop(); }");
 		SLiMAssertScriptSuccess(mt_base_p1 + "1 late() { p1.individuals.weight = 10.0; if (!identical(p1.individuals.weight, rep(10.0, 5))) stop(); }");
+		SLiMAssertScriptSuccess(mt_base_p1 + "1 late() { p1.individuals.height = 10.0:14; if (!identical(p1.individuals.height, 10.0:14)) stop(); }");
+		SLiMAssertScriptSuccess(mt_base_p1 + "1 late() { p1.individuals.weight = 11.0:15; if (!identical(p1.individuals.weight, 11.0:15)) stop(); }");
 	}
 
 	std::cout << "_RunMultitraitTests() done" << std::endl;

core/species_eidos.cpp

@@ -1714,7 +1714,8 @@ EidosValue_SP Species::ExecuteContextFunction_initializeTrait(const std::string
 		else
 		{
 			// see also SLiMTypeInterpreter::_TypeEvaluate_FunctionCall_Internal(), which also tracks this
-			EidosPropertySignature_CSP signature((new EidosPropertySignature(name, true, kEidosValueMaskObject | kEidosValueMaskSingleton, gSLiM_Trait_Class))->MarkAsDynamicWithOwner("Trait"));
+			EidosPropertySignature_CSP signature((new EidosPropertySignature(name, true, kEidosValueMaskObject | kEidosValueMaskSingleton, gSLiM_Trait_Class))
+												 ->MarkAsDynamicWithOwner("Trait"));
 
 			gSLiM_Species_Class->AddSignatureForProperty(signature);
 		}
@@ -1734,7 +1735,10 @@ EidosValue_SP Species::ExecuteContextFunction_initializeTrait(const std::string
 		else
 		{
 			// see also SLiMTypeInterpreter::_TypeEvaluate_FunctionCall_Internal(), which also tracks this
-			EidosPropertySignature_CSP signature((new EidosPropertySignature(name, false, kEidosValueMaskFloat | kEidosValueMaskSingleton))->MarkAsDynamicWithOwner("Trait")->DeclareAcceleratedGet(Individual::GetProperty_Accelerated_TRAIT_VALUE));
+			EidosPropertySignature_CSP signature((new EidosPropertySignature(name, false, kEidosValueMaskFloat | kEidosValueMaskSingleton))->
+												 MarkAsDynamicWithOwner("Trait")->
+												 DeclareAcceleratedGet(Individual::GetProperty_Accelerated_TRAIT_VALUE)->
+												 DeclareAcceleratedSet(Individual::SetProperty_Accelerated_TRAIT_VALUE));
 
 			gSLiM_Individual_Class->AddSignatureForProperty(signature);
 		}