Age | Commit message (Collapse) | Author |
|
|
|
|
|
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
|
|
Improved the templates for a couple pages related to changing user
password, etc
|
|
Got human mapping mostly working
Fixed dataset dropdown menus
|
|
dataset; previously we could not view traits in datasets that
were not in the DBType table in the database
|
|
|
|
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
|
|
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
|
|
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
|
|
Wrote function in dataset.py that gets all the traits in a dataset
and their sample values
|
|
Worked with correlation code; got to the code that
begins to do the actual correlations
Created a function "get_dataset_and_trait" in
the new file "helper_functions.py" because the
code initializing the dataset and trait objects
was repeated in multiple places
|
|
to it
added asbolute_import in data_set.py and trait.py
Made several minor changes and deleted commented out code in trait.py
|
|
of samples for each group
Got show_trait page to display for genotype traits
|
|
remove use of the formData object and cursor
|
|
Renamed webqtlTrait class to GeneralTrait
Began process of removing fd from show_trait.py
Created DatasetGroup object in data_set.py (this may end up becoming
its own file later if it becomes big enough)
|