From bc34de13cefcb13d9268192211fece03b2d7eb26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=E6=96=87?=
 <15549487+FX_YBW@user.noreply.gitee.com>
Date: Fri, 10 Oct 2025 23:44:58 +0800
Subject: [PATCH] =?UTF-8?q?v1.6=20=E9=A2=98=E7=9B=AE=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ybw/mathapp/Main.java                  | 9 +++++----
 .../com/ybw/mathapp/service/MultipleChoiceGenerator.java | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ybw/mathapp/Main.java b/src/main/java/com/ybw/mathapp/Main.java
index 3e360f8..637d836 100644
--- a/src/main/java/com/ybw/mathapp/Main.java
+++ b/src/main/java/com/ybw/mathapp/Main.java
@@ -4,11 +4,13 @@ import com.ybw.mathapp.entity.QuestionWithOptions;
 import com.ybw.mathapp.service.JuniorHighGenerator;
 import com.ybw.mathapp.service.MultipleChoiceGenerator;
 import com.ybw.mathapp.service.PrimarySchoolGenerator;
+import com.ybw.mathapp.service.SeniorHighGenerator;
 import java.util.List;
 
 public class Main {
   public static void main(String[] args) {
     // 生成小学选择题
+
     System.out.println("--- Primary School MCQs ---");
     PrimarySchoolGenerator primaryGen = new PrimarySchoolGenerator();
     MultipleChoiceGenerator primaryMC = new MultipleChoiceGenerator(primaryGen, "小学"); // 传入级别
@@ -21,16 +23,15 @@ public class Main {
     MultipleChoiceGenerator juniorMC = new MultipleChoiceGenerator(juniorGen, "初中"); // 传入级别
     List<QuestionWithOptions> juniorMCQs = juniorMC.generateMultipleChoiceQuestions(10);
     juniorMCQs.forEach(q -> System.out.println(q + "\n"));
-
     System.out.println();
-    /*
+
     // 生成高中选择题
     System.out.println("--- Senior High MCQs ---");
     SeniorHighGenerator seniorGen = new SeniorHighGenerator();
     MultipleChoiceGenerator seniorMC = new MultipleChoiceGenerator(seniorGen, "高中"); // 传入级别
-    List<QuestionWithOptions> seniorMCQs = seniorMC.generateMultipleChoiceQuestions(2, 4);
+    List<QuestionWithOptions> seniorMCQs = seniorMC.generateMultipleChoiceQuestions(10);
     seniorMCQs.forEach(q -> System.out.println(q + "\n"));
-    */
+
 
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ybw/mathapp/service/MultipleChoiceGenerator.java b/src/main/java/com/ybw/mathapp/service/MultipleChoiceGenerator.java
index 8c5c6ff..d616ac5 100644
--- a/src/main/java/com/ybw/mathapp/service/MultipleChoiceGenerator.java
+++ b/src/main/java/com/ybw/mathapp/service/MultipleChoiceGenerator.java
@@ -46,7 +46,6 @@ public class MultipleChoiceGenerator {
         // 例如，如果基础生成器的可能组合用尽了
         break; // 或者抛出异常
       }
-
       QuestionWithOptions mcq = generateSingleMCQ(baseQuestion);
       if (mcq != null) {
         mcQuestions.add(mcq);
@@ -153,10 +152,13 @@ public class MultipleChoiceGenerator {
         tokens.add(token);
         i += token.length();
       } else {
+        i++;
+      } /* else {
         // 如果找不到匹配的 token，可能是单个字符或未知格式
         tokens.add(String.valueOf(expression.charAt(i)));
         i++;
       }
+       */
     }
     return tokens;
   }