St plots

README.md

@@ -123,7 +123,7 @@ you can install it directly from the github repository.
 
 **Note: Only run this if you wish to use the development version**
 ```bash
-pip install https://github.com/biota/sourcetracker2/archive/master.zip
+pip install https://github.com/caporaso-lab/sourcetracker2/archive/master.zip
 ```
 
 To test that your installation was successful, try the following command:

sourcetracker/__init__.py

@@ -9,10 +9,9 @@
 
 from ._compare import compare_sinks, compare_sink_metrics
 from ._sourcetracker import gibbs
-from ._plot import plot_heatmap
 
 
 __version__ = '2.0.1-dev'
 _readme_url = "https://github.com/biota/sourcetracker2/blob/master/README.md"
 
-__all__ = ['compare_sinks', 'compare_sink_metrics', 'gibbs', 'plot_heatmap']
+__all__ = ['compare_sinks', 'compare_sink_metrics', 'gibbs']

sourcetracker/_cli/gibbs.py

@@ -19,7 +19,7 @@
 
 from sourcetracker._cli.cli import cli
 from sourcetracker._gibbs import gibbs_helper
-from sourcetracker._plot import plot_heatmap
+from sourcetracker._plot import ST_graphs
 from sourcetracker._util import parse_sample_metadata, biom_to_df
 
 # import default descriptions
@@ -29,7 +29,11 @@
                                            DESC_RAF2, DESC_RST, DESC_DRW,
                                            DESC_BRN, DESC_DLY, DESC_PFA,
                                            DESC_RPL, DESC_SNK, DESC_SRS,
-                                           DESC_SRS2, DESC_CAT)
+                                           DESC_SRS2, DESC_CAT, DESC_DIA,
+                                           DESC_LIM, DESC_STBAR, DESC_HTM,
+                                           DESC_PHTM, DESC_TTL, DESC_HCOL,
+                                           DESC_UKN, DESC_TRA, DESC_BCOL,
+                                           DESC_FLBR)
 
 # import default values
 from sourcetracker._gibbs_defaults import (DEFAULT_ALPH1, DEFAULT_ALPH2,
@@ -120,9 +124,28 @@
               help=DESC_CAT)
 # Stats functions for diagnostics
 @click.option('--diagnostics', required=False, default=False, is_flag=True,
-              show_default=True)
+              show_default=True, help=DESC_DIA)
 @click.option('--limit', required=False, default=0.05, type=click.FLOAT,
-              show_default=True)
+              show_default=True, help=DESC_LIM)
+# (added options for graphical ouput and varying stats functions)
+@click.option('--stacked_bar', required=False, default=False, is_flag=True,
+              show_default=True, help=DESC_STBAR)
+@click.option('--heatmap', required=False, default=True, is_flag=True,
+              show_default=True, help=DESC_HTM)
+@click.option('--paired_heatmap', required=False, default=False, is_flag=True,
+              show_default=True, help=DESC_PHTM)
+@click.option('--title', required=False, default='Mixing Proportions',
+              type=click.STRING, show_default=True, help=DESC_TTL)
+@click.option('--heatmap_color', required=False, default='viridis',
+              type=click.STRING, show_default=True, help=DESC_HCOL)
+@click.option('--keep_unknowns', required=False, default=True, is_flag=True,
+              show_default=True, help=DESC_UKN)
+@click.option('--transpose', required=False, default=False, is_flag=True,
+              show_default=True, help=DESC_TRA)
+@click.option('--bar_color', required=False, default="", type=click.STRING,
+              show_default=True, help=DESC_BCOL)
+@click.option('--flip_bar', required=False, default=False, is_flag=True,
+              show_default=True, help=DESC_FLBR)
 def gibbs(table_fp: Table,
           mapping_fp: pd.DataFrame,
           output_dir: str,
@@ -144,7 +167,16 @@ def gibbs(table_fp: Table,
           sink_column_value: str,
           source_category_column: str,
           diagnostics: bool,
-          limit: float):
+          limit: float,
+          stacked_bar: bool,
+          heatmap: bool,
+          paired_heatmap: bool,
+          title: str,
+          heatmap_color: str,
+          keep_unknowns: bool,
+          transpose: bool,
+          bar_color: str,
+          flip_bar: bool):
     '''Gibb's sampler for Bayesian estimation of microbial sample sources.
 
     For details, see the project README file.
@@ -180,11 +212,19 @@ def gibbs(table_fp: Table,
     mpm.to_csv(os.path.join(output_dir, 'mixing_proportions.txt'), sep='\t')
     mps.to_csv(os.path.join(output_dir, 'mixing_proportions_stds.txt'),
                sep='\t')
-
+    # need to count number of rows here to check for equality
+    # add notice if not equal
+    color_list = bar_color.split(",")
     # Plot contributions.
-    fig, ax = plot_heatmap(mpm.T)
-    fig.savefig(os.path.join(output_dir, 'mixing_proportions.pdf'), dpi=300)
-
+    graphs = ST_graphs(mpm, output_dir, title=title, color=heatmap_color)
+    if heatmap:
+        graphs.ST_heatmap(keep_unknowns=keep_unknowns)
+    if paired_heatmap:
+        graphs.ST_paired_heatmap(keep_unknowns=keep_unknowns,
+                                 normalized=transpose, transpose=transpose)
+    if stacked_bar:
+        graphs.ST_Stacked_bar(keep_unknowns=keep_unknowns, coloring=color_list,
+                              flipped=flip_bar)
     if diagnostics:
         os.mkdir(output_dir + 'diagnostics')
         data = np.load('envcounts.npy', allow_pickle=True)

sourcetracker/_gibbs_defaults.py

@@ -93,3 +93,37 @@
             'sink (or source if `--loo is passed). '
             'This feature table contains the specific '
             ' of each fractional contribution.')
+DESC_DIA = ('Activate diagnostics function which visualizes the '
+            'deviation of each SourceTracker run, requires'
+            'at least 2 restarts. Default is False.')
+DESC_LIM = ('Minimum deviation limit for display. Default value'
+            'of 0.05')
+DESC_STBAR = ('Activates stacked bar plot visualization.'
+              'Default is False.')
+DESC_HTM = ('Deactivates Heatmap plot. Default is True.')
+DESC_PHTM = ('Activates Paired heatmap visualization. Paired'
+             'heatmap intends to visualize pairings for sourcetracker'
+             'to identify these pairings. Non random pairings are '
+             'identified by the highest result in each column. '
+             'For each correct pairing, the resulting proportion '
+             'should be calculated against a binomial distribution '
+             'with a p value calculated against random distribution '
+             'with a correct proportion of 1/n at random.'
+             'This can be used for groupings such as convergent '
+             'microbiomes or organ transfer similarities as a few'
+             ' examples.')
+DESC_TTL = ('Title input. String format')
+DESC_HCOL = ('Heatmap coloring. Coloring pattern for default and'
+             ' paired heatmap. Default is viridis, other options in'
+             ' plot.py.')
+DESC_UKN = ('keep unknown sources in heatmap or stacked bar plots.'
+            'IMPORTANT: Setting to False will normalize proportions back to'
+            '1.')
+DESC_TRA = ('Transpose Heatmap plots.Flips x and y axis. Default is'
+            ' False.')
+DESC_BCOL = ('Coloring for stacked bar plot. Default is matplotlib'
+             ' default. List format should be used.'
+             'An example of this would be [red,green,blue] with'
+             ' each color in a string format.')
+DESC_FLBR = ('Transpose bar plot. Flips x and y axis. Default is'
+             ' False.')