Skip to content

Commit 2b8c251

Browse files
committed
Improved documentation.
1 parent b324841 commit 2b8c251

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

docs/index.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Description
44

5-
A program to parallelize and automate the runs of [Structure](http://web.stanford.edu/group/pritchardlab/structure.html) and [fastStructure](https://rajanil.github.io/fastStructure/) software.
5+
A program to parallelize and automate the runs of [Structure](http://web.stanford.edu/group/pritchardlab/structure.html), [fastStructure](https://rajanil.github.io/fastStructure/) and [MavericK](http://www.bobverity.com/home/maverick/what-is-maverick/) software.
66

77

88
## Requirements
@@ -16,7 +16,7 @@ To run "fastChooseK.py" (fastStructure wrapper only), numpy is also required.
1616

1717
* Source code - [Structure_threader on github](https://github.com/StuntsPT/Structure_threader)
1818
* Source distribution with platform binaries for wrapped programs - [Sturcture_threader on Pypi](https://pypi.python.org/pypi/structure_threader/)
19-
* You can install this version easily by issuing the command `pip3 install structure_threader`
19+
* You can easily install *Structure_threader* by issuing the command `pip3 install structure_threader`
2020

2121

2222
## Contents
@@ -34,8 +34,10 @@ To run "fastChooseK.py" (fastStructure wrapper only), numpy is also required.
3434

3535
## A word of caution
3636

37-
*structure_threader* can be quite useful in automating and speeding up your analyses, however, in order to use it effectively you **really** should learn and understand how the wrapped programs work. It is **highly** recommended that you first learn to use the wrapped programs in their default implementations. And by "learning", we don't just mean "I know how to make it run.", but rather "I understand what each of the chosen parameters does, and why I selected each of them.".
38-
The [documentation for *MavericK*](http://www.bobverity.com/home/maverick/additional-files/), for instance, is quite comprehensive and is a good starting point to learn about MCMC chain mixing.
37+
*Structure_threader* can be quite useful in automating and speeding up your analyses, however, in order to use it effectively you **really** should learn and understand how the wrapped programs work. It is **highly** recommended that you first learn to use the wrapped programs in their default implementations. And by "learning", we don't just mean "I know how to make it run.", but rather "I understand what each of the chosen parameters does, and why I selected each of them.".
38+
The paper [An overview of STRUCTURE: applications, parameter settings, and supporting software](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3665925/) is an excellent guide for understanding the parameterization of *STRUCTURE*.
39+
We do not know of a good "tutorial" for learning about *fastStructure*, and as such, the [original research paper](http://www.genetics.org/content/197/2/573) (paywalled), albeit a bit dense, is still the best place to learn about it.
40+
The [documentation for *MavericK*](http://www.bobverity.com/home/maverick/additional-files/), for instance, is quite comprehensive and a great resource to learn to use *MavericK* and consequently about the importance of proper MCMC chain mixing.
3941

4042

4143
## Other works

docs/install.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ Due to the way different Operating Systems handle dependencies specific instruct
55

66
### GNU/Linux
77

8-
1. Install python 3. Although python 3 is already installed by default in most modern Linux distributions, sometimes it may not be available (you can type `python3 --version` from a terminal to see if python 3 is installed). In "Debian based" distributions (such as Ubuntu) you can do so by opening a terminal an running the command `sudo apt-get install python3`. In other Linux distributions you can similarly use your package manger to install python 3. If you do not have administration privileges in your environment, please ask your sysadmin to install python 3 for you. This is the only step that has a hard requirement on administrative privileges.
9-
2. Install `pip`. `pip` is a [package manager for python](https://en.wikipedia.org/wiki/Pip_(package_manager)). If `pip` is not already installed in your system, you can follow the official instructions on how to get it [here](https://pip.pypa.io/en/stable/installing/). **Make sure you run get-pip.py using python 3 in order to be able to use *structure_threader*:** `python3 get-pip.py`
8+
1. Install python 3. Although python 3 is already installed by default in most modern Linux distributions, sometimes it may not be available (you can type `python3 --version` from a terminal to see if python 3 is installed. If it is, you will have something similar to `Python 3.6.1` printed on your terminal, if it isn't you will either see a "command not found" error, or a helpful message on how to install python 3). In "Debian based" distributions (such as Ubuntu) you can install python 3 by opening a terminal an running the command `sudo apt-get install python3`. In other Linux distributions you can similarly use your package manger to install it. If you do not have administration privileges in your environment, please ask your sysadmin to install python 3 for you. This is the only step that has a hard requirement on administrative privileges.
9+
2. Install `pip`. `pip` is a [package manager for python](https://en.wikipedia.org/wiki/Pip_(package_manager)). If `pip` is not already installed in your system, you can follow the official instructions on how to get it [here](https://pip.pypa.io/en/stable/installing/). **Make sure you run get-pip.py using python 3 in order to be able to use *structure_threader*.** Like this: `python3 get-pip.py`
1010
3. Install *Structure_threader*. Now that you have python 3 and `pip` installed, installing *Structure_threader* is just one command away: `pip3 install structure_threader --user`. The `--user` option installs the software to a local directory, ensuring you do not need administration privileges to perform the installation.
11-
4. Using *Structure_threader*. Running the command from step 3 will install the program to `~/.local/bin`. You can either run it by calling it directly `~/.local/bin/structure_threader` or by adding the location `~/.local/bin` to your shell `$PATH` ([here is a good guide on how to do it](https://unix.stackexchange.com/questions/26047/how-to-correctly-add-a-path-to-path))and just calling `structure_threader`. Also note that on GNU/Linux installing *Structure_threader* will also automatically install binaries for *STRUCTURE*, *fastStructure* and *MavericK*, which will also be placed under `~/.local/bin`.
11+
4. Using *Structure_threader*. Running the command from step 3 will install the program to `~/.local/bin`. You can either run it by calling it directly `~/.local/bin/structure_threader` or by adding the location `~/.local/bin` to your shell `$PATH` ([here is a good guide on how to do it](https://unix.stackexchange.com/questions/26047/how-to-correctly-add-a-path-to-path)) and just calling `structure_threader`. Also note that on GNU/Linux installing *Structure_threader* will also automatically install binaries for *STRUCTURE*, *fastStructure* and *MavericK*, which will also be placed under `~/.local/bin`.
1212

1313
### MacOS
1414

15-
1. Install python 3. MacOS comes with python 2.7 (Mac OSX versions before "Sierra" does not have any version of python installed by default) installed by default, but in order do run *Structure_threader* you will need python 3.4 or above. You can [follow this comprehensive guide to do it](http://python-guide-pt-br.readthedocs.io/en/latest/starting/install3/osx/).
15+
1. Install python 3. MacOS comes with python 2.7 installed by default, (Mac OSX versions before "Sierra" does not have any version of python installed) but in order to run *Structure_threader* you will need python 3.4 or above. You can [follow this comprehensive guide to do it](http://python-guide-pt-br.readthedocs.io/en/latest/starting/install3/osx/).
1616
2. Install `pip`. `pip` is a [package manager for python](https://en.wikipedia.org/wiki/Pip_(package_manager)). You can use the guide from step 1 to install it on your system.
17-
3. Install *Structure_threader*. Now that you have python 3 and `pip` installed, installing *Structure_threader* is just one command away: `pip3 install structure_threader --user`. The `--user` option installs the software to a local directory, ensuring you do not need administration privileges to perform the installation.
17+
3. Install *Structure_threader*. Now that you have python 3 and `pip` installed, installing *Structure_threader* is just one terminal command away: `pip3 install structure_threader --user`. The `--user` option installs the software to a local directory, ensuring you do not need administration privileges to perform the installation.
1818
4. Using *Structure_threader*. Running the command from step 3 will install the program to `~/.local/bin`. You can either run it by calling it directly `~/.local/bin/structure_threader` or by adding the location `~/.local/bin` to your shell `$PATH` ([here is a good guide on how to do it](https://unix.stackexchange.com/questions/26047/how-to-correctly-add-a-path-to-path))and just calling `structure_threader`. Also note that on MacOS installing *Structure_threader* will also automatically install binaries for *STRUCTURE*, *fastStructure* and *MavericK*, which will also be placed under `~/.local/bin`.
1919

2020
### Windows
2121

2222
1. Install python 3. No version of Windows comes with python installed by default, but you can install it from [here](https://www.python.org/downloads/). If you need help installing python 3 for windows, here is [the official guide](https://docs.python.org/3/using/windows.html).
2323
2. Install `pip`. `pip` is a [package manager for python](https://en.wikipedia.org/wiki/Pip_(package_manager)). Using the instructions from the guide from step 1 will install `pip` for you.
24-
3. Install *Structure_threader*. Now that you have python 3 and `pip` installed, installing *Structure_threader* is just one command away: `C:\Python3.6\python.exe -m pip install structure_threader`. Don't forget to change the path "python3.6" to whatever version of python 3 you have installed.
25-
4. Using *Structure_threader*. Running the command from step 3 will install the program to `C:\Python3.6/Scripts`. You can run it by calling it directly `C:\Python3.6/Scripts/structure_threader.exe`. Please note that on Windows installing the programs wrapped by *Structure_threader*, *STRUCTURE*, *fastStructure* and *MavericK*, is not done automatically. You will have to do so yourself.
24+
3. Install *Structure_threader*. Now that you have python 3 and `pip` installed, installing *Structure_threader* is just one terminal command away: `C:\Python3.6\python.exe -m pip install structure_threader`. Don't forget to change the path "python3.6" to whatever version of python 3 you have installed.
25+
4. Using *Structure_threader*. Running the command from step 3 will install the program to `C:\Python3.6\Scripts`. You can run it by calling it directly `C:\Python3.6\Scripts\structure_threader.exe`. Please note that on Windows installing the programs wrapped by *Structure_threader*, *STRUCTURE*, *fastStructure* and *MavericK*, is not done automatically. You will have to do so yourself.
2626

2727

2828
## Alternative methods (AKA 'expert mode')
@@ -37,7 +37,7 @@ better, `pip3 install .`) from the distribution's root directory (where
3737

3838
Please note that while dependencies like numpy and matplotlib are handled by
3939
this method, the preferred method for installing via Pypi will also install
40-
binary versions of *STRUCTURE*, *fastStructure* and *MavericK* for your platform (except for the Windows platform).
40+
binary versions of *STRUCTURE*, *fastStructure* and *MavericK* for your platform (except on Windows).
4141
These binaries are installed in the "standard" `setup.py`
4242
[locations](https://docs.python.org/2/install/), eg. `/usr/bin/` if installed
4343
with `sudo` or `~/.local/bin/` if installed with the option `--user`, etc...
@@ -47,4 +47,4 @@ rely on our
4747
["helper_scripts"](https://github.com/StuntsPT/Structure_threader/tree/master/helper_scripts)
4848
which contain commands to compile and install *Structure*, *fastStructure* **and** *MavericK* (along with any required dependencies). For more details check the next few sections.
4949

50-
If you wish to compile your own binaries for the extrnal programs, the manual section [Extrenal programs](external.md) describes how the distributed binaries were built. Instructions and a build script are provided for *Structure*, *fastStructure* and *MavericK*.
50+
If you wish to compile your own binaries for the external programs, the manual section [Extrenal programs](external.md) describes how the distributed binaries were built. Instructions and a build script are provided for *Structure*, *fastStructure* and *MavericK*.

0 commit comments

Comments
 (0)