From 0e3c7b037b750e69c927b3c95c367077d46736f9 Mon Sep 17 00:00:00 2001
From: Steve Reis <stevereis93@gmail.com>
Date: Wed, 3 Aug 2022 15:57:09 +0200
Subject: [PATCH] refactor(exareme): Renaming algorithms' name
---
.../handlers/algorithms/anova-one-way.handler.spec.ts | 2 +-
.../exareme/handlers/algorithms/anova-one-way.handler.ts | 6 ++----
.../exareme/handlers/algorithms/pearson.handler.spec.ts | 3 ++-
.../exareme/handlers/algorithms/pearson.handler.ts | 4 +++-
4 files changed, 8 insertions(+), 7 deletions(-)
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 a251a54..1f286bf 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 9788067..2b6fa2d 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 950298b..1ec54c8 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 75d6610..cff25e2 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'] &&
--
GitLab