diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc83a2939b2f5f5824413ae2ddad29ba5313880b..b858a75c7332082890a7976391951742171a9b26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,16 +12,6 @@ before_script: test: image: node:16.14-alpine stage: test - only: - refs: - - main - - rc - - beta - - develop - # This matches maintenance branches - - /^(([0-9]+)\.)?([0-9]+)\.x/ - # This matches pre-releases - - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ before_script: [] script: - cd ./api diff --git a/api/package-lock.json b/api/package-lock.json index ad022f66e1bd3cd5cc66b11a88074e828f8c1928..b1be60e300b0ab39e21fdc52116f43c83d6ee4cd 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -28320,4 +28320,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/api/package.json b/api/package.json index d8c47e79a828994003fb85ea8265f64e712e74ec..45e009c3188c6f989647a48cbfc35bb8f5302bc2 100644 --- a/api/package.json +++ b/api/package.json @@ -164,4 +164,4 @@ } ] } -} +} \ No newline at end of file diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/logistic-regression-cv.handler.ts b/api/src/engine/connectors/exareme/handlers/algorithms/logistic-regression-cv.handler.ts index ce0854bb55835e45af1ae9ca920289704f0691bd..588bccaa43237d14676ae49e5f0f8e2d723b23c1 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/logistic-regression-cv.handler.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/logistic-regression-cv.handler.ts @@ -73,7 +73,10 @@ export default class LogisticRegressionCVHandler extends BaseHandler { return { name: 'Confusion matrix', - matrix: [[matrix['tp']], [matrix['fp']], [matrix['fn']], [matrix['tn']]], + matrix: [ + [matrix['tp'], matrix['fp']], + [matrix['fn'], matrix['tn']], + ], xAxis: { categories: ['Positive', 'Negative'], label: 'Actual Values', diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.ts b/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.ts index 098950d835d25c66702909a200250a6653a302a3..f2af031111bdc2d9963005cd01070f5e7b55eb78 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.ts @@ -30,10 +30,10 @@ export default class PearsonHandler extends BaseHandler { { 'name': $lookup($dictName, $k), 'xAxis': { - 'categories': $v.variables.($lookup($$.lookupVars, $)) + 'categories': $v.variables.($lookup($$.lookupVars, $))[] }, 'yAxis': { - 'categories': $reverse($keys($v.$sift(function($val, $key) {$key ~> /^(?!variables$)/}))).($lookup($$.lookupVars, $)) + 'categories': $reverse($keys($v.$sift(function($val, $key) {$key ~> /^(?!variables$)/}))).($lookup($$.lookupVars, $))[] }, 'matrix': $v.$sift(function($val, $key) {$key ~> /^(?!variables$)/}).$each(function($val, $key) {$val})[] }