Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration from CMake to Meson #73

Merged
merged 2 commits into from
Jun 6, 2022

Conversation

jgarciamesa
Copy link
Contributor

Replace CMake build framework with Meson, addresses #68.
Replace random number generator with fragmites::random, addresses #70.
Update version header and version number.
Replace syntax from <> to "" when including non system headers.
Add .clang-format (Google style guide) and format modified files accordingly.
Remove deprecated options from doxygen's configuration file.
Add contribution folder with CLI11, doctest, and rapidyaml libraries (not yet in use).

Replace RNG with fragmites::random
Update version header and version number
Replace <> with "" for including headers in include/dawg
Add .clang-format (Google styleguide)
Format modified files according to .clang-format
root_seq.at(i), root_seq.at(i + 1),
root_seq.at(i + 2))),
0, 0);
if(residues.back().data() > 63) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reedacartwright the old comparison was residues.back().data() == -1 but that compares and unsigned int to -1. I updated it to this because to my understanding triplet_to_codon should return a number [0,63]. I would like your confirmation for this change.

Comment on lines +148 to +158
template <typename _It>
void seed(_It first, _It last) {
fragmites::random::seed_seq_t seed(first, last);
maxx.Seed(seed);
}
template <typename T>
void seed(T t) {
maxx.Seed(t);
}

void auto_seed_seq() { maxx.Seed(fragmites::random::auto_seed_seq()); }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reedacartwright generate seed using fragmites::random.

contrib/meson.build Show resolved Hide resolved
Comment on lines +163 to +170
dawg::matic simulation;
// if a seed was specified, use it
if(arg.seed != 0) {
simulation.seed(arg.seed);
} else if(!glopts.sim_seed.empty()) {
simulation.seed(glopts.sim_seed.begin(), glopts.sim_seed.end());
} else {
simulation.auto_seed_seq();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed the variable name to simulation and added the else statement to pick a random seed if no user specified ones.


segment_vector configs;
// mutt maxx;
random_t maxx;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed maxx to be of class fragmites::random::Random.

@reedacartwright reedacartwright merged commit 78fea1d into CartwrightLab:master Jun 6, 2022
@jgarciamesa jgarciamesa deleted the meson branch July 14, 2022 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants