Merge pull request #8 from bgruszka/fix-division-by-zero

fixed "division by zero"
bgruszka · Aug 30, 2016 · 3cbef3e · 3cbef3e
2 parents 12ed1b5 + 9b5bf43
commit 3cbef3e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/DecisionMatrix/DefaultDecisionMatrix.php b/src/DecisionMatrix/DefaultDecisionMatrix.php
@@ -18,7 +18,7 @@ public function getMostImportantLexemes()
         $lexemes = $this->corpus->getLexemes($this->words);
 
         foreach ($this->words as $word) {
-            if (strlen($word) > 0 && !in_array($word, $processedWords)) {
+            if (mb_strlen($word, 'utf-8') > 0 && !in_array($word, $processedWords)) {
 
                 // first occurrence of lexeme (unit lexeme)
                 if (!isset($lexemes[$word])) {

diff --git a/src/Method/BurtonMethod.php b/src/Method/BurtonMethod.php
@@ -17,7 +17,7 @@ public function calculate($text)
         $this->setDecisionMatrix($text);
         $this->setLexemesProbability();
 
-        return $this->bayes($this->decisionMatrix->getMostImportantLexemes(true));
+        return $this->bayes($this->decisionMatrix->getMostImportantLexemes());
     }
 
     protected function setDecisionMatrix($text)

diff --git a/src/Method/FisherRobinsonInverseChiSquareMethod.php b/src/Method/FisherRobinsonInverseChiSquareMethod.php
@@ -9,7 +9,7 @@ class FisherRobinsonInverseChiSquareMethod extends Method
     public function calculate($text)
     {
         $this->setDecisionMatrix($text);
-        $this->setLexemesProbability(true);
+        $this->setLexemesProbability();
 
         return $this->fisherRobinsonsInverseChiSquareTest($this->decisionMatrix->getMostImportantLexemes());
     }

diff --git a/src/Method/Method.php b/src/Method/Method.php
@@ -61,7 +61,7 @@ protected function calculateGrahamWordValue(
         return $value;
     }
 
-    protected function setLexemesProbability($withRobinson = false)
+    protected function setLexemesProbability()
     {
         $lexemes = $this->corpus->getLexemes($this->decisionMatrix->getWords());
 
@@ -73,9 +73,7 @@ protected function setLexemesProbability($withRobinson = false)
                 $this->corpus->messagesCount['nospam']
             );
 
-            if ($withRobinson) {
-                $probability = $this->calculateRobinsonWordValue($value['spam'] + $value['nospam'], $probability);
-            }
+            $probability = $this->calculateRobinsonWordValue($value['spam'] + $value['nospam'], $probability);
 
             $lexemes[$word]['probability'] = $probability;
 

diff --git a/src/Method/RobinsonGeometricMeanTestMethod.php b/src/Method/RobinsonGeometricMeanTestMethod.php
@@ -11,7 +11,7 @@ class RobinsonGeometricMeanTestMethod extends Method
     public function calculate($text)
     {
         $this->setDecisionMatrix($text);
-        $this->setLexemesProbability(true);
+        $this->setLexemesProbability();
 
         return $this->robinsonGeometricMeanTest($this->decisionMatrix->getMostImportantLexemes());
     }