Age | Commit message (Collapse) | Author |
|
Conflicts:
wqflask/maintenance/quick_search_table.py
|
|
There's just some issue with parents/f1s not being included if
you select non-BXD (or whatever the group is). All Samples, however
does work.
|
|
For example, changed the two functions getting gene symbols and ids
for a dataset into one function that can take a column name as a
parameter
|
|
correlation type (that is, when it is run again all traits in a
database)
Added a function to data_set.py that gets all the gene_ids in the
data set. Not sure if having a separate function for getting
the gene_ids and another for getting the gene symbols makes sense.
|
|
the mapping, since it is reliable/fast and avoids us having to rewrite
from scratch using something like r/qtl
|
|
Began adding the code that does the initial sort by literature
correlation
|
|
in a dataset (in order to sort by tissue correlation instead of
sample correlation).
|
|
Added file for the interval mapping page and wrote code that
gets/sets some parameters
|
|
and are written to the template
|
|
Resolved conflicts:
wqflask/base/trait.py
wqflask/wqflask/correlation/correlationFunction.py
wqflask/wqflask/correlation/correlation_function.py
wqflask/wqflask/correlation/correlation_functions.py
wqflask/wqflask/correlation/show_corr_results.py
|
|
|
|
manhattan plot
|
|
they import (browser_test.py)
|
|
Improved the templates for a couple pages related to changing user
password, etc
|
|
for them not to have genofiles yet)
|
|
Also added some to notes
|
|
Added notes on using percona to optimise mysql to gn_installation_notes.txt
Started moving "get_trait_data" to DataSet since it is the same regardless
of the particular DataSet subclass (PhenotypeDataSet, MrnaAssayDataSet, etc)
|
|
withouot using reaper and caches results so it doesn't need
to read the file every single time someone loads a page
|
|
and builds each groups' samplelist
|
|
Got human mapping mostly working
Fixed dataset dropdown menus
|
|
Conflicts:
wqflask/base/webqtlConfigLocal.py
wqflask/maintenance/gen_select_dataset.py
wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
|
|
Removed webqtlConfigLocal file containing passwords
Updated main page dropdown menus (dataset_menu_structure.json)
|
|
Appended redis installation info to notes
|
|
dataset; previously we could not view traits in datasets that
were not in the DBType table in the database
|
|
Created new files for mrna assay tissue data and commonly used
db query related functions
|
|
|
|
groups of datasets to give/add read privileges to
|
|
Added caching to creating DataSets object
|
|
Fixed one genofile that had extra quotation marks
in the comments that caused an error
Defaults mb_graph_interval to 1 for species without chromosome
lengths in megabases
|
|
confidential datasets
|
|
|
|
|
|
Conflicts:
wqflask/requirements.txt
wqflask/wqflask/correlation/show_corr_results.py
|
|
Added docstring test to normalize_values
Number of overlapping samples column now displays correctly in the
correlation results page
|
|
in the correlation page weren't displaying
|
|
Conflicts:
wqflask/base/data_set.py
|
|
other places it's called, like search_results.py
Added other trait info fields to correlation results page
|
|
Conflicts:
wqflask/base/data_set.py
wqflask/wqflask/views.py
Fixed a couple conflicts to merge Lei's code related to the correlation page
|
|
Conflicts:
wqflask/wqflask/templates/index_page.html
Merging the code on Sam's branch onto my own
|
|
dataset object for each trait in the correlation results
Added new fields/columns for each trait in the correlation result table
(max LRS, max LRS location, mean expression)
Fixed error if trait doesn't have these fields
|
|
regular search results and show trait page to not display
|
|
of storing list of GeneralTrait objects
Added print statements to track memory usage
|
|
Began writing some jquery to automatically open the first tab
within each species tab on the quick search page (not done yet)
|
|
Added spearman correlation to show_corr_results and template
|
|
Use scipy to calculate pearson correlation instead of old GN code
|
|
values for each trait
|
|
|
|
|
|
shapes to Tony
|
|
Wrote function in dataset.py that gets all the traits in a dataset
and their sample values
|