complete validator function for checking if the students apply the rule correctly

src/components/ProofStepDialog.vue

@@ -25,13 +25,16 @@
         </el-form-item>
       </template>
       <el-form-item label="Answer">
-        <el-input v-model="answer"></el-input>
+        <el-input v-model="currentAnswer"></el-input>
+        <el-button @click="submitAnswer">Next</el-button>
+        <el-button @click="submitAnswer">Submit</el-button>
+        <el-alert v-if="errorMsg" title="Error" type="error" :closable="false">{{ errorMsg }}</el-alert>
+        <el-alert v-if="msg" type="success" :closable="false">{{ msg }}</el-alert>
       </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="closeDialog">Cancel</el-button>
-      <el-button type="primary" @click="submitAnswer">Submit</el-button>
-      <el-button @click="nextAnswer">Next</el-button>
+      <el-button type="primary" @click="validAnswer">Check</el-button>
     </template>
   </el-dialog>
 </template>
@@ -48,6 +51,10 @@ const { negationIntroduction,
   implyIntroduction,
   implyElimination,
   contradiction } = require('../utils/ndRules');
+const { parse } = require("../utils/parser.js");
+const { validator } = require("../utils/validator.js");
+const ast = require('../utils/expAst.js');
+
 
 export default {
   props: {
@@ -70,10 +77,13 @@ export default {
       localVisible: this.visible,
       ruleFunction: null,
       selectedRule: '',
-      answer: '',
-      // 新增的数据属性
-      expressions: [],
+      standardAnswer: null,
+      expressions: [], // parsed expressions
       currentExpression: '',
+      answers: [], // original user input string
+      currentAnswer: '',
+      errorMsg: '',
+      msg: '',
     }
   },
 
@@ -104,6 +114,7 @@ export default {
       console.log(this.ruleFunction);
       console.log(this.conclusionString);
       console.log(this.expressions);
+      console.log(this.answers);
       this.selectedRule = '';
       this.ruleFunction = null;
       this.localVisible = false;
@@ -112,21 +123,80 @@ export default {
     // 新增的方法
     submitExpressions() {
       if (this.currentExpression) {
-        this.expressions.push(this.currentExpression);
+        this.expressions.push(parse(this.currentExpression));
         this.currentExpression = '';
       }
     },
 
     submitAnswer() {
-      // 提交答案逻辑
-      this.$emit('submit-answer', { rule: this.selectedRule, answer: this.answer });
+      if (this.currentAnswer) {
+        this.answers.push(this.currentAnswer);
+        this.currentAnswer = '';
+        this.errorMsg = '';
+      }
     },
 
-    nextAnswer() {
-      // 提交并准备下一个答案逻辑
-      this.$emit('next-answer', { rule: this.selectedRule, answer: this.answer });
+    validAnswer() {
+
+      if (!this.ruleFunction) {
+        this.errorMsg = 'Please select a rule';
+        return;
+      }
+
+      if (this.requiresExpressions && this.expressions.length === 0) {
+        this.errorMsg = 'Please input expressions';
+        return;
+      }
+
+      if (this.answers.length === 0) {
+        this.errorMsg = 'Please input answers';
+        return;
+      }
+
+
+      if (this.requiresExpressions) {
+        try {
+          this.standardAnswer = this.ruleFunction(parse(this.conclusionString), this.expressions);
+        } catch (e) {
+          this.errorMsg = e.message;
+          return;
+        }
+      } else {
+        try {
+          this.standardAnswer = this.ruleFunction(parse(this.conclusionString));
+        } catch (e) {
+          this.errorMsg = e.message;
+          return;
+        }
+      }
+
+
+      if(this.standardAnswer.length !== this.answers.length) {
+        this.errorMsg = 'Incorrect answer, the number of your answers is not correct';
+        return;
+      }
+
+      // list of strings
+      this.standardAnswer.forEach(answer => { ast.astsToString(answer); });
+
+      this.standardAnswer.sort();
+      this.answers.sort();
+
+      for (let i = 0; i < this.standardAnswer.length; i++) {
+        const output = validator(this.standardAnswer[i], this.answers[i]);
+        if (!output[0]) {
+          this.errorMsg = output[1];
+          return;
+        }
+      }
+
+      this.msg = 'Correct answer';
+      return;
+
     },
 
+
+
     handleRuleChange(value) {
       switch (value) {
         case 'andIntroduction':
@@ -175,3 +245,10 @@ export default {
   },
 };
 </script>
+
+<style>
+.custom-alert {
+  background-color: #d7ecdc;
+  color: rgb(2, 46, 2);
+}
+</style>
\ No newline at end of file

src/utils/sequentAst.js

@@ -2,7 +2,7 @@
 // top is a list of string, for children nodes
 // bottomLatex is a string, for the current node
 // bottomValue is a string, for the original input string of the current node
-function sequentNode(bottomLatex, bottomString, rule, topsLatex) {
+function sequentNode(bottomLatex, bottomString, rule='', topsLatex=[]) {
     this.rule = rule;
     this.bottomLatex = bottomLatex;
     this.bottomString = bottomString;

src/utils/validator.js

 // src/validator.js
 const ast = require('./expAst.js');
-const { parse } = require("./parser.js");
 
 
 /*This function will remove spaces 
@@ -15,7 +14,7 @@ function removeSpaces(str) {
 // for expression, standard is an list of list of AST from logic rule, userInput is a string
 function validator(standardAst, userString) {
 
-    standardString = ast.astsToString(standardAst);
+    const standardString = ast.astsToString(standardAst);
 
     const minLength = Math.min(standardString.length, userString.length);
 

tests/unit/sequentAst.test.js

@@ -3,27 +3,19 @@ const { sequentNode, linkSequentNode } = require("../../src/utils/sequentAst.js"
 
 // linkSequentNode test
 test('linkSequentNode could work correctly for node', () => {
-    const inputA = new sequentNode("A");
-    const inputB = new sequentNode("B");
+    const inputA = new sequentNode("A", "A");
+    const inputB = new sequentNode("B", "B");
     const output = linkSequentNode(inputA, inputB);
 
-    const expected = new sequentNode("A", "", [inputB]);
+    const expected = new sequentNode("A","A", "", [inputB]);
     expect(output).toEqual(expected);
 });
 
 test('linkSequentNode could work correctly for node', () => {
-    const inputA = new sequentNode("A");
-    const inputB = new sequentNode("B");
+    const inputA = new sequentNode("A", "A");
+    const inputB = new sequentNode("B", "B");
     const output = linkSequentNode(inputA, inputB);
     const output1 = linkSequentNode(output, inputB);
-    expect(output1).toEqual(new sequentNode("A", "", [inputB, inputB]));
+    expect(output1).toEqual(new sequentNode("A", "A","", [inputB, inputB]));
 });
 
-test('linkSequentNode could report error when adding nodes on a full node', () => {
-    const inputA = new sequentNode("A");
-    const inputB = new sequentNode("B");
-    const output = linkSequentNode(inputA, inputB);
-    const output1 = linkSequentNode(output, inputB);
-    expect(() => linkSequentNode(output1, inputB)).toThrow('Addition failed, this node is already full');
-
-});