From 3feb99907a3606d9866119ec42cd817b2074beb6 Mon Sep 17 00:00:00 2001
From: Jonathan Foucher <jfoucher@gmail.com>
Date: Mon, 12 Sep 2022 16:28:20 +0200
Subject: [PATCH] put division back
---
app/Repository/GraphDataRepository.php | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/Repository/GraphDataRepository.php b/app/Repository/GraphDataRepository.php
index 335e7d5b..f950ae3e 100644
--- a/app/Repository/GraphDataRepository.php
+++ b/app/Repository/GraphDataRepository.php
@@ -210,16 +210,16 @@ public function getBestMeasuresForEvaluation(Evaluation $evaluation): array
$bestMeasures = array_map(function ($i) {return 0; }, array_flip($measures->pluck('id')->toArray()));
-// $res = DB::select('select measures.id, count(*) as qty from measures
-//-- join measure_scenario on measures.id=measure_scenario.measure_id
-//-- join danger_scenario on danger_scenario.scenario_id=measure_scenario.scenario_id
-//group by measures.id');
+ $res = DB::select('select measures.id, count(*) as qty from measures
+join measure_scenario on measures.id=measure_scenario.measure_id
+join danger_scenario on danger_scenario.scenario_id=measure_scenario.scenario_id
+group by measures.id');
$measureCount = [];
-// foreach ($res as $row) {
-// $measureCount[$row->id] = $row->qty;
-// }
+ foreach ($res as $row) {
+ $measureCount[$row->id] = $row->qty;
+ }
/**
* @var DangerLevelEvaluation $dangerLevel
@@ -270,7 +270,7 @@ public function getBestMeasuresForEvaluation(Evaluation $evaluation): array
// est pondérée par la perception du danger
// puis ajouté au score pour cette mesure
- $ponderatedIncrement = ($l2 - $l1) * $dangerLevel->level->value;// / $measureCount[$measure->id];
+ $ponderatedIncrement = ($l2 - $l1) * $dangerLevel->level->value / $measureCount[$measure->id];
$bestMeasures[$measure->id] += $ponderatedIncrement;
Log::info('Incrément pondéré : ' . $ponderatedIncrement);
Log::info('Valeur courante de la mesure ' . $measure->id . ' (' . $measure->short_name . ') : ' . $bestMeasures[$measure->id]);
--
GitLab