aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
AgeCommit message (Expand)Author
2013-06-19Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask...Conflicts: wqflask/base/data_set.py wqflask/wqflask/views.py Fixed a couple conflicts to merge Lei's code related to the correlation page Zachary Sloan
2013-06-13Fixed issue where too much memory was used as a result of creating a...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 Lei Yan
2013-06-12Fixed a couple issues with the template that caused the...regular search results and show trait page to not display Zachary Sloan
2013-06-11Put trait info for correlation results page into a dictionary instead...of storing list of GeneralTrait objects Added print statements to track memory usage Lei Yan
2013-05-30Rewrote some code in get_trait_info in dataset.py...Added spearman correlation to show_corr_results and template Lei Yan
2013-05-28Have correlation values appearing in a table in the template...Use scipy to calculate pearson correlation instead of old GN code Lei Yan
2013-05-23Worked on rewriting the function in data_set.py that gets the sample...values for each trait Lei Yan
2013-05-23Changed the way the query that gets sample ids is generatedLei Yan
2013-05-23Now calculates correlation values for traits, but not yet in templateLei Yan
2013-05-09Just added some print statements so I can show matrix/vector...shapes to Tony Zachary Sloan
2013-05-08Worked on correlation page...Wrote function in dataset.py that gets all the traits in a dataset and their sample values Lei Yan
2013-04-09Nick's code works fine with human data...Added option to limit results based on lod score (which also changes the y-axis of the plot) Zachary Sloan
2013-04-05Made changes to get pylmm code working with HMDP datasetsZachary Sloan
2013-04-02Committing before splitting code that runs pylmm with plink files...and code that runs it with json Zachary Sloan
2013-04-02pylmm code is running for human data (plink .bed genotype files)Zachary Sloan
2013-03-19Searches work for the full access human datasets with mRNA assay...searches, and the trait page can be loaded Need to get marker regression page working with human data now Zachary Sloan
2013-03-12Got cashing working with pickleZachary Sloan
2013-03-07Progress bar is now completely working...Still need to figure out the problem that occurred with negative p-values after I refactored the LMM code Zachary Sloan
2013-03-02Created generate_probesetfreeze_file to create the..."probesetfreeze data matrix" file corresponding with the muscle dataset Evan was having trouble with Zachary Sloan
2013-02-14Have marker regression results displaying as a scatterplot (just the points)...using d3.js Zachary Sloan
2013-02-13Fixed some bugs related to getting the marker regression page working...with Nick's code Zachary Sloan
2013-02-12Edited marker_regression.py and data_set.py to store the p-values...and their corresponding markers to be used in the table of qtl results and other figures Zachary Sloan
2013-01-31Changed fd to kw in search_results.py, commented out some lines...related to fd Zachary Sloan
2013-01-18Renamed CorrelationPage.py to show_corr_results.py...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 Zachary Sloan
2013-01-03Began working on marker_regression.py and created Chromosomes class...in species.py Zachary Sloan
2013-01-03Created template for marek regression page and made the compute button direct...to it added asbolute_import in data_set.py and trait.py Made several minor changes and deleted commented out code in trait.py Zachary Sloan
2012-12-18Created new file species.py and species class object TheSpecies...Converted html for the mapping tabs to bootstrap and redid html inside of the Interval Mapping tab Added text input for # of permutation tests and bootstrap tests Zachary Sloan
2012-12-06Added minimum/maximum to basic statistics table...Continued bug-shooting related to getting show_trait running with phenotype traits Zachary Sloan
2012-12-06Got show_trait running again for MrnaAssay traitsZachary Sloan
2012-12-06Made many small changes to show_trait/data_set/search_results/trait to...remove use of the formData object and cursor Zachary Sloan
2012-12-05Renamed webqtlTrait.py to trait.py...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) Zachary Sloan
2012-12-05Continued to make changes related to getting rid of cursor/db_conn...and using simple sqlalchemy Got Pheno/MrnaAssay dataset searches working again Zachary Sloan
2012-12-04Changed parser to allow quotes (i.e. name="rw williams")...Renamed webqtlTrait to GeneralTrait and began rewriting parts Changed database code in many places to use simple sqlalchemy Zachary Sloan
2012-12-04Began changing references to cursor/db_conn to use sqlalchemy...Wrote function for phenotype author searches Zachary Sloan
2012-11-30Added example of escaping strings now that trasitioning to simple SQLAlchemyZachary Sloan
2012-11-30Started switching to using basic sqlalchemy to handle db connection/queries...Began fixing bugs related to this fix, still in progress Zachary Sloan
2012-11-29Changed a number of variables (riset to group, db to dataset)...Put most of the code for cisLRS and transLRS searches into the class CisTransLrsSearch (might change this name to something else later) Simplified escape code for searches in do_search.py Got search_results working again after some changes Zachary Sloan
2012-11-28Made some small changes to get code working for genotype searchesZachary Sloan
2012-11-27Created subclass for each main data set type and moved the code...for getting trait info that was in search_results.py into its respective class Renamed webqtlDataset to DataSet/create_dataset in webqtlTrait.py, webqtlDatabaseFunction.py, and CorrelationPage.py Got search page running again for mRNA assay data sets with these changes Zachary Sloan
2012-11-27Renamed webqtlDataSet.py to data_set.py...Renamed the class webqtlDataset to DataSet Finished cisLRS and transLRS search types in d_search.py Fixed parent/f1 issue in show_trait.py Zachary Sloan