From 0e00413259fc99db7adef8fed0ee1c174dc42df5 Mon Sep 17 00:00:00 2001 From: mokaddem Date: Fri, 16 Aug 2019 16:58:07 +0200 Subject: [PATCH] chg: [decaying] Improved coverage of model overrides to the API --- app/Model/DecayingModel.php | 4 ++-- app/View/DecayingModel/decaying_tool_simulation.ctp | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Model/DecayingModel.php b/app/Model/DecayingModel.php index 6bdea5a10..5badb34e9 100644 --- a/app/Model/DecayingModel.php +++ b/app/Model/DecayingModel.php @@ -17,6 +17,7 @@ class DecayingModel extends AppModel ); private $__registered_model_classes = array(); + public $allowed_overrides = array('threshold' => 1, 'tau', 'delta'); public function afterFind($results, $primary = false) { foreach ($results as $k => $v) { @@ -438,9 +439,8 @@ class DecayingModel extends AppModel public function overrideModelParameters(&$model, $model_overrides) { - $allowed_overrides = array('threshold' => 1); foreach ($model_overrides as $parameter => $value) { - if (isset($allowed_overrides[$parameter])) { + if (isset($this->allowed_overrides[$parameter])) { $model['DecayingModel']['parameters'][$parameter] = $value; } } diff --git a/app/View/DecayingModel/decaying_tool_simulation.ctp b/app/View/DecayingModel/decaying_tool_simulation.ctp index dcdd9acbc..dd8f6d008 100644 --- a/app/View/DecayingModel/decaying_tool_simulation.ctp +++ b/app/View/DecayingModel/decaying_tool_simulation.ctp @@ -31,11 +31,13 @@ { "includeDecayScore": 1, "excludeDecayed": 0, - "decayingModel": , + "decayingModel": [], "to_ids": 1, "org": , - "tags": - + "tags": , + "modelOverrides": { + + } }