From 3104f84c563d2e0c63388fa5cdb158857d2b47e1 Mon Sep 17 00:00:00 2001 From: Tetsuro Yoshikawa Date: Sun, 31 Jul 2022 10:50:39 +0900 Subject: [PATCH] fix: change maintinability calculate source, CognitiveComplexity to CyclomaticComplexity. Because strict define using CyclomaticComplexity. --- .../Maintainability/Calculator.ts | 10 +++++----- .../Maintainability/Maintainability.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Analyzer/CodeMetricsCalculator/Maintainability/Calculator.ts b/src/Analyzer/CodeMetricsCalculator/Maintainability/Calculator.ts index 6ef84b2..e5dcbc7 100644 --- a/src/Analyzer/CodeMetricsCalculator/Maintainability/Calculator.ts +++ b/src/Analyzer/CodeMetricsCalculator/Maintainability/Calculator.ts @@ -1,17 +1,17 @@ import { Maintainability } from './Maintainability'; import { HalsteadVolume } from '../Halstead/MetricsValue/HalsteadVolume'; -import { CognitiveComplexity } from '../CognitiveComplexity/CognitiveComplexity'; import { LogicalLineOfCode } from '../LineOfCode/MetricsValue/LogicalLineOfCode'; import { MetricsValue } from '../../Metrics/MetricsValue'; import { Metrics } from '../../Metrics/Metrics'; import { CodePointType } from '../../Metrics/CodePointType'; import { injectable } from 'inversify'; +import { CyclomaticComplexity } from '../CyclomaticComplexity/CyclomaticComplexity'; -type TargetMetrics = HalsteadVolume | LogicalLineOfCode | CognitiveComplexity; +type TargetMetrics = HalsteadVolume | LogicalLineOfCode | CyclomaticComplexity; @injectable() export class Calculator { - readonly targetMetrics = [HalsteadVolume, LogicalLineOfCode, CognitiveComplexity]; + readonly targetMetrics = [HalsteadVolume, LogicalLineOfCode, CyclomaticComplexity]; analyze(metricsList: Metrics[]): Metrics[] { return metricsList @@ -28,8 +28,8 @@ export class Calculator { calculate(metricsList: MetricsValue[]): MetricsValue[] { const halsteadVolume = metricsList.find((row) => row instanceof HalsteadVolume)!; const logicalLineOfCode = metricsList.find((row) => row instanceof LogicalLineOfCode)!; - const cognitiveComplexity = metricsList.find((row) => row instanceof CognitiveComplexity)!; + const cyclomaticComplexity = metricsList.find((row) => row instanceof CyclomaticComplexity)!; - return [new Maintainability(halsteadVolume, cognitiveComplexity, logicalLineOfCode)]; + return [new Maintainability(halsteadVolume, cyclomaticComplexity, logicalLineOfCode)]; } } diff --git a/src/Analyzer/CodeMetricsCalculator/Maintainability/Maintainability.ts b/src/Analyzer/CodeMetricsCalculator/Maintainability/Maintainability.ts index 555c93b..a5817a8 100644 --- a/src/Analyzer/CodeMetricsCalculator/Maintainability/Maintainability.ts +++ b/src/Analyzer/CodeMetricsCalculator/Maintainability/Maintainability.ts @@ -2,14 +2,14 @@ import { Decimal } from 'decimal.js'; import { MetricsType } from '../../Metrics/MetricsType'; import { MetricsValue } from '../../Metrics/MetricsValue'; import { HalsteadVolume } from '../Halstead/MetricsValue/HalsteadVolume'; -import { CognitiveComplexity } from '../CognitiveComplexity/CognitiveComplexity'; import { LogicalLineOfCode } from '../LineOfCode/MetricsValue/LogicalLineOfCode'; +import { CyclomaticComplexity } from '../CyclomaticComplexity/CyclomaticComplexity'; export class Maintainability implements MetricsValue { public readonly type = MetricsType.Maintainability; constructor( private readonly halsteadVolume: HalsteadVolume, - private readonly complexity: CognitiveComplexity, + private readonly complexity: CyclomaticComplexity, private readonly logicalLineOfCode: LogicalLineOfCode ) {}