Merge pull request '2' (#2) from develop into main

src/ExamSystem.java

@@ -21,11 +21,7 @@ public class ExamSystem {
   
   public void generateProblems(Users users) {
     while (true) {
-      
-      System.out.print("准备生成" + users.getType()
-          + "数学题目，请输入生成题目数量（输入-1将退出当前用户，重新登录）：");
       String input = scanner.nextLine().trim();
-      
       if (input.equals("-1")) {
         break;
       }
@@ -41,19 +37,27 @@ public class ExamSystem {
         String target = input.replace("切换为", "");
         if (target.equals("小学") || target.equals("初中") || target.equals("高中")) {
           users = new Users(users.getName(), users.getPassword(), target);
-          System.out.println("系统提示：准备生成" + users.getType() + "数学题目");
+          System.out.print("系统提示：准备生成" + users.getType()
+              + "数学题目，请输入生成题目数量（输入-1将退出当前用户，重新登录）：");
         } else {
           System.out.println("请输入小学、初中和高中三个选项中的一个");
         }
         continue;
       }
       
-      int num = Integer.parseInt(input);
-      if (num >= 10 && num <= 30 && generator != null) {
-        Generator.generate(users, num, generator);
-      } else {
-        System.out.println("请输入 10-30 之间的数字");
+      try {
+        int num = Integer.parseInt(input);
+        if (num >= 10 && num <= 30 && generator != null) {
+          Generator.generate(users, num, generator);
+        } else {
+          System.out.println("请输入 10-30 之间的数字");
+        }
+      } catch (NumberFormatException e) {
+        System.out.println("请输入小学、初中和高中三个选项中的一个");
       }
+      
+      System.out.print("准备生成" + users.getType()
+          + "数学题目，请输入生成题目数量（输入-1将退出当前用户，重新登录）：");
     }
   }
 }

src/Generator.java

@@ -15,7 +15,7 @@ public class Generator {
   
   private static void save(Users users, String content) {
     try {
-      String folder = "doc/" + users.getType();
+      String folder = "doc/" + users.getName();
       java.io.File dir = new java.io.File(folder);
       if (!dir.exists()) {
         dir.mkdirs();
@@ -30,5 +30,3 @@ public class Generator {
     }
   }
 }
-
-

src/JuniorProblem.java

@@ -1,23 +1,51 @@
 import java.util.Random;
 
-public class JuniorProblem implements ProblemsGenerator{
+public class JuniorProblem implements ProblemsGenerator {
   private static final Random RANDOM = new Random();
+  private static final String[] OPERATORS = {"+", "-", "*", "/"};
+  private static final String[] POW_OPERATORS = {"√", "^2"};
   
   @Override
   public String generate() {
-    int count = RANDOM.nextInt(5) + 1; // 1~5个数
+    String primaryExpr = generatePrimaryExpression();
+    return addPowerOperators(primaryExpr);
+  }
+  
+  private String generatePrimaryExpression() {
+    int count = RANDOM.nextInt(4) + 2;
     StringBuilder sb = new StringBuilder();
+    
     for (int i = 0; i < count; i++) {
-      int num = RANDOM.nextInt(20) + 1;
-      if (RANDOM.nextBoolean()) {
-        sb.append(num).append("^2");
-      } else {
-        sb.append("√").append(num);
-      }
+      sb.append(RANDOM.nextInt(100) + 1);
       if (i < count - 1) {
-        sb.append(" + ");
+        sb.append(" ").append(OPERATORS[RANDOM.nextInt(OPERATORS.length)]).append(" ");
       }
     }
     return sb.toString();
   }
+  
+  private String addPowerOperators(String expr) {
+    String[] parts = expr.split(" ");
+    boolean hasPower = false;
+    
+    for (int i = 0; i < parts.length; i++) {
+      if (parts[i].matches("\\d+") && (!hasPower || RANDOM.nextBoolean())) {
+        String op = POW_OPERATORS[RANDOM.nextInt(POW_OPERATORS.length)];
+        parts[i] = op.equals("√") ? "√" + parts[i] : parts[i] + "^2";
+        hasPower = true;
+      }
+    }
+    
+    if (!hasPower) {
+      for (int i = 0; i < parts.length; i++) {
+        if (parts[i].matches("\\d+")) {
+          String op = POW_OPERATORS[RANDOM.nextInt(POW_OPERATORS.length)];
+          parts[i] = op.equals("√") ? "√" + parts[i] : parts[i] + "^2";
+          break;
+        }
+      }
+    }
+    
+    return String.join(" ", parts);
+  }
 }

src/Main.java

@@ -3,6 +3,8 @@ public class Main {
     ExamSystem system = new ExamSystem();
     while (true) {
       Users users = system.login();
+      System.out.print("准备生成" + users.getType()
+          + "数学题目，请输入生成题目数量（输入-1将退出当前用户，重新登录）：");
       system.generateProblems(users);
     }
   }

src/PrimaryProblem.java

@@ -2,17 +2,41 @@ import java.util.Random;
 
 public class PrimaryProblem implements ProblemsGenerator {
   private static final Random RANDOM = new Random();
-  private static final char[] OPS = {'+', '-', '*', '/'};
+  private static final String[] OPERATORS = {"+", "-", "*", "/"};
   
   @Override
   public String generate() {
-    int count = RANDOM.nextInt(5) + 1; // 1~5个数
+    int count = RANDOM.nextInt(4) + 2;
     StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < count; i++) {
-      int num = RANDOM.nextInt(100) + 1;
-      sb.append(num);
-      if (i < count - 1) {
-        sb.append(" ").append(OPS[RANDOM.nextInt(OPS.length)]).append(" ");
+    
+    boolean addParentheses = count >= 3 && RANDOM.nextDouble() < 0.5;
+    if (addParentheses) {
+      int parenCount = RANDOM.nextInt(count - 2) + 2;
+      int startPos = RANDOM.nextInt(count - parenCount + 1);
+      
+      for (int i = 0; i < count; i++) {
+        if (i == startPos) {
+          sb.append("( ");
+        }
+        
+        int num = RANDOM.nextInt(100) + 1;
+        sb.append(num);
+        
+        if (i == startPos + parenCount - 1) {
+          sb.append(" )");
+        }
+        
+        if (i < count - 1) {
+          sb.append(" ").append(OPERATORS[RANDOM.nextInt(OPERATORS.length)]).append(" ");
+        }
+      }
+    } else {
+      for (int i = 0; i < count; i++) {
+        int num = RANDOM.nextInt(100) + 1;
+        sb.append(num);
+        if (i < count - 1) {
+          sb.append(" ").append(OPERATORS[RANDOM.nextInt(OPERATORS.length)]).append(" ");
+        }
       }
     }
     return sb.toString();

src/SeniorProblem.java

@@ -1,21 +1,107 @@
 import java.util.Random;
 
-public class SeniorProblem implements ProblemsGenerator{
+public class SeniorProblem implements ProblemsGenerator {
   private static final Random RANDOM = new Random();
-  private static final String[] FUNCS = {"sin", "cos", "tan"};
+  private static final String[] OPERATORS = {"+", "-", "*", "/"};
+  private static final String[] POW_OPERATORS = {"√", "^2"};
+  private static final String[] TRIG_OPERATORS = {"sin", "cos", "tan"};
   
   @Override
   public String generate() {
-    int count = RANDOM.nextInt(5) + 1; // 1~5个数
+    String primaryExpression = generatePrimaryExpression();
+    
+    return addHighSchoolOperators(primaryExpression);
+  }
+  
+  private String generatePrimaryExpression() {
+    int count = RANDOM.nextInt(4) + 2;
     StringBuilder sb = new StringBuilder();
+    
     for (int i = 0; i < count; i++) {
-      int angle = RANDOM.nextInt(90) + 1;
-      String func = FUNCS[RANDOM.nextInt(FUNCS.length)];
-      sb.append(func).append("(").append(angle).append("°)");
+      int num = RANDOM.nextInt(100) + 1;
+      sb.append(num);
       if (i < count - 1) {
-        sb.append(" + ");
+        sb.append(" ").append(OPERATORS[RANDOM.nextInt(OPERATORS.length)]).append(" ");
       }
     }
     return sb.toString();
   }
+  
+  private String addHighSchoolOperators(String primaryExpression) {
+    String[] parts = primaryExpression.split(" ");
+    StringBuilder result = new StringBuilder();
+    boolean hasTrigonometry = false;
+    boolean hasAlgebra = false;
+    
+    for (int i = 0; i < parts.length; i++) {
+      String part = parts[i];
+      
+      if (isNumber(part)) {
+        if (!hasTrigonometry || RANDOM.nextDouble() < 0.6) {
+          part = applyTrigOperator(part);
+          hasTrigonometry = true;
+        }
+        else if (RANDOM.nextDouble() < 0.3) {
+          part = applyAlgebraOperator(part);
+          hasAlgebra = true;
+        }
+      }
+      
+      result.append(part);
+      if (i < parts.length - 1) {
+        result.append(" ");
+      }
+    }
+    
+    if (!hasTrigonometry) {
+      return addTrigonometryForced(result.toString());
+    }
+    
+    return result.toString();
+  }
+  
+  private boolean isNumber(String str) {
+    try {
+      Integer.parseInt(str);
+      return true;
+    } catch (NumberFormatException e) {
+      return false;
+    }
+  }
+  
+  private String applyTrigOperator(String number) {
+    String operator = TRIG_OPERATORS[RANDOM.nextInt(TRIG_OPERATORS.length)];
+    int num = Integer.parseInt(number);
+    int angle = generateValidAngle(operator);
+    return operator + angle + "°";
+  }
+  
+  private String applyAlgebraOperator(String number) {
+    String operator = POW_OPERATORS[RANDOM.nextInt(POW_OPERATORS.length)];
+    int num = Integer.parseInt(number);
+    return operator.equals("√") ? "√" + num : num + "^2";
+  }
+  
+  private int generateValidAngle(String trigOp) {
+    int angle = RANDOM.nextInt(100) + 1;
+    if (trigOp.equals("tan")) {
+      while (angle == 90) {
+        angle = RANDOM.nextInt(100) + 1;
+      }
+    }
+    return angle;
+  }
+  
+  private String addTrigonometryForced(String expression) {
+    String[] parts = expression.split(" ");
+    
+    for (int i = 0; i < parts.length; i++) {
+      if (isNumber(parts[i])) {
+        parts[i] = applyTrigOperator(parts[i]);
+        break;
+      }
+    }
+    
+    return String.join(" ", parts);
+  }
 }