MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [decayingModel] Correctly skip tags if taxonomomy has not been 

configured
pull/5032/head
mokaddem 2019-07-18 16:41:40 +02:00
parent d77163fce9
commit d038e2b31c
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Model/DecayingModel.php
View File

@ -247,11 +247,15 @@ class DecayingModel extends AppModel
$total_score = 0.0;
foreach ($tags as $tag) {
$namespace_predicate = explode(':', $tag['Tag']['name'])[0];
$total_score += floatval($taxonomy_base_ratio[$namespace_predicate]);
if (isset($taxonomy_base_ratio[$namespace_predicate])) {
$total_score += floatval($taxonomy_base_ratio[$namespace_predicate]);
}
}
foreach ($tags as $i => $tag) {
$namespace_predicate = explode(':', $tag['Tag']['name'])[0];
$ratioScore[$namespace_predicate] = floatval($taxonomy_base_ratio[$namespace_predicate]) / $total_score;
if (isset($taxonomy_base_ratio[$namespace_predicate])) {
$ratioScore[$namespace_predicate] = floatval($taxonomy_base_ratio[$namespace_predicate]) / $total_score;
}
}
return $ratioScore;
}
@ -292,7 +296,9 @@ class DecayingModel extends AppModel
if (!empty($taxonomy_effective_ratios)) {
foreach ($tags as $k => $tag) {
$taxonomy = explode(':', $tag['Tag']['name'])[0];
$base_score += $taxonomy_effective_ratios[$taxonomy] * $tag['Tag']['numerical_value'];
if (isset($taxonomy_effective_ratios[$taxonomy])) {
$base_score += $taxonomy_effective_ratios[$taxonomy] * $tag['Tag']['numerical_value'];
}
}
}
return array('base_score' => $base_score, 'overridden' => $overridden_tags, 'tags' => $tags, 'taxonomy_effective_ratios' => $taxonomy_effective_ratios);