|
@@ -42,17 +42,13 @@ discard block |
|
|
block discarded – undo |
|
42
|
42
|
$className = $owner->ClassName; |
|
43
|
43
|
|
|
44
|
44
|
// work out limit and treshold |
|
45
|
|
- $limit = Config::inst()->get($className, 'default_predictor_limit') ?: |
|
46
|
|
- Config::inst()->get(DefaultPredictExtension::class, 'base_default_predictor_limit'); |
|
|
45
|
+ $limit = Config::inst()->get($className, 'default_predictor_limit') ?: Config::inst()->get(DefaultPredictExtension::class, 'base_default_predictor_limit'); |
|
47
|
46
|
|
|
48
|
|
- $threshold = Config::inst()->get($className, 'default_predictor_threshold') ?: |
|
49
|
|
- Config::inst()->get(DefaultPredictExtension::class, 'base_default_predictor_threshold'); |
|
|
47
|
+ $threshold = Config::inst()->get($className, 'default_predictor_threshold') ?: Config::inst()->get(DefaultPredictExtension::class, 'base_default_predictor_threshold'); |
|
50
|
48
|
|
|
51
|
|
- $recencyFactor = Config::inst()->get($className, 'default_predictor_recency_factor') ?: |
|
52
|
|
- Config::inst()->get(DefaultPredictExtension::class, 'base_default_predictor_recency_factor'); |
|
|
49
|
+ $recencyFactor = Config::inst()->get($className, 'default_predictor_recency_factor') ?: Config::inst()->get(DefaultPredictExtension::class, 'base_default_predictor_recency_factor'); |
|
53
|
50
|
|
|
54
|
|
- $fieldsThatMustBeEqual = Config::inst()->get($className, 'fields_that_must_be_equal') ?: |
|
55
|
|
- Config::inst()->get(DefaultPredictExtension::class, 'fields_that_must_be_equal'); |
|
|
51
|
+ $fieldsThatMustBeEqual = Config::inst()->get($className, 'fields_that_must_be_equal') ?: Config::inst()->get(DefaultPredictExtension::class, 'fields_that_must_be_equal'); |
|
56
|
52
|
|
|
57
|
53
|
$predicts = $this->getDefaultPredictionPredictor($limit, $threshold, $recencyFactor, $fieldsThatMustBeEqual); |
|
58
|
54
|
|
|
@@ -79,8 +75,8 @@ discard block |
|
|
block discarded – undo |
|
79
|
75
|
|
|
80
|
76
|
// must be equal |
|
81
|
77
|
$mustBeEqual = []; |
|
82
|
|
- foreach($fieldsThatMustBeEqual as $fieldThatMustBeEqual) { |
|
83
|
|
- if(isset($fieldNames[$fieldThatMustBeEqual])) { |
|
|
78
|
+ foreach ($fieldsThatMustBeEqual as $fieldThatMustBeEqual) { |
|
|
79
|
+ if (isset($fieldNames[$fieldThatMustBeEqual])) { |
|
84
|
80
|
$mustBeEqual[$fieldThatMustBeEqual] = $owner->{$fieldThatMustBeEqual}; |
|
85
|
81
|
} |
|
86
|
82
|
} |
|
@@ -90,7 +86,7 @@ discard block |
|
|
block discarded – undo |
|
90
|
86
|
->exclude(['ID' => $owner->ID]) |
|
91
|
87
|
->limit($limit) |
|
92
|
88
|
; |
|
93
|
|
- if(count($mustBeEqual)) { |
|
|
89
|
+ if (count($mustBeEqual)) { |
|
94
|
90
|
$objects = $objects->filter($mustBeEqual); |
|
95
|
91
|
} |
|
96
|
92
|
// print_r($objects->column('Purpose')); |
|
@@ -112,7 +108,7 @@ discard block |
|
|
block discarded – undo |
|
112
|
108
|
$max = 0; |
|
113
|
109
|
foreach ($objectArray as $object) { |
|
114
|
110
|
$value = $object->{$fieldName}; |
|
115
|
|
- if (! $value) { |
|
|
111
|
+ if (!$value) { |
|
116
|
112
|
$value = ''; |
|
117
|
113
|
} |
|
118
|
114
|
// give more weight to the last one used. |
|
@@ -146,7 +142,7 @@ discard block |
|
|
block discarded – undo |
|
146
|
142
|
$fieldsHasOne = array_keys(Config::inst()->get($className, 'has_one')); |
|
147
|
143
|
|
|
148
|
144
|
// add ID part to has_one fields |
|
149
|
|
- array_walk($fieldsHasOne, function (&$value, $key) { |
|
|
145
|
+ array_walk($fieldsHasOne, function(&$value, $key) { |
|
150
|
146
|
$value .= 'ID'; |
|
151
|
147
|
}); |
|
152
|
148
|
|
|
@@ -178,7 +174,7 @@ discard block |
|
|
block discarded – undo |
|
178
|
174
|
$num = count($array); // provides the value for num |
|
179
|
175
|
|
|
180
|
176
|
return array_map( |
|
181
|
|
- function ($val) use ($num) { |
|
|
177
|
+ function($val) use ($num) { |
|
182
|
178
|
return $val / $num; |
|
183
|
179
|
}, |
|
184
|
180
|
array_count_values($array) // provides the value for $val |