diff --git a/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java b/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java index 79c4ace75a7..2fedb6eb5dd 100644 --- a/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java +++ b/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java @@ -48,8 +48,8 @@ public class ExpressionEnrichmentUtil { private static final double LOG2 = Math.log(2); private static final String RNA_SEQ = "rna_seq"; - private static final String POS = "true"; - private static final String NEG = "false"; + private static final List posTypeList = Arrays.asList("true", "yes"); + private static final List negTypeList = Arrays.asList("false", "no"); private static final String ALTERED = "1"; private static final String UNALTERED = "0"; public List getEnrichments( @@ -205,7 +205,15 @@ public List g List molecularDataValues = group.getValue().stream() .map(sampleIndex -> ma.getSplitValues()[sampleIndex]) .filter(StringUtils::isNotEmpty) - .map(a -> a.equals(POS) ? ALTERED : UNALTERED) + .map(a ->{ + if (posTypeList.contains(a)) { + return ALTERED; + } else if (negTypeList.contains(a)) { + return UNALTERED; + } else { + return a; + } + }) .collect(Collectors.toList()); // ignore group if there are less than 2 values