sync changes to to minimal.slim using git diff

adult_movement/adult_movement.slim

@@ -78,15 +78,15 @@ early() {
 	pos = p1.pointDeviated(offspring.size(), pos, "reprising", INF, "n", SD);
 	offspring.setSpatialPosition(pos);
 
-	// Measure local density and use it for density regulation	
+	// Measure local density and use it for density regulation
 	i1.evaluate(p1);
 	inds = p1.individuals;
 	competition = i1.localPopulationDensity(inds);
 	inds.fitnessScaling = 1 / (1 + RHO * competition);
 }
 
 late() {
-	if ((p1.individualCount == 0)){
+	if ((p1.individualCount == 0)) {
 		catn("Population went extinct! Ending the simulation.");
 		sim.simulationFinished();
 	}

maps/simple_map.slim

@@ -105,7 +105,8 @@ s1 late() {
 	// printing out information at selected ticks
 	for(i in seq(0, len(pixial))) {
 		catn(pixial[i]);
-		//writing info about density		
+
+	// writing info about density
 		mytextfileinfo = c(mytextfileinfo, paste0(sim.cycle + "," + ind_den[i] + "," + pixial[i]));
 	}
 	writeFile(mytextfile, mytextfileinfo, append=T);

mate_choice/mate_choice.slim

@@ -57,14 +57,16 @@ initialize() {
 }
 
 first() {
-	i2.evaluate(p1);  // evaluate mate choice interaction values
+	// preparation for the reproduction() callback
+	i2.evaluate(p1);
 }
 
-reproduction(NULL, "F") {		// females choose a male mate
+// females choose a male mate
+reproduction(NULL, "F") {
 	mate = i2.drawByStrength(individual, 1);
-	if (mate.size()) 
+	if (mate.size())
 		// fecundity is doubled because only females reproduce
-		offspring = subpop.addCrossed(individual, mate, count = rpois(1, 2 * FECUN));
+		subpop.addCrossed(individual, mate, count = rpois(1, 2 * FECUN));
 }
 
 early() {