-
Notifications
You must be signed in to change notification settings - Fork 558
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.
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
(GSoC) Generic Assay Categorical/Binary data implementation Backend #10303
Merged
dippindots
merged 41 commits into
cBioPortal:master
from
Djokovic0311:GenericAssay-Jiahang
Aug 18, 2023
Merged
Changes from 19 commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
f4b15fb
update backend
Djokovic0311 06d2699
finish tests
Djokovic0311 f46960b
modify controller file structure
Djokovic0311 79e44b4
modify import
Djokovic0311 99357cb
update backend
Djokovic0311 e1166ea
finish tests
Djokovic0311 93f4fc3
modify controller file structure
Djokovic0311 0ab23a6
refactor some variables
Djokovic0311 7b94ec3
modify enrichment compare and validate issue
Djokovic0311 63e9f99
refactor the controllers and services
Djokovic0311 aa229fc
refactor test
Djokovic0311 8569262
Update GenericAssayEnrichmentServiceImpl.java
Djokovic0311 34635ec
fixed simplification issues
Djokovic0311 36a2842
add inline comments
Djokovic0311 fa6e739
modify import
Djokovic0311 46344b0
solve core test issue
Djokovic0311 6bccdb9
test check
Djokovic0311 b142014
modify expressionenrichment
Djokovic0311 732f24e
modify imports
Djokovic0311 78ed825
update backend
Djokovic0311 203ca2a
finish tests
Djokovic0311 4775550
modify controller file structure
Djokovic0311 ef5a474
modify import
Djokovic0311 2cc1329
update backend
Djokovic0311 6d9896b
finish tests
Djokovic0311 e26844e
modify controller file structure
Djokovic0311 4571b26
refactor some variables
Djokovic0311 6be68ef
modify enrichment compare and validate issue
Djokovic0311 54c8cc3
refactor the controllers and services
Djokovic0311 74bd2ae
refactor test
Djokovic0311 5bc13aa
Update GenericAssayEnrichmentServiceImpl.java
Djokovic0311 fa8d5ec
fixed simplification issues
Djokovic0311 fe2acc8
add inline comments
Djokovic0311 7a473ed
modify import
Djokovic0311 ca00f33
solve core test issue
Djokovic0311 1f9dfb0
test check
Djokovic0311 ab59702
modify expressionenrichment
Djokovic0311 13ea407
modify imports
Djokovic0311 7bf56d2
Merge branch 'GenericAssay-Jiahang' of https://github.com/Djokovic031…
Djokovic0311 24158cd
update imports
Djokovic0311 b51a6e3
Update GenericAssayEnrichment.java
Djokovic0311 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
model/src/main/java/org/cbioportal/model/GenericAssayBinaryEnrichment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package org.cbioportal.model; | ||
|
||
import javax.validation.constraints.NotNull; | ||
import java.math.BigDecimal; | ||
import java.util.List; | ||
|
||
public class GenericAssayBinaryEnrichment extends GenericAssayEnrichment { | ||
@NotNull | ||
private List<GenericAssayCountSummary> counts; | ||
|
||
public List<GenericAssayCountSummary> getCounts() { | ||
return counts; | ||
} | ||
|
||
public void setCounts(List<GenericAssayCountSummary> counts) { | ||
this.counts = counts; | ||
} | ||
|
||
} |
18 changes: 18 additions & 0 deletions
18
model/src/main/java/org/cbioportal/model/GenericAssayCategoricalEnrichment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package org.cbioportal.model; | ||
|
||
import javax.validation.constraints.NotNull; | ||
import java.math.BigDecimal; | ||
|
||
public class GenericAssayCategoricalEnrichment extends GenericAssayEnrichment { | ||
@NotNull | ||
private BigDecimal qValue; | ||
|
||
public BigDecimal getqValue() { | ||
return qValue; | ||
} | ||
|
||
public void setqValue(BigDecimal qValue) { | ||
this.qValue = qValue; | ||
} | ||
|
||
} |
38 changes: 38 additions & 0 deletions
38
model/src/main/java/org/cbioportal/model/GenericAssayCountSummary.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
package org.cbioportal.model; | ||
|
||
import javax.validation.constraints.NotNull; | ||
import java.io.Serializable; | ||
|
||
public class GenericAssayCountSummary implements Serializable { | ||
|
||
@NotNull | ||
private String name; | ||
@NotNull | ||
private Integer count; | ||
@NotNull | ||
private Integer totalCount; | ||
|
||
public Integer getCount() { | ||
return count; | ||
} | ||
|
||
public void setCount(Integer count) { | ||
this.count = count; | ||
} | ||
|
||
public String getName() { | ||
return name; | ||
} | ||
|
||
public void setName(String name) { | ||
this.name = name; | ||
} | ||
|
||
public Integer getTotalCount() { | ||
return totalCount; | ||
} | ||
|
||
public void setTotalCount(Integer totalCount) { | ||
this.totalCount = totalCount; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
236 changes: 178 additions & 58 deletions
236
service/src/main/java/org/cbioportal/service/impl/ExpressionEnrichmentServiceImpl.java
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a new line between the two methods? Also maybe better to put compare method after
setqValue
method.