Static array deleted

Author: Nito

src/LanguageData.php

@@ -16,9 +16,11 @@
 limitations under the License.
 */
 
+// This file matches the trained data of the Ngrams database, for new trained databases this file has to be updated.
+
 namespace Nitotm\Eld;
 
-require_once __DIR__.'/LanguageSubset.php';
+require_once __DIR__ . '/LanguageSubset.php';
 
 class LanguageData extends LanguageSubset
 {
@@ -35,16 +37,10 @@ class LanguageData extends LanguageSubset
 
     //  ['Amharic', 'Arabic', 'Azerbaijani (Latin)', 'Belarusian', 'Bulgarian', 'Bengali', 'Catalan', 'Czech', 'Danish', 'German', 'Greek', 'English', 'Spanish', 'Estonian', 'Basque', 'Persian', 'Finnish', 'French', 'Gujarati', 'Hebrew', 'Hindi', 'Croatian', 'Hungarian', 'Armenian', 'Icelandic', 'Italian', 'Japanese', 'Georgian', 'Kannada', 'Korean', 'Kurdish (Arabic)', 'Lao', 'Lithuanian', 'Latvian', 'Malayalam', 'Marathi', 'Malay (Latin)', 'Dutch', 'Norwegian', 'Oriya', 'Punjabi', 'Polish', 'Portuguese', 'Romanian', 'Russian', 'Slovak', 'Slovene', 'Albanian', 'Serbian (Cyrillic)', 'Swedish', 'Tamil', 'Telugu', 'Thai', 'Tagalog', 'Turkish', 'Ukrainian', 'Urdu', 'Vietnamese', 'Yoruba', 'Chinese'];
 
-    // Predeclared for speed.
-    protected $langScore
-        = [
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        ];
-
     // Deprecated for now. Some languages score higher with the same amount of text, this multiplier evens it out for multi-language strings
     //protected $scoreNormalizer = [0.7, 1, 1, 1, 1, 0.6, 0.98, 1, 1, 1, 0.9, 1, 1, 1, 1, 1, 1, 1, 0.6, 1, 0.7, 1, 1, 0.9, 1, 1, 0.8, 0.6, 0.6, 1, 1, 0.5, 1, 1, 0.6, 0.7, 1, 0.95, 1, 0.6, 0.6, 1, 1, 1, 1, 1, 1, 0.9, 1, 1, 0.6, 0.6, 0.7, 0.9, 1, 1, 1, 0.8, 1, 1.7];
 
+    protected $langScore;
     protected $avgScore
         = [
             0.0661, 0.0237, 0.0269, 0.0227, 0.0234, 0.1373, 0.0246, 0.0242, 0.0277, 0.0275, 0.0369, 0.0378, 0.0252,
@@ -54,10 +50,11 @@ class LanguageData extends LanguageSubset
             0.0882, 0.0368, 0.0258, 0.0206, 0.0282, 0.0467, 0.0329, 0.0152
         ];
 
-    function __construct($subsetFile = false)
+    function __construct(string $ngramsFile = 'ngrams-m.php')
     {
-        // Opcache needs to be active, so the load of this database array does not add overhead.
-        require __DIR__.'/ngrams/'.(! $subsetFile ? 'ngrams-m.php' : $subsetFile); 
+        // Opcache needs to be active, so the load of the database array does not add overhead.
+        require __DIR__ . '/ngrams/' . $ngramsFile;
         // Internal reference: _ngrams_newAddEnd4gramExtra_1-4_2824 + _ngrams_charUtf8_1-1_2291
+        $this->langScore = array_fill(0, count($this->langCodes), 0);
     }
 }