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

chg: [decaying] Better Inheritance and comments

pull/5032/head
mokaddem 2019-08-22 15:56:32 +02:00
parent ed98d73be7
commit 46f6b92360
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/DecayingModelsFormulas/Base.php
View File

@ -11,7 +11,8 @@ abstract class DecayingModelBase
return 'BONFIRE LIT';
}
// get effective taxonomy ratio based on taxonomies attached to the attribute
// Get effective taxonomy ratio based on taxonomies attached to the attribute
// Basically, it adapts the ratio defined in the model to fit the actual attached tags
protected function __getRatioScore($model, $tags)
{
$ratioScore = array();
@ -89,7 +90,7 @@ abstract class DecayingModelBase
return array('base_score' => $base_score, 'overridden' => $overridden_tags, 'tags' => $tags, 'taxonomy_effective_ratios' => $taxonomy_effective_ratios, 'default_base_score' => $default_base_score);
}
// compute the current score for the provided attribute according to the last sighting with the provided model
// Compute the current score for the provided attribute according to the last sighting with the provided model
final public function computeCurrentScore($user, $model, $attribute, $base_score = false, $last_sighting_timestamp = false)
{
if ($base_score === false) {
@ -111,8 +112,9 @@ abstract class DecayingModelBase
return $this->computeScore($model, $attribute, $base_score, $timestamp - $last_sighting_timestamp);
}
// compute the score for the provided attribute according to the elapsed time with the provided model
// Compute the score for the provided attribute according to the elapsed time with the provided model
abstract public function computeScore($model, $attribute, $base_score, $elapsed_time);
// Return a True if the attribute should be marked as decayed
abstract public function isDecayed($model, $attribute, $score);
}

10
app/Model/DecayingModelsFormulas/PolynomialExtended.php
View File

@ -27,12 +27,7 @@ class PolynomialExtended extends Polynomial
public function computeScore($model, $attribute, $base_score, $elapsed_time)
{
if ($elapsed_time < 0) {
return 0;
}
$decay_speed = $model['DecayingModel']['parameters']['decay_speed'];
$lifetime = $model['DecayingModel']['parameters']['lifetime']*24*60*60;
$score = $base_score * (1 - pow($elapsed_time / $lifetime, 1 / $decay_speed));
$score = parent::computeScore($model, $attribute, $base_score, $elapsed_time);
// handle `retention` taxonomy tags
$temp = $this->__getPrioritizedTag($attribute);
@ -53,8 +48,7 @@ class PolynomialExtended extends Polynomial
public function isDecayed($model, $attribute, $score)
{
$threshold = $model['DecayingModel']['parameters']['threshold'];
return $threshold > $score;
return parent::isDecayed($model, $attribute, $score);
}
}
?>