diff --git a/app/Model/DecayingModel.php b/app/Model/DecayingModel.php index dcc41b701..b7a42d28c 100644 --- a/app/Model/DecayingModel.php +++ b/app/Model/DecayingModel.php @@ -277,6 +277,8 @@ class DecayingModel extends AppModel } if (empty($taxonomies[$namespace]['TaxonomyPredicate'][$p]['TaxonomyEntry'])) { unset($taxonomies[$namespace]['TaxonomyPredicate'][$p]); + } else { + $taxonomies[$namespace]['TaxonomyPredicate'][$p]['TaxonomyEntry'] = array_values($taxonomies[$namespace]['TaxonomyPredicate'][$p]['TaxonomyEntry']); } } else { // accept predicates that have a numerical value if (!is_numeric($predicate['numerical_value'])) { @@ -288,6 +290,7 @@ class DecayingModel extends AppModel $taxonomies[$namespace]['TaxonomyPredicate'][$p]['numerical_predicate'] = true; } } + } if (empty($taxonomies[$namespace]['TaxonomyPredicate'])) { $excluded_taxonomies[$namespace] = array('taxonomy' => $taxonomies[$namespace], 'reason' => __('No tags nor predicates with `numerical_value`')); diff --git a/app/Model/DecayingModelsFormulas/Base.php b/app/Model/DecayingModelsFormulas/Base.php index 7d70a98c0..8a28fbfe0 100644 --- a/app/Model/DecayingModelsFormulas/Base.php +++ b/app/Model/DecayingModelsFormulas/Base.php @@ -22,13 +22,13 @@ abstract class DecayingModelBase } $total_score = 0.0; foreach ($tags as $tag) { - $namespace_predicate = explode(':', $tag['Tag']['name'])[0]; + $namespace_predicate = explode('=', $tag['Tag']['name'])[0]; if (isset($taxonomy_base_ratio[$namespace_predicate]) && is_numeric($tag['Tag']['numerical_value'])) { $total_score += floatval($taxonomy_base_ratio[$namespace_predicate]); } } foreach ($tags as $i => $tag) { - $namespace_predicate = explode(':', $tag['Tag']['name'])[0]; + $namespace_predicate = explode('=', $tag['Tag']['name'])[0]; if (isset($taxonomy_base_ratio[$namespace_predicate]) && is_numeric($tag['Tag']['numerical_value'])) { $ratioScore[$namespace_predicate] = floatval($taxonomy_base_ratio[$namespace_predicate]) / $total_score; } @@ -77,7 +77,7 @@ abstract class DecayingModelBase $flag_contain_matching_taxonomy = false; if (!empty($taxonomy_effective_ratios)) { foreach ($tags as $k => $tag) { - $taxonomy = explode(':', $tag['Tag']['name'])[0]; + $taxonomy = explode('=', $tag['Tag']['name'])[0]; if (isset($taxonomy_effective_ratios[$taxonomy])) { $flag_contain_matching_taxonomy = true; $base_score += $taxonomy_effective_ratios[$taxonomy] * $tag['Tag']['numerical_value']; diff --git a/app/View/DecayingModel/decaying_tool_simulation.ctp b/app/View/DecayingModel/decaying_tool_simulation.ctp index d2c6864c4..9688c9850 100644 --- a/app/View/DecayingModel/decaying_tool_simulation.ctp +++ b/app/View/DecayingModel/decaying_tool_simulation.ctp @@ -25,7 +25,7 @@ &$taxonomy_name) { - $taxonomy_name = $taxonomy_name . ':%' ; + $taxonomy_name = $taxonomy_name . '%' ; } ?>