Skip to content

Commit

Permalink
Merge branch 'mabe-systematics' of github.com:devosoft/Empirical into…
Browse files Browse the repository at this point in the history
… mabe-systematics
  • Loading branch information
emilydolson committed Mar 2, 2024
2 parents dd09c54 + b0c9e70 commit c362b78
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/emp/Evolve/Systematics.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ namespace emp {
/// Intended to be used on an empty systematics object
/// Expects a file in ALife phylogeny standard format (see: https://alife-data-standards.github.io/alife-data-standards/phylogeny)
/// @param file_path the file to load data from
/// @param info_col the name of the column in the file that contains the taxon info (i.e. the information taxa are defined based; should match return type of calc_taxon_info_fun)
/// @param info_col the name of the column in the file that contains the taxon info (i.e. the information distinguishing taxa; should match return type of calc_taxon_info_fun)
/// @param assume_leaves_extant if true, assumes that all leaf nodes correspond to extant taxa
/// @param adjust_total_offspring if true, adjusts the total offspring count of each taxon based on the number of offspring it actually has (time consuming but necessary for some stats)
void LoadFromFile(const std::string & file_path, const std::string & info_col = "info",
Expand Down

0 comments on commit c362b78

Please sign in to comment.