From 97c5bf83c9fb7dcd43a187bb632b7ae47f1010b8 Mon Sep 17 00:00:00 2001
From: Valentin Perrelle <valentin.perrelle@cea.fr>
Date: Wed, 6 Oct 2021 20:05:08 +0200
Subject: [PATCH] [ivette] use Compare.lift
---
ivette/src/frama-c/plugins/eva/Coverage.tsx | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/ivette/src/frama-c/plugins/eva/Coverage.tsx b/ivette/src/frama-c/plugins/eva/Coverage.tsx
index 0c656259992..2d11327b2ce 100644
--- a/ivette/src/frama-c/plugins/eva/Coverage.tsx
+++ b/ivette/src/frama-c/plugins/eva/Coverage.tsx
@@ -37,16 +37,14 @@ type stats = Eva.functionStatsData;
// --- Coverage Table ---
-function map<A, B>(f: (x: B) => A, compare: Compare.Order<A>):
-Compare.Order<B> {
- return (x: B, y: B) => compare(f(x), f(y));
-}
-
const ordering: Arrays.ByColumns<stats> = {
fct: Compare.byFields({ key: Compare.string }),
- alarms: Compare.byFields(
- { alarmStatuses: map((x) => x.unknown + x.invalid, Compare.number) },
- ),
+ alarms: Compare.byFields({
+ alarmStatuses: Compare.lift(
+ (x) => x.unknown + x.invalid,
+ Compare.number,
+ ),
+ }),
sureAlarms: Compare.byFields(
{ alarmStatuses: Compare.byFields({ invalid: Compare.number }) },
),
@@ -61,11 +59,11 @@ const ordering: Arrays.ByColumns<stats> = {
),
}),
totalStatements: Compare.byFields(
- { coverage: map((x) => x.reachable + x.dead, Compare.number) },
+ { coverage: Compare.lift((x) => x.reachable + x.dead, Compare.number) },
),
coverage: Compare.byFields(
{
- coverage: map(
+ coverage: Compare.lift(
(x) => x.reachable / (x.reachable + x.dead),
Compare.number,
),
--
GitLab