diff --git a/api/src/engine/connectors/exareme/tests/e2e/3c.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/3c.e2e-spec.ts
index 26a9cc152c6c6ff9cf870dc04c9d73d0522a0a42..8770e901a69a2cfbb5575f079e2d7c65bcd32b0f 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/3c.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/3c.e2e-spec.ts
@@ -39,13 +39,13 @@ describe('ExaremeService', () => {
id: algorithmId,
type: 'string',
parameters: [
- { id: 'dx', value: ['alzheimerbroadcategory'] },
- { id: 'c2_feature_selection_method', value: ['RF'] },
- { id: 'c2_num_clusters_method', value: ['Euclidean'] },
- { id: 'c2_num_clusters', value: ['6'] },
- { id: 'c2_clustering_method', value: ['Euclidean'] },
- { id: 'c3_feature_selection_method', value: ['RF'] },
- { id: 'c3_classification_method', value: ['RF'] },
+ { id: 'dx', value: 'alzheimerbroadcategory' },
+ { id: 'c2_feature_selection_method', value: 'RF' },
+ { id: 'c2_num_clusters_method', value: 'Euclidean' },
+ { id: 'c2_num_clusters', value: '6' },
+ { id: 'c2_clustering_method', value: 'Euclidean' },
+ { id: 'c3_feature_selection_method', value: 'RF' },
+ { id: 'c3_classification_method', value: 'RF' },
],
},
filter: '',
diff --git a/api/src/engine/connectors/exareme/tests/e2e/calibration-belt.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/calibration-belt.e2e-spec.ts
index 377b4ec1dc846449d51243f2ae6f1cf9d0ef58d8..447b8f457dafe655ee12d7d518bcf8b0fc7d37c7 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/calibration-belt.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/calibration-belt.e2e-spec.ts
@@ -41,23 +41,23 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'devel',
- value: ['external'],
+ value: 'external',
},
{
id: 'max_deg',
- value: ['4'],
+ value: '4',
},
{
id: 'confLevels',
- value: ['0.80,0.95'],
+ value: '0.80,0.95',
},
{
id: 'thres',
- value: ['0.95'],
+ value: '0.95',
},
{
id: 'num_points',
- value: ['200'],
+ value: '200',
},
],
},
diff --git a/api/src/engine/connectors/exareme/tests/e2e/cart.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/cart.e2e-spec.ts
index b6a10af1ec50db1d68d52970f9b561fd80a0e22a..f8b0085449c7a0229044d66cd73b09a727149ce1 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/cart.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/cart.e2e-spec.ts
@@ -39,8 +39,8 @@ describe('ExaremeService', () => {
id: algorithmId,
type: 'string',
parameters: [
- { id: 'max_depth', value: ['3'] },
- { id: 'no_split_points', value: ['10'] },
+ { id: 'max_depth', value: '3' },
+ { id: 'no_split_points', value: '10' },
],
},
filter: '',
diff --git a/api/src/engine/connectors/exareme/tests/e2e/descriptiveStatistics.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/descriptiveStatistics.e2e-spec.ts
index 96fb1c2d64aa62350999e9c2f558e254d975ff0a..5808b159dae93067640e66ade63f82a15ab3debb 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/descriptiveStatistics.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/descriptiveStatistics.e2e-spec.ts
@@ -41,6 +41,12 @@ describe('ExaremeService', () => {
parameters: [],
},
filter: '',
+ transformations: [
+ {
+ id: 'lefthippocampus',
+ operation: 'standardize',
+ },
+ ],
};
describe('Integration Test for experiment API', () => {
diff --git a/api/src/engine/connectors/exareme/tests/e2e/id3.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/id3.e2e-spec.ts
index cd9d2547bba9b7e3b346da65bf7dccccb7cb2f3b..4ef963a6ca5ab93cbe07bf0ff422e40a94744413 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/id3.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/id3.e2e-spec.ts
@@ -38,7 +38,7 @@ describe('ExaremeService', () => {
algorithm: {
id: algorithmId,
type: 'string',
- parameters: [{ id: 'iterations_max_number', value: ['20'] }],
+ parameters: [{ id: 'iterations_max_number', value: '20' }],
},
filter: '',
};
diff --git a/api/src/engine/connectors/exareme/tests/e2e/k-means.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/k-means.e2e-spec.ts
index 5d810c8dbc24daa83ec0394e146fd83115a66f81..57054721ff0675b01d5865ca312bcaa5335e143f 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/k-means.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/k-means.e2e-spec.ts
@@ -41,15 +41,15 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'k',
- value: ['4'],
+ value: '4',
},
{
id: 'e',
- value: ['1'],
+ value: '1',
},
{
id: 'iterations_max_number',
- value: ['1000'],
+ value: '1000',
},
],
},
@@ -77,7 +77,7 @@ describe('ExaremeService', () => {
const data = experimentResult.results[0] as RawResult;
expect(
- data.rawdata['data'][0]['leftacgganteriorcingulategyrus'],
+ data.rawdata['data'][2]['leftacgganteriorcingulategyrus'],
).toBeCloseTo(4.197, 2);
});
});
diff --git a/api/src/engine/connectors/exareme/tests/e2e/kaplan-meier.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/kaplan-meier.e2e-spec.ts
index d3cdce684f27d95822b18cc3276531b72bb276c8..b0766164343410b79c98588100c3a43d037b4df1 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/kaplan-meier.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/kaplan-meier.e2e-spec.ts
@@ -40,19 +40,19 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'outcome_pos',
- value: ['AD'],
+ value: 'AD',
},
{
id: 'outcome_neg',
- value: ['MCI'],
+ value: 'MCI',
},
{
id: 'max_age',
- value: ['100'],
+ value: '100',
},
{
id: 'total_duration',
- value: ['1100'],
+ value: '1100',
},
],
},
diff --git a/api/src/engine/connectors/exareme/tests/e2e/linear-regression.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/linear-regression.e2e-spec.ts
index fbb5ab6914182ec8ccd0e9607da67e57fdb49e9d..4ed7f222182726313aaaafde67af362e4f748cc1 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/linear-regression.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/linear-regression.e2e-spec.ts
@@ -41,11 +41,16 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'referencevalues',
- value: ['[{"name":"alzheimerbroadcategory","val":"Other"}]'],
+ value: '[{"name":"alzheimerbroadcategory","val":"Other"}]',
},
{
id: 'encodingparameter',
- value: ['dummycoding'],
+ value: 'dummycoding',
+ },
+ {
+ id: 'filter',
+ value:
+ '{"condition":"AND","rules":[{"id":"subjectageyears","field":"subjectageyears","type":"integer","input":"number","operator":"greater","value":"65"}],"valid":true}',
},
],
},
@@ -77,6 +82,10 @@ describe('ExaremeService', () => {
0.986,
3,
);
+ expect(data.rawdata['data']['statistics'][0]['value']).toBeCloseTo(
+ -1.478,
+ 3,
+ );
});
});
});
diff --git a/api/src/engine/connectors/exareme/tests/e2e/logistic-regression.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/logistic-regression.e2e-spec.ts
index 1ea5e53a29479e7764d40014b4f6bb2a5aa7628b..abc045cd32efb98cd61908c77bd5a122719d7a41 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/logistic-regression.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/logistic-regression.e2e-spec.ts
@@ -39,8 +39,8 @@ describe('ExaremeService', () => {
id: algorithmId,
type: 'string',
parameters: [
- { id: 'positive_level', value: ['M'] },
- { id: 'negative_level', value: ['F'] },
+ { id: 'positive_level', value: 'M' },
+ { id: 'negative_level', value: 'F' },
],
},
filter: '',
diff --git a/api/src/engine/connectors/exareme/tests/e2e/multiple-histograms.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/multiple-histograms.e2e-spec.ts
index b5a020d495c85c5faa4f56c0882fc5df3a9eb9ab..7604dd93bd27b021f0437fd5c87304135b80957d 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/multiple-histograms.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/multiple-histograms.e2e-spec.ts
@@ -37,7 +37,7 @@ describe('ExaremeService', () => {
algorithm: {
id: algorithmId,
type: 'string',
- parameters: [{ id: 'bins', value: ['{ "lefthippocampus" : 35 }'] }],
+ parameters: [{ id: 'bins', value: '{ "lefthippocampus" : 35 }' }],
},
filter: '',
};
diff --git a/api/src/engine/connectors/exareme/tests/e2e/naive-bayes.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/naive-bayes.e2e-spec.ts
index a8565ab4c9f8e68cc3eb1c4791d8d5c5841006f2..024e41227e8642e6896882d09213b02b7510ec25 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/naive-bayes.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/naive-bayes.e2e-spec.ts
@@ -41,11 +41,11 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'alpha',
- value: ['0.1'],
+ value: '0.1',
},
{
id: 'k',
- value: ['10'],
+ value: '10',
},
],
},
diff --git a/api/src/engine/connectors/exareme/tests/e2e/pca.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/pca.e2e-spec.ts
index 7fc57c4b76f9b4f834cfc8dc5d063bd6f5e19732..79f65b81638c405455cdcf2288ce4fd46a6b3a59 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/pca.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/pca.e2e-spec.ts
@@ -39,8 +39,8 @@ describe('ExaremeService', () => {
id: algorithmId,
type: 'string',
parameters: [
- { id: 'standardize', value: ['false'] },
- { id: 'coding', value: ['null'] },
+ { id: 'standardize', value: 'false' },
+ { id: 'coding', value: 'null' },
],
},
filter: '',
diff --git a/api/src/engine/connectors/exareme/tests/e2e/pearson-correlation.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/pearson-correlation.e2e-spec.ts
index 14821462cc633ec53b21979067e076b031914a63..e1617dd43649650676c7eb41f7c3227158a1bec2 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/pearson-correlation.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/pearson-correlation.e2e-spec.ts
@@ -39,8 +39,8 @@ describe('ExaremeService', () => {
id: algorithmId,
type: 'string',
parameters: [
- { id: 'standardize', value: ['false'] },
- { id: 'coding', value: ['null'] },
+ { id: 'standardize', value: 'false' },
+ { id: 'coding', value: 'null' },
],
},
filter: '',
diff --git a/api/src/engine/connectors/exareme/tests/e2e/t-test-independant.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/t-test-independant.e2e-spec.ts
index c7ce2bf958de8947a00ae17c48be33a10d99409a..2dee1858887a161e31f114f0343660847b676215 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/t-test-independant.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/t-test-independant.e2e-spec.ts
@@ -49,27 +49,27 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'xlevels',
- value: ['M', 'F'],
+ value: 'M,F',
},
{
id: 'testvalue',
- value: ['3.0'],
+ value: '3.0',
},
{
id: 'hypothesis',
- value: ['greaterthan'],
+ value: 'greaterthan',
},
{
id: 'effectsize',
- value: ['1'],
+ value: '1',
},
{
id: 'ci',
- value: ['1'],
+ value: '1',
},
{
id: 'meandiff',
- value: ['1'],
+ value: '1',
},
],
},
diff --git a/api/src/engine/connectors/exareme/tests/e2e/t-test-one-sample.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/t-test-one-sample.e2e-spec.ts
index 65c2f282fe18472731be20459e781db61dd2f151..a08e6fb3c9a4ce8332e09fc0a4b02b7cf89f2df7 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/t-test-one-sample.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/t-test-one-sample.e2e-spec.ts
@@ -41,23 +41,23 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'testvalue',
- value: ['3.0'],
+ value: '3.0',
},
{
id: 'hypothesis',
- value: ['different'],
+ value: 'different',
},
{
id: 'effectsize',
- value: ['1'],
+ value: '1',
},
{
id: 'ci',
- value: ['1'],
+ value: '1',
},
{
id: 'meandiff',
- value: ['1'],
+ value: '1',
},
],
},
diff --git a/api/src/engine/connectors/exareme/tests/e2e/t-test-paired.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/t-test-paired.e2e-spec.ts
index be5c049dc3fd7e5434c06522ceb2fd1ea7725da7..dd2b971e8dcb5668faa917f1b1886efb1104359b 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/t-test-paired.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/t-test-paired.e2e-spec.ts
@@ -40,7 +40,7 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'hypothesis',
- value: ['different'],
+ value: 'different',
},
],
},
@@ -66,9 +66,7 @@ describe('ExaremeService', () => {
expect(experimentResult.results.length).toBeGreaterThanOrEqual(1);
const data = experimentResult.results[0] as RawResult;
- console.log(data.rawdata['data']);
-
- //expect(data.rawdata['data'][0]['t_value']).toBeCloseTo(-63.2, 3);
+ expect(data.rawdata['data'][0]['t_value']).toBeCloseTo(-63.2, 3);
});
});
});
diff --git a/api/src/engine/connectors/exareme/tests/e2e/two-way-anova.e2e-spec.ts b/api/src/engine/connectors/exareme/tests/e2e/two-way-anova.e2e-spec.ts
index 4a465ed14561a43406a4519beea07de90396fd22..7b616e3266ed5ad805c74297c512c22f4c20c734 100644
--- a/api/src/engine/connectors/exareme/tests/e2e/two-way-anova.e2e-spec.ts
+++ b/api/src/engine/connectors/exareme/tests/e2e/two-way-anova.e2e-spec.ts
@@ -41,23 +41,23 @@ describe('ExaremeService', () => {
parameters: [
{
id: 'bins',
- value: ['40'],
+ value: '40',
},
{
id: 'iterations_max_number',
- value: ['20'],
+ value: '20',
},
{
id: 'sstype',
- value: ['2'],
+ value: '2',
},
{
id: 'outputformat',
- value: ['pfa'],
+ value: 'pfa',
},
{
id: 'design',
- value: ['additive'],
+ value: 'additive',
},
],
},