@@ -1119,14 +1119,14 @@ late() { sim.killIndividuals(p1.subsetIndividuals(minAge=1)); }
11191119 SLiMAssertScriptSuccess (mt_base_p1 + " 5 late() { mut = sim.mutations[0:4]; mut.setDominanceForTrait(c(1,0), 1:10 + 0.5); if (!identical(mut.dominanceForTrait(c(1,0)), 1:10 + 0.5)) stop(); }" );
11201120
11211121 // Substitution effectForTrait()
1122- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.effectForTrait(0), 0.0)) stop(); }" );
1123- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.effectForTrait(1), 0.0)) stop(); }" );
1124- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.effectForTrait(NULL), c(0.0, 0.0))) stop(); }" );
1122+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.effectForTrait(0), 0.0)) stop(); }" );
1123+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.effectForTrait(1), 0.0)) stop(); }" );
1124+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.effectForTrait(NULL), c(0.0, 0.0))) stop(); }" );
11251125
11261126 // Substitution dominanceForTrait()
1127- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.dominanceForTrait(0), 0.5)) stop(); }" );
1128- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.dominanceForTrait(1), 0.5)) stop(); }" );
1129- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.dominanceForTrait(NULL), c(0.5, 0.5))) stop(); }" );
1127+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.dominanceForTrait(0), 0.5)) stop(); }" );
1128+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.dominanceForTrait(1), 0.5)) stop(); }" );
1129+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.dominanceForTrait(NULL), c(0.5, 0.5))) stop(); }" );
11301130
11311131 // Mutation <trait>Effect property
11321132 SLiMAssertScriptSuccess (mt_base_p1 + " 5 late() { mut = sim.mutations[0]; if (!identical(mut.heightEffect, 0.0)) stop(); }" );
@@ -1141,12 +1141,12 @@ late() { sim.killIndividuals(p1.subsetIndividuals(minAge=1)); }
11411141 SLiMAssertScriptSuccess (mt_base_p1 + " 5 late() { mut = sim.mutations[0]; mut.weightDominance = 0.25; if (!identical(mut.weightDominance, 0.25)) stop(); }" );
11421142
11431143 // Substitution <trait>Effect property
1144- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.heightEffect, 0.0)) stop(); }" );
1145- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.weightEffect, 0.0)) stop(); }" );
1144+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.heightEffect, 0.0)) stop(); }" );
1145+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.weightEffect, 0.0)) stop(); }" );
11461146
11471147 // Substitution <trait>Dominance property
1148- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.heightDominance, 0.5)) stop(); }" );
1149- SLiMAssertScriptSuccess (mt_base_p1 + " 100 late() { sub = sim.substitutions[0]; if (!identical(sub.weightDominance, 0.5)) stop(); }" );
1148+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.heightDominance, 0.5)) stop(); }" );
1149+ SLiMAssertScriptSuccess (mt_base_p1 + " 200 late() { sub = sim.substitutions[0]; if (!identical(sub.weightDominance, 0.5)) stop(); }" );
11501150
11511151 }
11521152
0 commit comments