Skip to content

Commit 4bead3d

Browse files
committed
fix a readFromPopulationFile() multichrom bug
1 parent 0b7b3a9 commit 4bead3d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

core/species.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -773,11 +773,6 @@ slim_tick_t Species::_InitializePopulationFromTextFile(const char *p_file, Eidos
773773
THREAD_SAFETY_IN_ACTIVE_PARALLEL("Species::_InitializePopulationFromTextFile(): SLiM global state read");
774774

775775
slim_tick_t file_tick, file_cycle;
776-
#if EIDOS_ROBIN_HOOD_HASHING
777-
robin_hood::unordered_flat_map<slim_polymorphismid_t,MutationIndex> mutations;
778-
#elif STD_UNORDERED_MAP_HASHING
779-
std::unordered_map<slim_polymorphismid_t,MutationIndex> mutations;
780-
#endif
781776
std::string line, sub;
782777
std::ifstream infile(p_file);
783778
int spatial_output_count = 0;
@@ -1250,6 +1245,12 @@ slim_tick_t Species::_InitializePopulationFromTextFile(const char *p_file, Eidos
12501245
EIDOS_TERMINATION << "ERROR (Species::_InitializePopulationFromTextFile): a Mutations section must follow each Chromosome line." << EidosTerminate();
12511246

12521247
// Now we are in the Mutations section; read and instantiate all mutations and add them to our map and to the registry
1248+
#if EIDOS_ROBIN_HOOD_HASHING
1249+
robin_hood::unordered_flat_map<slim_polymorphismid_t,MutationIndex> mutations;
1250+
#elif STD_UNORDERED_MAP_HASHING
1251+
std::unordered_map<slim_polymorphismid_t,MutationIndex> mutations;
1252+
#endif
1253+
12531254
while (!infile.eof())
12541255
{
12551256
GetInputLine(infile, line);

0 commit comments

Comments
 (0)