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.

Sign up for GitHub

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

Add substitution model test capability with modeltest-ng binary #141

Merged
merged 14 commits into from
Sep 5, 2020
Merged

Add substitution model test capability with modeltest-ng binary #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4eec8d8
Download newer binaries with modeltest-ng included on Mac, Linux
jtklein Sep 5, 2020
5ffa414
Update bootstrap.js
jtklein Sep 5, 2020
7d953b1
Add modeltest binary option
jtklein Sep 5, 2020
e7f8ffe
Prettier
jtklein Sep 5, 2020
a7962fe
Boolean if run uses modeltest
jtklein Sep 5, 2020
1e88b51
Make modeltest binary arguments
jtklein Sep 5, 2020
50e08af
Disable modeltest if there are more than one alignment or unsuitable …
jtklein Sep 5, 2020
fe7c9d6
Allow selection of processors
jtklein Sep 5, 2020
934ee3d
Send usesModeltest boolean to electron-process
jtklein Sep 5, 2020
cc94edc
Change binary check for modeltest
jtklein Sep 5, 2020
79d3702
Don't run flags check
jtklein Sep 5, 2020
94f4e92
Prettier
jtklein Sep 5, 2020
2f017ca
Update bootstrap.js
jtklein Sep 5, 2020
4e8a1f2
Change text in success message
jtklein Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/download-binaries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const osName = (() => {
}
})();

const binariesBaseDir = "https://github.com/AntonelliLab/raxmlGUI-binaries/releases/download/v20.04";
const binariesBaseDir = "https://github.com/AntonelliLab/raxmlGUI-binaries/releases/download/v20.09";
const binariesUrl = `${binariesBaseDir}/${osName}.zip`;

const binPath = path.join(__dirname, "..", "static", "bin");
Expand Down
2 changes: 1 addition & 1 deletion src/app/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ const App = () => {
onClose={run.clearFinished}
variant={run.exitCode === 0 ? 'success' : 'info'}
message={
run.exitCode === 0 ? 'RAxML finished!' : `RAxML cancelled!`
run.exitCode === 0 ? 'Calculation finished!' : `Calculation cancelled!`
}
/>
</Snackbar>
Expand Down
1 change: 0 additions & 1 deletion src/app/store/Alignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ class Alignment {
/*
DNA, gene1 = 1-3676
BIN, morph = 3677-3851
asdf
*/
let partitionFileText = '';
let site = 1;
Expand Down
Loading
Loading