merge conflict handled

README.md

@@ -5,8 +5,10 @@ Pythonic Genetic MPI paralelized Algorithm
 # PyGMA Documentation
 
 ### Words
-Individuals: an individual with its own genome and a fitness value. It represents one solution in the search space.
+Individuals: Individual with its own genome and a fitness value. It represents one solution in the search space.
+
 Population: an ensemble of many individuals
+
 Operator Stack: stack of genetic operators that will be applied sequentially on the genes of a population.
 
 PyGMA (Pythonic Genetic MPI Parallelized Algorithm) is a genetic algorithm.

src/config.py

@@ -47,7 +47,9 @@ CONFIG = {
     # use mpi parallelization
     # If use_mpi4py_futures=False start with:
     # mpiexec -n 3 python PyGMA.py
-    'use_mpi': False,
+    # or use threads if not specified via slurm
+    # mpiexec -n 3 --use-hwthread-cpus python PyGMA.py
+    'use_mpi': True,
     
     # use mpi4py.futures
     # this will dynamically spawn workers.