@sjcrh/proteinpaint-server 2.39.6 → 2.40.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -47,19 +47,45 @@ export function filter2GDCfilter(f) {
47
47
  })
48
48
  continue
49
49
  }
50
- obj.content.push({
51
- op: item.tvs.isnot ? 'or' : 'and',
52
- content: [
53
- {
54
- op: range.startinclusive ? (item.tvs.isnot ? '<' : '>=') : item.tvs.isnot ? '<=' : '>',
55
- content: { field: mayChangeCase2Cases(item.tvs.term.id), value: range.start }
56
- },
57
- {
58
- op: range.stopinclusive ? (item.tvs.isnot ? '>' : '<=') : item.tvs.isnot ? '>=' : '<',
59
- content: { field: mayChangeCase2Cases(item.tvs.term.id), value: range.stop }
60
- }
61
- ]
62
- })
50
+ if (item.tvs.isnot) {
51
+ obj.content.push({
52
+ op: 'or',
53
+ content: [
54
+ {
55
+ op: 'and',
56
+ content: [
57
+ {
58
+ op: range.startinclusive ? '<' : '<=',
59
+ content: { field: mayChangeCase2Cases(item.tvs.term.id), value: range.start }
60
+ }
61
+ ]
62
+ },
63
+ {
64
+ op: 'and',
65
+ content: [
66
+ {
67
+ op: range.stopinclusive ? '>' : '>=',
68
+ content: { field: mayChangeCase2Cases(item.tvs.term.id), value: range.stop }
69
+ }
70
+ ]
71
+ }
72
+ ]
73
+ })
74
+ } else {
75
+ obj.content.push({
76
+ op: 'and',
77
+ content: [
78
+ {
79
+ op: range.startinclusive ? '>=' : '>',
80
+ content: { field: mayChangeCase2Cases(item.tvs.term.id), value: range.start }
81
+ },
82
+ {
83
+ op: range.stopinclusive ? '<=' : '<',
84
+ content: { field: mayChangeCase2Cases(item.tvs.term.id), value: range.stop }
85
+ }
86
+ ]
87
+ })
88
+ }
63
89
  }
64
90
  continue
65
91
  }
package/utils/hclust.R CHANGED
@@ -14,7 +14,9 @@
14
14
 
15
15
  # To plot the heatmap uncomment line `library(ggplot2) and lines after "Visualization" comment
16
16
 
17
- library(jsonlite)
17
+ suppressWarnings({
18
+ suppressPackageStartupMessages(library(jsonlite))
19
+ })
18
20
  #library(flashClust)
19
21
  #library(ggplot2) # Uncomment this line to plot heatmap in R
20
22