v1.0.2, check changelog.md

Author: pablocarderam

changelog.md

@@ -1,6 +1,9 @@
 
 # Opqua Changelog
 
+## v1.0.2
+Previous fix didn't cut it and I jumped the gun on the release. This works.
+
 ## v1.0.1
 Fixed recombination bug where one of the two progeny genomes was being lost
 (thanks David Suárez!).

opqua/internal/host.py

@@ -324,12 +324,12 @@ def recombine(self,rand):
             num_evts = np.random.poisson( self.population.num_crossover_host )
             loci = np.random.randint( 0, self.population.num_loci, num_evts )
 
-            parents = [ genomes[index_genome], genomes[index_other_genome] ]
             children = [ genomes[index_genome], genomes[index_other_genome] ]
 
             for l in loci:
-                children[0] = children[0][0:l] + parents[1][l:]
-                children[1] = children[1][0:l] + parents[0][l:]
+                temp_child_0 = children[0]
+                children[0] = children[0][0:l] + children[1][l:]
+                children[1] = children[1][0:l] + temp_child_0[l:]
 
             children = [
                 genome.split(self.population.CHROMOSOME_SEPARATOR)

opqua/internal/vector.py

@@ -325,12 +325,12 @@ def recombine(self,rand):
             num_evts = np.random.poisson( self.population.num_crossover_vector )
             loci = np.random.randint( 0, self.population.num_loci, num_evts )
 
-            parents = [ genomes[index_genome], genomes[index_other_genome] ]
             children = [ genomes[index_genome], genomes[index_other_genome] ]
 
             for l in loci:
-                children[0] = children[0][0:l] + parents[1][l:]
-                children[1] = children[1][0:l] + parents[0][l:]
+                temp_child_0 = children[0]
+                children[0] = children[0][0:l] + children[1][l:]
+                children[1] = children[1][0:l] + temp_child_0[l:]
 
             children = [
                 genome.split(self.population.CHROMOSOME_SEPARATOR)

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='opqua',
-    version='v1.0.1',
+    version='v1.0.2',
     description='An epidemiological modeling framework for population ' \
         + 'genetics and evolution.',
     long_description='Opqua is an epidemiological modeling framework for ' \
@@ -21,7 +21,7 @@
         + 'evolution and epidemiology. \n\n Visit ' \
         + 'github.com/pablocarderam/opqua for more information.',
     url='https://github.com/pablocarderam/opqua',
-    download_url='https://github.com/pablocarderam/opqua/archive/v1.0.1.tar.gz',
+    download_url='https://github.com/pablocarderam/opqua/archive/v1.0.2.tar.gz',
     author='Pablo Cardenas',
     author_email='[email protected]',
     keywords=['epidemiology','evolution','biology'],