update

PhyreApps · May 23, 2024 · b21409e · b21409e
1 parent 910d1f8
commit b21409e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/src/rhyme-helper-bg.js b/src/rhyme-helper-bg.js
@@ -2,10 +2,10 @@ class RhymeHelperBG {
 
     static getRhymeRate(word, withWord) {
 
-        if (word.length < 3) {
+        if (word.length < 2) {
             return 0;
         }
-        if (withWord.length < 3) {
+        if (withWord.length < 2) {
             return 0;
         }
         word = word.toLowerCase();
@@ -17,14 +17,44 @@ class RhymeHelperBG {
         let rhymeRate = 0;
         const wordSimilar = this.getSimilarSounding(word);
         const wordCombinations = this.wordCombinations(word, 4);
+        const wordLastTwoLetters = word.substring(word.length - 2);
         const wordLastFourLetters = word.substring(word.length - 4);
         const wordLastThreeLetters = word.substring(word.length - 3);
 
-        if (withWord.includes(wordLastFourLetters)) {
+        const withWordSimilar = this.getSimilarSounding(withWord);
+        const withWordCombinations = this.wordCombinations(withWord, 4);
+        const withWordLastTwoLetters = withWord.substring(withWord.length - 2);
+        const withWordLastFourLetters = withWord.substring(withWord.length - 4);
+        const withWordLastThreeLetters = withWord.substring(withWord.length - 3);
+
+        if (wordLastFourLetters === withWordLastFourLetters) {
             rhymeRate = rhymeRate + 1;
         }
-        if (withWord.includes(wordLastThreeLetters)) {
-            rhymeRate = rhymeRate + 1;
+        if (wordLastThreeLetters === withWordLastThreeLetters) {
+            rhymeRate = rhymeRate + 0.5;
+        }
+        if (wordLastTwoLetters === withWordLastTwoLetters) {
+            rhymeRate = rhymeRate + 0.05;
+        }
+
+        if (wordSimilar.length > 0) {
+            for (let similar of wordSimilar) {
+
+                let wordSimilarTwoLetters = similar.substring(similar.length - 2);
+                let wordSimilarThreeLetters = similar.substring(similar.length - 3);
+                let wordSimilarFourLetters = similar.substring(similar.length - 4);
+
+                if (wordSimilarTwoLetters === withWordLastTwoLetters) {
+                    rhymeRate = rhymeRate + 0.05;
+                }
+                if (wordSimilarThreeLetters === withWordLastThreeLetters) {
+                    rhymeRate = rhymeRate + 0.5;
+                }
+                if (wordSimilarFourLetters === withWordLastFourLetters) {
+                    rhymeRate = rhymeRate + 1;
+                }
+
+            }
         }
 
         return rhymeRate;

diff --git a/src/rhyme.js b/src/rhyme.js
@@ -1,6 +1,7 @@
 // Read content from file
 const RhymeEngine = require('./rhyme-engine');
 const RhymeAnalysis = require("./rhyme-analysis");
+const RhymeHelperBG = require("./rhyme-helper-bg");
 //
 // // Read the file
 // const rhyme = fs.readFileSync('src/dict/bg-spellchecked.txt', 'utf8');
@@ -32,6 +33,8 @@ let txt = '' +
     'Не питай защо, само здраво се дръж, \n' +
     'мед ще ми носиш когато сваля те веднъж.';
 
-let rhymeAnalysis = RhymeAnalysis.analyze(txt);
+// let rhymeAnalysis = RhymeAnalysis.analyze(txt);
+//
+// console.log(rhymeAnalysis);
 
-console.log(rhymeAnalysis);
+RhymeHelperBG.getRhymeRate("Сняг", "Як");
diff --git a/tests/rhyme-helper.test.js b/tests/rhyme-helper.test.js
@@ -1,6 +1,8 @@
 const RhymeHelperBG = require("../src/rhyme-helper-bg");
 test("Check rhymes", () => {
 
+    expect(RhymeHelperBG.getRhymeRate("Сняг", "Як"))
+        .toBeGreaterThan(0.04);
 
     expect(RhymeHelperBG.getRhymeRate("Божидар", "Говедар"))
         .toBeGreaterThan(0.5);
@@ -12,6 +14,4 @@ test("Check rhymes", () => {
         .toBeGreaterThan(0.5);
 
 
-
-
 })