Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Topic/nirs interface #3094

Merged
merged 56 commits into from
Oct 8, 2020
Merged

Topic/nirs interface #3094

merged 56 commits into from
Oct 8, 2020

Conversation

nickmorales
Copy link
Contributor

@nickmorales nickmorales commented Oct 5, 2020 •
edited
Loading

Description

Upload NIRS data with spectra aggregation using Waves R package.
Display plot of NIRS for queried data.
Includes test and tests pass.

Required an update to the R waves package: solgenomics/R_libs#5

Checklist

  • Refactoring only
  • Documentation only
  • Fixture update only
  • Bug fix
    • The relevant issue has been closed.
    • Further work is required.
  • New feature
    • Relevant tests have been created and run.
    • Data was added to the fixture
      • Data was added via a patch in /t/data/fixture/patches/.
    • User-Facing Change
      • The user manual in /docs has been updated.
    • Any new Perl has been documented using perldoc.
    • Any new JavaScript has been documented using JSDoc.
    • Any new legacy JavaScript has been moved from /js to /js/source/legacy.

nickmorales and others added 30 commits September 20, 2020 14:50
@nickmorales
sommer gblup
2798452
@nickmorales
save sommer gblup
6d9dfd5
@nickmorales
save sommer gblup
e5d61c3
@jmh579
Add screenshots to NIRS documentation
34cefff
@jmh579
Upload documentation images
ddd0391
@nickmorales
keras cnn
e3f1413
@nickmorales
Merge branch 'topic/genotype_upload_tassel_hdf5' into topic/drone_ima…
64a82e6 
…gery_analysis
@nickmorales
Merge branch 'topic/genotype_upload_tassel_hdf5' into topic/drone_ima…
90abb76 
…gery_analysis
@nickmorales
Merge branch 'topic/genotype_upload_tassel_hdf5' into topic/drone_ima…
840e970 
…gery_analysis
@nickmorales
better numerical deriv
cf81aa2
@nickmorales
fix get_model
329e925
@nickmorales
Merge branch 'topic/update_nirs_stat_ontology' into topic/drone_image…
9cc05dd 
…ry_analysis
@nickmorales
Merge branch 'master' into topic/drone_imagery_analysis
273bdae
@nickmorales
Merge branch 'topic/update_nirs_stat_ontology' into topic/drone_image…
d474a46 
…ry_analysis
@nickmorales
Merge branch 'topic/drone_imagery_analysis' into topic/nirs_interface
4f0c674
@nickmorales
test
f1baa89
@nickmorales
debugging
6f69c5e
@nickmorales
working on nirs upload aggregate
98bdef3
@nickmorales
Merge branch 'master' into topic/nirs_interface
db0b65d
@nickmorales
Merge branch 'master' into topic/drone_imagery_analysis
7c2b10c
@nickmorales
working on using pedigree and grm in relationship matrix
b46ea6a
@nickmorales
added sgnstat term for adjusted means
9d324da
@nickmorales
additive rel matrix init
54482e6
@nickmorales
fix expected types
d69738d
@nickmorales
working on compute geno from parents geno and pedigree
d08f32b
@nickmorales
grm with pedigree from parents
7f5df6f
@nickmorales
debug
4e7a9e9
@nickmorales
area under curve init
12d072f
@nickmorales
use area under curve
2493132
@nickmorales
numerical sort
a905668
nickmorales and others added 26 commits October 1, 2020 14:02
@nickmorales
larger page select
18a8faa
@nickmorales
larger page select
c797364
@jmh579
Fix bugs in NIRS upload R script
48ee85a
@jmh579
Fix merge conflict
b86e2e4
@nickmorales
access control
419411c
@nickmorales
Merge branch 'master' into topic/drone_imagery_analysis
c4bfbdb
@nickmorales
Merge branch 'topic/drone_imagery_analysis' into topic/nirs_interface
0069903
@nickmorales
working on nirs upload
7808827
@nickmorales
display nirs spectra plot
5bc3c01
@jmh579
Change NIRS upload output to CSV
95314b3
@jmh579
Merge branch 'topic/nirs_interface' of https://github.com/solgenomics…
58671e1 
…/sgn into topic/nirs_interface
@jmh579
Add R script to visualize spectra
c621b43
@nickmorales
nirs plot spectra
99fc59b
@nickmorales
plot nirs spectra for query
33c4f08
@nickmorales
more clear
5f9cee2
@nickmorales
nirs upload with aggregate
9153d25
@nickmorales
window size
bd4ef38
@nickmorales
add NIRS tests
449bfcc
@nickmorales
add preprint link
5d5bcc2
@nickmorales
nirs files display
4d6eeb6
@nickmorales
autoencoder with training
6795257
@nickmorales
keras vi training
a2835af
@nickmorales
sort by drone run
b8eaf60
@nickmorales
success
f081018
@nickmorales
sort by drone run
d47bc21
@nickmorales
Merge branch 'topic/drone_imagery_analysis' into topic/nirs_interface
5b91fd9
lukasmueller
lukasmueller approved these changes Oct 8, 2020
View reviewed changes
Copy link
Member

@lukasmueller lukasmueller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:-)

@lukasmueller lukasmueller merged commit d8da74c into master Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukasmueller lukasmueller lukasmueller approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nickmorales @lukasmueller @jmh579