zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-23 22:44:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

use Map instead of object where keys can be (reserved) words, fixes #1895

Browse source
This commit is contained in:
zadam 2021-04-26 21:12:46 +02:00
parent 3b1fb8024f
commit 5e40c03fc9
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/services/note_cache/similarity.js
View file

@ -44,7 +44,8 @@ function filterUrlValue(value) {
* @param {Note} note * @param {Note} note
*/ */
function buildRewardMap(note) { function buildRewardMap(note) {
const map = {}; // Need to use Map instead of object: https://github.com/zadam/trilium/issues/1895
const map = new Map();
function addToRewardMap(text, rewardFactor) { function addToRewardMap(text, rewardFactor) {
if (!text) { if (!text) {
@ -53,13 +54,13 @@ function buildRewardMap(note) {
for (const word of splitToWords(text)) { for (const word of splitToWords(text)) {
if (word) { if (word) {
map[word] = map[word] || 0; const currentReward = map.get(word) || 0;
// reward grows with the length of matched string // reward grows with the length of matched string
const length = word.length const length = word.length
- 0.9; // to penalize specifically very short words - 1 and 2 characters - 0.9; // to penalize specifically very short words - 1 and 2 characters
map[word] += rewardFactor * Math.pow(length, 0.7); map.set(word, currentReward + rewardFactor * Math.pow(length, 0.7));
} }
} }
} }
@ -186,7 +187,8 @@ function buildDateLimits(baseNote) {
}; };
} }
const wordCache = {}; // Need to use Map instead of object: https://github.com/zadam/trilium/issues/1895
const wordCache = new Map();
const WORD_BLACKLIST = [ const WORD_BLACKLIST = [
"a", "the", "in", "for", "from", "but", "s", "so", "if", "while", "until", "a", "the", "in", "for", "from", "but", "s", "so", "if", "while", "until",
@ -195,10 +197,11 @@ const WORD_BLACKLIST = [
]; ];
function splitToWords(text) { function splitToWords(text) {
let words = wordCache[text]; let words = wordCache.get(text);
if (!words) { if (!words) {
wordCache[text] = words = text.toLowerCase().split(/[^\p{L}\p{N}]+/u); words = text.toLowerCase().split(/[^\p{L}\p{N}]+/u);
wordCache.set(text, words);
for (const idx in words) { for (const idx in words) {
if (WORD_BLACKLIST.includes(words[idx])) { if (WORD_BLACKLIST.includes(words[idx])) {
@ -265,12 +268,12 @@ async function findSimilarNotes(noteId) {
const lengthPenalization = 1 / Math.pow(text.length, 0.3); const lengthPenalization = 1 / Math.pow(text.length, 0.3);
for (const word of splitToWords(text)) { for (const word of splitToWords(text)) {
const reward = (rewardMap[word] * factor * lengthPenalization) || 0; const reward = (rewardMap.get(word) * factor * lengthPenalization) || 0;
if (displayRewards && reward > 0) { if (displayRewards && reward > 0) {
console.log(`Reward ${Math.round(reward * 10) / 10} for word: ${word}`); console.log(`Reward ${Math.round(reward * 10) / 10} for word: ${word}`);
console.log(`Before: ${counter}, add ${reward}, res: ${counter + reward}`); console.log(`Before: ${counter}, add ${reward}, res: ${counter + reward}`);
console.log(`${rewardMap[word]} * ${factor} * ${lengthPenalization}`); console.log(`${rewardMap.get(word)} * ${factor} * ${lengthPenalization}`);
} }
counter += reward; counter += reward;