0

src/test/build.test32.js

@@ -2,21 +2,42 @@ import commonModel from '../model/commonModel.js';
 import fs from 'fs';
 import { stringUtils } from '../util/stringClass.js';
 
-function runScript(a,b,fuhao){
-    if (fuhao=="+")
-        return a+b;
-    if (fuhao=="-")
-        return a-b;
-    if (fuhao=="×")
-        return a*b;
-    if (fuhao=="÷")
-        return a/b;
+function runScript(){
+    check("went");
+    check("better");
+    check("children");
+    check("cannot");
+    check("walked");
+    check("planned");
+    check("used");
+    check("studied");
+    check("walking");
+    check("running");
+    check("faster");
+    check("fastest");
+    check("happier");
+    check("happiest");
+    check("quickly");
+    check("happily");
+    check("books");
+    check("boxes");
+    check("heroes");
+    check("cities");
+    check("knives");
+    check("mice");
+    check("this");
+    check("WALKED");
+    check("can't");
+    check("quickly");
+    check("run");
+    check("big");
+    check("computer");
+    check("beautiful");
+}
 
-    if (fuhao=="²")
-        return a*a;
-    
+function check(str){
+    let arr1=stringUtils.getWordAllForms(str);
+    console.log(str+" 变形有："+arr1.join(",")+";\n");
 }
 
-let a=123,b=456;
-let result=runScript(a,b,"²");
-console.log(a+"÷"+b+"="+result);
+runScript();

src/util/stringClass.js

@@ -1019,9 +1019,6 @@ export const stringUtils = {
         // 保留原始单词，包括大小写和标点符号
         const originalWord = word;
         
-        // 处理缩写词中的撇号
-        const hasApostrophe = word.includes("'");
-        
         // 转换为小写进行处理
         const lowerWord = word.toLowerCase();
         
@@ -1033,47 +1030,41 @@ export const stringUtils = {
             allForms.add(originalWord);
         }
         
-        // 可以考虑添加一个标志来避免重复检查
-        let foundIrregular = false;
         // 检查是否是不规则动词
         for (const [base, forms] of Object.entries(stringUtils.irregularVerbs)) {
             if (base === lowerWord || forms.includes(lowerWord)) {
                 // 添加原形和所有变形
                 allForms.add(base);
                 forms.forEach(form => allForms.add(form));
-                foundIrregular = true;
-                break;
+                // 不规则动词处理完成后继续处理其他类型
             }
         }
         
-        // 不规则形容词/副词检查后应该也考虑是否返回
+        // 不规则形容词/副词检查
         for (const [base, forms] of Object.entries(stringUtils.irregularAdjectives)) {
             if (base === lowerWord || forms.includes(lowerWord)) {
                 // 添加原形和所有变形
                 allForms.add(base);
                 forms.forEach(form => allForms.add(form));
-                foundIrregular = true;
-                break;
+                // 不规则形容词处理完成后继续处理其他类型
             }
         }
 
-        // 不规则名词检查后也应该设置标志
+        // 不规则名词检查（单数形式）
         if (stringUtils.irregularNouns[lowerWord]) {
+            allForms.add(lowerWord); // 添加原词
             stringUtils.irregularNouns[lowerWord].forEach(form => allForms.add(form));
-            foundIrregular = true;
         }
 
-        // 不规则名词复数形式检查后也应该设置标志
+        // 不规则名词检查（复数形式）
         for (const [singular, plurals] of Object.entries(stringUtils.irregularNouns)) {
             if (plurals.includes(lowerWord)) {
                 allForms.add(singular);
+                allForms.add(lowerWord); // 添加原词
                 plurals.forEach(form => allForms.add(form));
-                foundIrregular = true;
-                break;
             }
         }
         
-        // 处理规则变形
         // 特殊处理一些常见的副词和特殊单词，避免错误的词干提取和变形
         const specialWords = {
             // 情态动词
@@ -1083,7 +1074,7 @@ export const stringUtils = {
             'will': ['will', 'would', "won't", "wouldn't"],
             'must': ['must', 'have to', 'has to', 'had to', "mustn't"],
             
-            // 副词
+            // 特殊副词
             'early': ['early', 'earlier', 'earliest'],
             'only': ['only'],
             'likely': ['likely', 'more likely', 'most likely'],
@@ -1115,11 +1106,14 @@ export const stringUtils = {
             'hero': ['hero', 'heroes'],
             'echo': ['echo', 'echoes'],
 
+            // 缩写词
             'its': ['its'], // 物主代词
-            'it\'s': ['it\'s'], // it is 的缩写
-            'I\'m': ['I\'m'], // I am 的缩写
-            'don\'t': ['don\'t'], // do not 的缩写
-            'doesn\'t': ['doesn\'t'], // does not 的缩写
+            'it\'s': ['it\'s', 'it is', 'it has'], // it is 的缩写
+            'I\'m': ['I\'m', 'I am'], // I am 的缩写
+            'don\'t': ['don\'t', 'do not'], // do not 的缩写
+            'doesn\'t': ['doesn\'t', 'does not'], // does not 的缩写
+            'can\'t': ['can\'t', 'cannot'], // can not 的缩写
+            'won\'t': ['won\'t', 'will not'], // will not 的缩写
             'we\'re': ['we are'],
             'they\'re': ['they are'],
             'you\'re': ['you are'],
@@ -1129,14 +1123,25 @@ export const stringUtils = {
             'we\'d': ['we would', 'we had'],
             'they\'d': ['they would', 'they had'],
             'couldn\'t': ['could not'],
+            'shouldn\'t': ['should not'],
+            'wouldn\'t': ['would not'],
+            'mustn\'t': ['must not'],
+            'haven\'t': ['haven\'t', 'have not'],
+            'hasn\'t': ['hasn\'t', 'has not'],
+            'hadn\'t': ['hadn\'t', 'had not'],
+            'isn\'t': ['isn\'t', 'is not'],
+            'aren\'t': ['aren\'t', 'are not'],
+            'wasn\'t': ['wasn\'t', 'was not'],
+            'weren\'t': ['weren\'t', 'were not'],
             'should\'ve': ['should have'],
             'would\'ve': ['would have'],
             'could\'ve': ['could have']
         };
         
-        // 如果是特殊单词，直接返回预定义的变形
+        // 如果是特殊单词，添加预定义的变形
         if (specialWords[lowerWord]) {
             specialWords[lowerWord].forEach(form => allForms.add(form));
+            // 处理完特殊词后返回，避免进一步处理
             return [...allForms];
         }
         
@@ -1144,6 +1149,7 @@ export const stringUtils = {
         for (const [base, forms] of Object.entries(specialWords)) {
             if (forms.includes(lowerWord)) {
                 forms.forEach(form => allForms.add(form));
+                // 处理完特殊词后返回，避免进一步处理
                 return [...allForms];
             }
         }
@@ -1155,156 +1161,176 @@ export const stringUtils = {
         const specialBaseWords = ['this', 'is', 'was', 'has', 'his', 'its', 'us', 'yes', 'thus', 'plus'];
         if (specialBaseWords.includes(lowerWord)) {
             possibleBaseWords.push(lowerWord);
+            // 对于特殊基础词，只返回原词
             return [...allForms];
         }
         
         // 处理规则变形
         // 处理过去式/过去分词 (-ed)
-        if (lowerWord.endsWith('ed')) {
+        if (lowerWord.endsWith('ed') && lowerWord.length > 2) {
+            // 基本形式
             possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (walked -> walk)
             
-            // 处理双辅音+ed的情况 (stepped -> step, hummed -> hum)
+            // 处理双辅音+ed的情况 (stepped -> step, planned -> plan)
             const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1ed$/;
             if (doubleConsonantPattern.test(lowerWord)) {
-                possibleBaseWords.push(lowerWord.slice(0, -3)); // 如 stepped -> step
+                possibleBaseWords.push(lowerWord.slice(0, -3)); // 如 planned -> plan
             }
             
-            // 处理以辅音+e结尾的动词变为ed的情况
+            // 处理以辅音+y结尾变为ied的情况 (studied -> study)
+            if (lowerWord.endsWith('ied') && lowerWord.length > 3) {
+                const beforeY = lowerWord.slice(0, -3);
+                if (beforeY.length > 0 && /[a-z]$/.test(beforeY)) {
+                    possibleBaseWords.push(beforeY + 'y');
+                }
+            }
+            
+            // 处理以e结尾的动词变为ed的情况 (liked -> like)
             if (/[bcdfghjklmnpqrstvwxyz]ed$/.test(lowerWord)) {
-                possibleBaseWords.push(lowerWord.slice(0, -2) + 'e'); // 如 liked -> like
+                possibleBaseWords.push(lowerWord.slice(0, -1)); // 如 liked -> like
             }
         }
         
-        // 处理以e结尾的动词加d的情况
-        if (lowerWord.endsWith('d') && !lowerWord.endsWith('ed')) {
+        // 处理以e结尾的动词加d的情况 (used -> use)
+        if (lowerWord.endsWith('d') && !lowerWord.endsWith('ed') && lowerWord.length > 1) {
             possibleBaseWords.push(lowerWord.slice(0, -1)); // 如 used -> use
         }
         
-        // 处理以辅音+y结尾变为ied的情况
-        if (lowerWord.endsWith('ied')) {
-            possibleBaseWords.push(lowerWord.slice(0, -3) + 'y'); // 如 tried -> try
-            // 处理一些不是由y变形而来的ied结尾单词
-            possibleBaseWords.push(lowerWord.slice(0, -1)); // 如 applied -> apply (虽然这个例子不准确，但为了覆盖更多情况)
-        }
-        
         // 处理现在分词 (-ing)
-        if (lowerWord.endsWith('ing')) {
+        if (lowerWord.endsWith('ing') && lowerWord.length > 3) {
             possibleBaseWords.push(lowerWord.slice(0, -3)); // 常规情况 (walking -> walk)
-            possibleBaseWords.push(lowerWord.slice(0, -3) + 'e'); // 以e结尾的动词 (making -> make)
             
-            // 处理双辅音+ing的情况 (running -> run, swimming -> swim)
+            // 处理双辅音+ing的情况 (running -> run)
             const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1ing$/;
             if (doubleConsonantPattern.test(lowerWord)) {
                 possibleBaseWords.push(lowerWord.slice(0, -4)); // 如 running -> run
             }
             
-            // 处理特殊的ing形式
-            if (lowerWord.endsWith('ying')) {
+            // 处理特殊的ing形式 (lying -> lie)
+            if (lowerWord.endsWith('ying') && lowerWord.length > 4) {
                 possibleBaseWords.push(lowerWord.slice(0, -4) + 'ie'); // 如 lying -> lie
             }
+            
+            // 处理以辅音+e结尾的动词变为ing的情况 (like -> liking)
+            if (/[bcdfghjklmnpqrstvwxyz]ing$/.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -3) + 'e');
+            }
         }
         
-        // 处理比较级/最高级
-        if (lowerWord.endsWith('er')) {
+        // 处理比较级 (-er)
+        if (lowerWord.endsWith('er') && lowerWord.length > 2) {
             possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (faster -> fast)
             
-            // 处理双辅音+er的情况
+            // 处理双辅音+er的情况 (bigger -> big)
             const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1er$/;
             if (doubleConsonantPattern.test(lowerWord)) {
                 possibleBaseWords.push(lowerWord.slice(0, -3)); // 如 bigger -> big
             }
             
-            // 处理以e结尾+r的情况
+            // 处理以辅音+y结尾变为ier的情况 (happier -> happy)
+            if (lowerWord.endsWith('ier') && lowerWord.length > 3) {
+                const beforeY = lowerWord.slice(0, -3);
+                if (beforeY.length > 0 && /[a-z]$/.test(beforeY)) {
+                    possibleBaseWords.push(beforeY + 'y');
+                }
+            }
+            
+            // 处理以e结尾+r的情况 (nicer -> nice)
             if (/[^aeiou]er$/.test(lowerWord)) {
-                possibleBaseWords.push(lowerWord.slice(0, -2) + 'e'); // 如 larger -> large
+                possibleBaseWords.push(lowerWord.slice(0, -2) + 'e'); // 如 nicer -> nice
             }
         }
-        if (lowerWord.endsWith('est')) {
+        
+        // 处理最高级 (-est)
+        if (lowerWord.endsWith('est') && lowerWord.length > 3) {
             possibleBaseWords.push(lowerWord.slice(0, -3)); // 常规情况 (fastest -> fast)
             
-            // 处理双辅音+est的情况
+            // 处理双辅音+est的情况 (biggest -> big)
             const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1est$/;
             if (doubleConsonantPattern.test(lowerWord)) {
                 possibleBaseWords.push(lowerWord.slice(0, -4)); // 如 biggest -> big
             }
             
-            // 处理以e结尾+st的情况
+            // 处理以辅音+y结尾变为iest的情况 (happiest -> happy)
+            if (lowerWord.endsWith('iest') && lowerWord.length > 4) {
+                const beforeY = lowerWord.slice(0, -4);
+                if (beforeY.length > 0 && /[a-z]$/.test(beforeY)) {
+                    possibleBaseWords.push(beforeY + 'y');
+                }
+            }
+            
+            // 处理以e结尾+st的情况 (nicest -> nice)
             if (/[^aeiou]est$/.test(lowerWord)) {
-                possibleBaseWords.push(lowerWord.slice(0, -3) + 'e'); // 如 largest -> large
+                possibleBaseWords.push(lowerWord.slice(0, -3) + 'e'); // 如 nicest -> nice
             }
         }
         
-        // 处理以辅音+y结尾变为ier/iest的情况
-        if (lowerWord.endsWith('ier')) {
-            possibleBaseWords.push(lowerWord.slice(0, -3) + 'y'); // 如 happier -> happy
-        }
-        if (lowerWord.endsWith('iest')) {
-            possibleBaseWords.push(lowerWord.slice(0, -4) + 'y'); // 如 happiest -> happy
-        }
-        
         // 处理副词 (-ly)
-        if (lowerWord.endsWith('ly')) {
+        if (lowerWord.endsWith('ly') && lowerWord.length > 2) {
             possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (quickly -> quick)
-        }
-        
-        // 处理以y结尾变为ily的情况
-        if (lowerWord.endsWith('ily')) {
-            possibleBaseWords.push(lowerWord.slice(0, -3) + 'y'); // 如 happily -> happy
+            
+            // 处理以辅音+y结尾变为ily的情况 (happily -> happy)
+            if (lowerWord.endsWith('ily') && lowerWord.length > 3) {
+                const beforeY = lowerWord.slice(0, -3);
+                if (beforeY.length > 0 && /[a-z]$/.test(beforeY)) {
+                    possibleBaseWords.push(beforeY + 'y');
+                }
+            }
         }
 
-        // 处理复数形式
-        if (lowerWord.endsWith('s') && !lowerWord.endsWith('ss')) {
-            possibleBaseWords.push(lowerWord.slice(0, -1)); // 常规情况 (books -> book)
-        }
-        if (lowerWord.endsWith('es')) {
-            possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (boxes -> box)
-            
-            // 处理以ch, sh, ss, x, z结尾的名词复数形式
-            if (/(?:ch|sh|ss|x|z)es$/.test(lowerWord)) {
-                possibleBaseWords.push(lowerWord.slice(0, -2)); // 如 boxes -> box, dishes -> dish
+        // 处理复数形式 (-s, -es)
+        if (lowerWord.endsWith('s') && lowerWord.length > 1) {
+            // 基本复数形式 (books -> book)
+            if (!lowerWord.endsWith('ss')) {
+                possibleBaseWords.push(lowerWord.slice(0, -1));
             }
             
-            // 处理以o结尾的名词复数形式
-            if (lowerWord.endsWith('oes')) {
-                possibleBaseWords.push(lowerWord.slice(0, -2)); // 如 heroes -> hero
-                possibleBaseWords.push(lowerWord.slice(0, -1)); // 如 potatoes -> potato
+            // 处理 -es 结尾 (boxes -> box)
+            if (lowerWord.endsWith('es') && lowerWord.length > 2) {
+                possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况
+                
+                // 处理以ch, sh, ss, x, z结尾的名词复数形式 (boxes -> box)
+                if (/(?:ch|sh|ss|x|z)es$/.test(lowerWord)) {
+                    possibleBaseWords.push(lowerWord.slice(0, -2)); // 如 boxes -> box
+                }
+                
+                // 处理以辅音+o结尾的名词复数形式 (heroes -> hero)
+                if (lowerWord.endsWith('oes') && lowerWord.length > 3) {
+                    possibleBaseWords.push(lowerWord.slice(0, -2)); // 如 heroes -> hero
+                }
+                
+                // 处理以y结尾变为ies的情况 (cities -> city)
+                if (lowerWord.endsWith('ies') && lowerWord.length > 3) {
+                    const beforeY = lowerWord.slice(0, -3);
+                    if (beforeY.length > 0 && /[a-z]$/.test(beforeY)) {
+                        possibleBaseWords.push(beforeY + 'y');
+                    }
+                }
             }
         }
         
-        // 处理以y结尾变为ies的情况
-        if (lowerWord.endsWith('ies')) {
-            possibleBaseWords.push(lowerWord.slice(0, -3) + 'y'); // 如 cities -> city
-        }
-        
-        // 处理以fe结尾变为ves的情况
-        if (lowerWord.endsWith('ves')) {
+        // 处理以fe结尾变为ves的情况 (knives -> knife)
+        if (lowerWord.endsWith('ves') && lowerWord.length > 4) {
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'fe'); // 如 knives -> knife
-            possibleBaseWords.push(lowerWord.slice(0, -3) + 'f'); // 如 leaves -> leaf
+            possibleBaseWords.push(lowerWord.slice(0, -3) + 'f');  // 如 wives -> wife
         }
         
         // 处理特殊的复数形式
-        if (lowerWord.endsWith('men')) {
+        if (lowerWord.endsWith('men') && lowerWord.length > 3) {
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'man'); // 如 women -> woman, men -> man
         }
-        if (lowerWord.endsWith('ice')) {
+        if (lowerWord.endsWith('ice') && lowerWord.length > 3) {
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'ouse'); // 如 mice -> mouse
         }
-        if (lowerWord.endsWith('eet')) {
+        if (lowerWord.endsWith('eet') && lowerWord.length > 3) {
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'oot'); // 如 feet -> foot
         }
-        if (lowerWord.endsWith('ildren')) {
+        if (lowerWord.endsWith('ildren') && lowerWord.length > 6) {
             possibleBaseWords.push(lowerWord.slice(0, -6) + 'ild'); // 如 children -> child
         }
         
         // 去重并过滤掉过短的单词
-        const uniqueBaseWords = [...new Set(possibleBaseWords)].filter(w => w.length >= 2);
-        
-        // 如果没有找到任何可能的原形，或者所有可能的原形都不是有效单词，则返回单词本身
-        if (uniqueBaseWords.length === 0 || !uniqueBaseWords.some(w => w === lowerWord || w.length >= 3)) {
-            // 清空可能不正确的原形
-            uniqueBaseWords.length = 0;
-            uniqueBaseWords.push(lowerWord);
-        }
+        const uniqueBaseWords = [...new Set(possibleBaseWords)].filter(w => w.length >= 1);
         
         // 添加所有可能的原形到变形集合中
         uniqueBaseWords.forEach(base => allForms.add(base));
@@ -1313,14 +1339,14 @@ export const stringUtils = {
         const adjectiveSuffixes = ['ful', 'ous', 'ive', 'ic', 'al', 'ent', 'ant', 'able', 'ible', 'ary', 'ory', 'ish'];
         const verbSuffixes = ['ize', 'ise', 'ate', 'ify', 'en'];
         const nounSuffixes = ['tion', 'sion', 'ment', 'ness', 'ity', 'hood', 'ship', 'dom', 'ism', 'ist'];
-        const adverbSuffixes = ['ly', 'ward', 'wise'];// 副词后缀
+        const adverbSuffixes = ['ly', 'ward', 'wise']; // 副词后缀
 
         
         // 一些常见的形容词
         const commonAdjectives = ['good', 'bad', 'big', 'small', 'high', 'low', 'long', 'short', 'old', 'new', 
                                  'fast', 'slow', 'hard', 'soft', 'hot', 'cold', 'warm', 'cool', 'rich', 'poor', 
                                  'thick', 'thin', 'wide', 'narrow', 'deep', 'shallow', 'strong', 'weak', 'young', 
-                                 'old', 'bright', 'dark', 'light', 'heavy', 'easy', 'hard', 'clean', 'dirty', 
+                                 'bright', 'dark', 'light', 'heavy', 'easy', 'clean', 'dirty', 
                                  'full', 'empty', 'dry', 'wet', 'sick', 'healthy', 'loud', 'quiet', 'sweet', 
                                  'sour', 'bitter', 'nice', 'mean', 'kind', 'cruel', 'brave', 'afraid', 'happy', 
                                  'sad', 'angry', 'calm', 'busy', 'free', 'cheap', 'expensive', 'safe', 'dangerous'];
@@ -1349,50 +1375,58 @@ export const stringUtils = {
                 
         // 动词变形 (如果可能是动词)
         if (isLikelyVerb && lowerWord.length >= 2) {
-            // 第三人称单数
-            if (lowerWord.endsWith('s') || lowerWord.endsWith('x') || lowerWord.endsWith('ch') || lowerWord.endsWith('sh') || lowerWord.endsWith('z')) {
-                allForms.add(lowerWord + 'es');
-            } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
-                allForms.add(lowerWord.slice(0, -1) + 'ies');
-            } else {
-                allForms.add(lowerWord + 's');
+            // 第三人称单数 (walk -> walks)
+            if (!lowerWord.endsWith('s')) {
+                if (lowerWord.endsWith('s') || lowerWord.endsWith('x') || lowerWord.endsWith('ch') || lowerWord.endsWith('sh') || lowerWord.endsWith('z')) {
+                    allForms.add(lowerWord + 'es');
+                } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
+                    allForms.add(lowerWord.slice(0, -1) + 'ies');
+                } else {
+                    allForms.add(lowerWord + 's');
+                }
             }
             
             // 过去式和过去分词 (-ed)
-            if (lowerWord.endsWith('e')) {
-                allForms.add(lowerWord + 'd');
-            } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
-                allForms.add(lowerWord.slice(0, -1) + 'ied');
-            } else if (lowerWord.length > 2 && 
-                      !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
-                      ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
-                      !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
-                // 双写末尾辅音字母的情况，如 stop -> stopped
-                allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'ed');
-            } else {
-                allForms.add(lowerWord + 'ed');
+            // 不对已经以-ed结尾的词添加-ed
+            if (!lowerWord.endsWith('ed')) {
+                if (lowerWord.endsWith('e')) {
+                    allForms.add(lowerWord + 'd');
+                } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
+                    allForms.add(lowerWord.slice(0, -1) + 'ied');
+                } else if (lowerWord.length > 2 && 
+                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
+                          ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
+                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
+                    // 双写末尾辅音字母的情况，如 stop -> stopped
+                    allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'ed');
+                } else {
+                    allForms.add(lowerWord + 'ed');
+                }
             }
             
             // 现在分词 (-ing)
-            if (lowerWord.endsWith('ie')) {
-                allForms.add(lowerWord.slice(0, -2) + 'ying');
-            } else if (lowerWord.endsWith('e') && lowerWord.length > 2) {
-                allForms.add(lowerWord.slice(0, -1) + 'ing');
-            } else if (lowerWord.length > 2 && 
-                      !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
-                      ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
-                      !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
-                // 双写末尾辅音字母的情况，如 run -> running
-                allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'ing');
-            } else {
-                allForms.add(lowerWord + 'ing');
+            // 不对已经以-ing结尾的词添加-ing
+            if (!lowerWord.endsWith('ing')) {
+                if (lowerWord.endsWith('ie')) {
+                    allForms.add(lowerWord.slice(0, -2) + 'ying');
+                } else if (lowerWord.endsWith('e') && lowerWord.length > 2) {
+                    allForms.add(lowerWord.slice(0, -1) + 'ing');
+                } else if (lowerWord.length > 2 && 
+                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
+                          ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
+                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
+                    // 双写末尾辅音字母的情况，如 run -> running
+                    allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'ing');
+                } else {
+                    allForms.add(lowerWord + 'ing');
+                }
             }
         }
         
         // 形容词和副词变形 (如果可能是形容词或副词)
-        if ((isLikelyAdjective || isLikelyAdverb) && lowerWord.length >= 3 && 
+        if ((isLikelyAdjective || isLikelyAdverb) && lowerWord.length >= 2 && 
             !lowerWord.endsWith('ing') && !lowerWord.endsWith('ed') && 
-            lowerWord.length <= 8) { // 限制长度，避免生成不必要的变形
+            lowerWord.length <= 12) { // 限制长度，避免生成不必要的变形
             
             // 检查是否是多音节形容词，这些通常使用 more/most 而不是 -er/-est
             const isMultisyllabic = lowerWord.length > 7 || 
@@ -1409,33 +1443,37 @@ export const stringUtils = {
             // 只为短形容词生成比较级和最高级
             if (!isMultisyllabic) {
                 // 比较级 (-er)
-                if (lowerWord.endsWith('e')) {
-                    allForms.add(lowerWord + 'r');
-                } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
-                    allForms.add(lowerWord.slice(0, -1) + 'ier');
-                } else if (lowerWord.length > 2 && 
-                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
-                          ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
-                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
-                    // 双写末尾辅音字母的情况，如 big -> bigger
-                    allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'er');
-                } else {
-                    allForms.add(lowerWord + 'er');
+                if (!lowerWord.endsWith('er')) {
+                    if (lowerWord.endsWith('e')) {
+                        allForms.add(lowerWord + 'r');
+                    } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
+                        allForms.add(lowerWord.slice(0, -1) + 'ier');
+                    } else if (lowerWord.length > 2 && 
+                              !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
+                              ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
+                              !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
+                        // 双写末尾辅音字母的情况，如 big -> bigger
+                        allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'er');
+                    } else {
+                        allForms.add(lowerWord + 'er');
+                    }
                 }
                 
                 // 最高级 (-est)
-                if (lowerWord.endsWith('e')) {
-                    allForms.add(lowerWord + 'st');
-                } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
-                    allForms.add(lowerWord.slice(0, -1) + 'iest');
-                } else if (lowerWord.length > 2 && 
-                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
-                          ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
-                          !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
-                    // 双写末尾辅音字母的情况，如 big -> biggest
-                    allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'est');
-                } else {
-                    allForms.add(lowerWord + 'est');
+                if (!lowerWord.endsWith('est')) {
+                    if (lowerWord.endsWith('e')) {
+                        allForms.add(lowerWord + 'st');
+                    } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
+                        allForms.add(lowerWord.slice(0, -1) + 'iest');
+                    } else if (lowerWord.length > 2 && 
+                              !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 1)) && 
+                              ['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2)) && 
+                              !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 3))) {
+                        // 双写末尾辅音字母的情况，如 big -> biggest
+                        allForms.add(lowerWord + lowerWord.charAt(lowerWord.length - 1) + 'est');
+                    } else {
+                        allForms.add(lowerWord + 'est');
+                    }
                 }
             }
             
@@ -1443,8 +1481,8 @@ export const stringUtils = {
             if (!lowerWord.endsWith('ly')) {
                 if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
                     allForms.add(lowerWord.slice(0, -1) + 'ily');
-                } else if (lowerWord.endsWith('le')) {
-                    allForms.add(lowerWord.slice(0, -1) + 'y');
+                } else if (lowerWord.endsWith('le') && lowerWord.length > 2) {
+                    allForms.add(lowerWord.slice(0, -2) + 'ly');
                 } else {
                     allForms.add(lowerWord + 'ly');
                 }
@@ -1452,17 +1490,19 @@ export const stringUtils = {
         }
         
         // 名词复数形式 (对大多数单词都适用)
-        if (lowerWord.length >= 2 && !lowerWord.endsWith('ing') && !lowerWord.endsWith('ed')) {
-            if (lowerWord.endsWith('s') || lowerWord.endsWith('x') || lowerWord.endsWith('ch') || lowerWord.endsWith('sh') || lowerWord.endsWith('z')) {
-                allForms.add(lowerWord + 'es');
-            } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
-                allForms.add(lowerWord.slice(0, -1) + 'ies');
-            } else if (lowerWord.endsWith('f')) {
-                allForms.add(lowerWord.slice(0, -1) + 'ves');
-            } else if (lowerWord.endsWith('fe')) {
-                allForms.add(lowerWord.slice(0, -2) + 'ves');
-            } else {
-                allForms.add(lowerWord + 's');
+        if (lowerWord.length >= 2 && !lowerWord.endsWith('ing') && !lowerWord.endsWith('ed') && !lowerWord.endsWith('er') && !lowerWord.endsWith('est')) {
+            if (!lowerWord.endsWith('s') && !lowerWord.endsWith('sh') && !lowerWord.endsWith('ch') && !lowerWord.endsWith('x') && !lowerWord.endsWith('z')) {
+                if (lowerWord.endsWith('s') || lowerWord.endsWith('x') || lowerWord.endsWith('ch') || lowerWord.endsWith('sh') || lowerWord.endsWith('z')) {
+                    allForms.add(lowerWord + 'es');
+                } else if (lowerWord.endsWith('y') && !['a', 'e', 'i', 'o', 'u'].includes(lowerWord.charAt(lowerWord.length - 2))) {
+                    allForms.add(lowerWord.slice(0, -1) + 'ies');
+                } else if (lowerWord.endsWith('f')) {
+                    allForms.add(lowerWord.slice(0, -1) + 'ves');
+                } else if (lowerWord.endsWith('fe')) {
+                    allForms.add(lowerWord.slice(0, -2) + 'ves');
+                } else {
+                    allForms.add(lowerWord + 's');
+                }
             }
         }
         
@@ -1490,4 +1530,4 @@ export const stringUtils = {
         
         return false;
     }
-}
+}