diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.spec.ts b/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.spec.ts index a251a54ec784afdb775ac0e7f8073bd96d2763d2..1f286bfc9edd64f51a5d11810931c6591d2e0f72 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.spec.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.spec.ts @@ -6,7 +6,7 @@ const createExperiment = (): Experiment => ({ id: 'dummy-id', name: 'Testing purpose', algorithm: { - name: 'one_way_ANOVA', + name: AnovaOneWayHandler.ALGO_NAME, }, datasets: ['desd-synthdata'], domain: 'dementia', diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.ts b/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.ts index 97880671b9bd5e1cacf3d86494ae1dc7df82a4a3..2b6fa2d7628c010e98be1c552d566c29ec5e4799 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/anova-one-way.handler.ts @@ -7,10 +7,8 @@ import { TableStyle, } from '../../../../models/result/table-result.model'; import BaseHandler from '../base.handler'; - -const ALGO_NAME = 'one_way_anova'; - export default class AnovaOneWayHandler extends BaseHandler { + public static readonly ALGO_NAME = 'anova_oneway'; private static readonly tuckeyTransform = jsonata(` { "name": 'Tuckey Honest Significant Differences', @@ -49,7 +47,7 @@ export default class AnovaOneWayHandler extends BaseHandler { `); canHandle(algorithm: string): boolean { - return algorithm.toLocaleLowerCase() === ALGO_NAME; + return algorithm.toLocaleLowerCase() === AnovaOneWayHandler.ALGO_NAME; } getTuckeyTable(data: unknown): TableResult | undefined { diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.spec.ts b/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.spec.ts index 950298bc95046e11e80737d733b135125be63ddb..1ec54c8b8c69ebae7d7b00262e6b772ff28054d6 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.spec.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.spec.ts @@ -1,12 +1,13 @@ import { HeatMapResult } from 'src/engine/models/result/heat-map-result.model'; import handlers from '..'; import { Experiment } from '../../../../models/experiment/experiment.model'; +import PearsonHandler from './pearson.handler'; const createExperiment = (): Experiment => ({ id: 'dummy-id', name: 'Testing purpose', algorithm: { - name: 'pearson', + name: PearsonHandler.ALGO_NAME, }, datasets: ['desd-synthdata'], domain: 'dementia', 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 75d6610fd3434866d6d3d09c6526350c9269698e..cff25e2cf307aec468a7b050c33af97f646e02f0 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/pearson.handler.ts @@ -6,6 +6,8 @@ import { HeatMapResult } from '../../../../models/result/heat-map-result.model'; import BaseHandler from '../base.handler'; export default class PearsonHandler extends BaseHandler { + public static readonly ALGO_NAME = 'pearson_correlation'; + private static readonly transform: Expression = jsonata(` ( $params := ['correlations', 'p_values', 'ci_lo', 'ci_hi']; @@ -37,7 +39,7 @@ export default class PearsonHandler extends BaseHandler { */ canHandle(algorithm: string, data: any): boolean { return ( - algorithm.toLocaleLowerCase() === 'pearson' && + algorithm.toLocaleLowerCase() === PearsonHandler.ALGO_NAME && data && data[0] && data[0]['correlations'] &&