Merge lp:~philsf/mmrrsim/fix-lp-1260122 into lp:mmrrsim

[Felipe Figueiredo]

=== modified file 'ChangeLog'
--- ChangeLog	2013-12-11 23:32:10 +0000
+++ ChangeLog	2013-12-13 01:30:33 +0000
@@ -1,3 +1,7 @@
[phone]  Felipe Figueiredo  <[e-mail]>
+
+	* lib/MMRRSim.pm (create_population): Fix bug LP:1260122.
+
 2013-12-11  Felipe Figueiredo  <[e-mail]>
 
 	* lib/MMRRSim/GridCell.pm: Grid is now a rectangle instead of a
 
=== modified file 'lib/MMRRSim.pm'
--- lib/MMRRSim.pm	2013-12-11 23:33:49 +0000
+++ lib/MMRRSim.pm	2013-12-13 01:30:33 +0000
@@ -130,56 +130,58 @@
 ## Determine size of population
     my $pop_size = $self->pop_size_u + $self->pop_size_m;
 
+
+## Retrieve individual attributes from config object and store them in
+## single a hash
+    my %individual_attributes;
+    for my $attr ( qw( longevity survival autonomy flight_mode act_prop delta_flight ) ) {
+	my $att_value = $self->config->params->{$attr};
+	if ($att_value) {
+	    $individual_attributes{$attr} = $att_value;
+	}
+    }
+
+## Loops for the whold population, and use $_ as the individual name
     for (1..$pop_size) {
-## Set initial coordinates for everyone (if there's a release point
-## for marked individuals, its coords will overwrite this)
+
+## Set initial random coordinates for every individual. If there's a
+## release point for marked individuals, its coords will overwrite
+## this
 	my @coordinates = $self->random_coordinates();
-
-## Create random Activity Center
+	$individual_attributes{coordinates} = \@coordinates;
+## Set random Activity Center
 	my @act_center = $self->random_coordinates();
-
-## FIXME: the following code was made with the pork programming
-## method. Try to make both cases in one block
-	if ($_ <= $self->pop_size_u ) {
-##Creates unmarked population
-	    $population{$_} = MMRRSim::Mosquito->new('name'      => $_,
-						     coordinates => \@coordinates,
-						     act_center  => \@act_center,
-						     mark        => 0,
-						     survival   => 1,
-	    );
-## Set parameters from config file, if applicable
-	for my $attr ( qw( longevity autonomy flight_mode act_prop delta_flight ) ) {
-	    my $att_value = $self->config->params->{$attr};
-	    if ($att_value) {
-		$population{$_}->$attr($att_value);
-	    }
-	}
-## FIXME: be serious and don't copy/paste the same block in two places
-	} else {
-## Set initial coordinates
+	$individual_attributes{act_center} = \@act_center;
+
+	if ($_ <= $self->pop_size_u ) { # unmarked individuals
+
+## Sets unmarked individuals attributes
+	    $individual_attributes{mark} = 0;
+	    $individual_attributes{survival}=1;
+
+	} else { # marked individuals
+
+## Sets marked individuals attributes
+	    $individual_attributes{mark} = 1;
+
+## Sets initial coordinates, if a release point is given
 	if ( @{$self->release_p}) {
 	    @coordinates = @{$self->release_p};
 	}
+	$individual_attributes{coordinates} = \@coordinates;
+
+## Sets activity center, if at least one is given
 	if ( @{$self->a_centers}) {
-	 @act_center = $self->pick_activity_centers();
-	}
-
-##Creates marked population
+	    @act_center = $self->pick_activity_centers();
+	}
+	$individual_attributes{act_center} = \@act_center;
+
+	}
+
+## Create the individual
 	$population{$_} = MMRRSim::Mosquito->new('name'      => $_,
-						 coordinates => \@coordinates,
-						 act_center  => \@act_center,
-						 mark        => 1,
+						 %individual_attributes,
 	    );
-## Set parameters from config file, if applicable
-	for my $attr ( qw( longevity survival autonomy flight_mode act_prop delta_flight ) ) {
-	    my $att_value = $self->config->params->{$attr};
-	    if ($att_value) {
-		$population{$_}->$attr($att_value);
-	    }
-	}
-## FIXME: be serious and don't copy/paste the same block in two places
-	}
     }
 
 ## Set last seen name to pop size, to make sure the next mosquito