doc/README.md

@@ -28,12 +28,8 @@
 
 ## 题目生成说明
 1. 小学题目2-5个操作数，运算包含+、-、*、\，随机加括号
-2. 初中题目1-5个操作数，运算包含+、-、*、\，随机加平方或开根（至少一个），随机加括号
-3. 高中题目1-5个操作数，运算包含+、-、*、\，每一项均为三角函数，随机加平方，随机加括号。  
-
-## 运行环境
-可执行文件：Mathpapers.jar  
-运行环境：Windows cmd UTF-8编码
+2. 初中题目1-5个操作数，运算包含+、-、*、\，随机加平方或开根（至少一个），没有括号
+3. 高中题目1-5个操作数，运算包含+、-、*、\，每一项均为三角函数，随机加平方。
 
 ---
 软件2302 202326010228 乔毅凡

src/Generator/G_ques.java

@@ -4,5 +4,4 @@ public interface G_ques {
     String g_question();
     String g_type();
     char g_operator();
-    String add_brackets(StringBuilder s,int count);
 }

src/Generator/Jun_g_ques.java

@@ -47,7 +47,7 @@ public class Jun_g_ques implements G_ques{
                 question = new StringBuilder(String.join(" ", parts));
             }
         }
-        return add_brackets(question,count);
+        return question.toString();
     }
 
     @Override
@@ -60,23 +60,4 @@ public class Jun_g_ques implements G_ques{
         char[] op={'+','-','*','/'};
         return op[ra.nextInt(op.length)];
     }
-
-    @Override
-    public String add_brackets(StringBuilder s,int count){
-        String res=s.toString();
-        String[] parts=s.toString().split(" ");
-        if (ra.nextBoolean()&&parts.length!=1) {
-            int num=ra.nextInt(3)+1;
-            for (int i=0;i<num;i++) {
-                int pos = ra.nextInt(count);
-                if (pos==count-1){
-                    pos=pos-1;
-                }
-                parts[pos * 2] = "(" + parts[pos * 2];
-                parts[parts.length-1]=parts[parts.length-1]+")";
-            }
-            res = String.join(" ", parts);
-        }
-        return res;
-    }
 }

src/Generator/Pri_g_ques.java

@@ -36,9 +36,4 @@ public class Pri_g_ques implements G_ques{
         char[] op={'+','-','*','/'};
         return op[ra.nextInt(op.length)];
     }
-
-    @Override
-    public String add_brackets(StringBuilder s,int count){
-        return  s.toString();
-    }
 }

src/Generator/Sen_g_ques.java

@@ -21,7 +21,7 @@ public class Sen_g_ques implements G_ques{
                 question.append(g_trig()).append("(").append(g_angle()).append("°)");
             }
         }
-        return add_brackets(question,count);
+        return question.toString();
     }
 
     @Override
@@ -44,22 +44,4 @@ public class Sen_g_ques implements G_ques{
         String[] angle={"15","22.5","75","105","120","135","150","210","300"};
         return angle[ra.nextInt(angle.length)];
     }
-
-    public String add_brackets(StringBuilder s,int count){
-        String res=s.toString();
-        String[] parts=s.toString().split(" ");
-        if (ra.nextBoolean()&&parts.length!=1) {
-            int num=ra.nextInt(3)+1;
-            for (int i=0;i<num;i++) {
-                int pos = ra.nextInt(count);
-                if (pos==count-1){
-                    pos=pos-1;
-                }
-                parts[pos * 2] = "(" + parts[pos * 2];
-                parts[parts.length-1]=parts[parts.length-1]+")";
-            }
-            res = String.join(" ", parts);
-        }
-        return res;
-    }
 }