временно удалила getNFA из taskGenerator (№352)

OnionGrief · Jun 23, 2024 · cdcaf86 · cdcaf86
1 parent 0648782
commit cdcaf86
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/config/automaton_parser/grammar.txt b/config/automaton_parser/grammar.txt
@@ -20,4 +20,4 @@ stack_pushes --> stack_symbol stack_pushes | EPS ;
 node_id --> STRING ;
 cell_id --> NUMBER ;
 symbol --> (MFA ? '&' cell_id | eps_symbol : eps_symbol) ;
-eps_symbol --> (DFA ? LETTER | DIGIT : 'eps' | LETTER | DIGIT) 
+eps_symbol --> (DFA ? LETTER : 'eps' | LETTER) 
diff --git a/libs/InputGenerator/src/TasksGenerator.cpp b/libs/InputGenerator/src/TasksGenerator.cpp
@@ -167,13 +167,15 @@ string TasksGenerator::generate_arguments(Function first_func) {
 			args_str += " N" + get_random_id_by_type(input_type);
 			/* генерируемые типы: */
 		} else if (input_type == NFA) {
-			std::string filename = std::to_string(automata_id++) + ".txt";
-			AutomatonGenerator(FA_type::NFA).write_to_file(filename);
-			args_str += " (getNFA \"" + filename + "\")";
+			args_str += " *NFA";
+			// std::string filename = std::to_string(automata_id++) + ".txt";
+			// AutomatonGenerator(FA_type::NFA).write_to_file(filename);
+			// args_str += " (getNFA \"" + filename + "\")";
 		} else if (input_type == MFA) {
-			std::string filename = std::to_string(automata_id++) + ".txt";
-			AutomatonGenerator(FA_type::MFA).write_to_file(filename);
-			args_str += " (getMFA \"" + filename + "\")";
+			args_str += " *MFA";
+			// std::string filename = std::to_string(automata_id++) + ".txt";
+			// AutomatonGenerator(FA_type::MFA).write_to_file(filename);
+			// args_str += " (getMFA \"" + filename + "\")";
 		} else if (input_type == REGEX) {
 			args_str += " " + generate_regex();
 		} else if (input_type == BRefRegex) {

diff --git a/libs/Interpreter/src/Interpreter.cpp b/libs/Interpreter/src/Interpreter.cpp
@@ -690,8 +690,12 @@ optional<GeneralObject> Interpreter::eval_expression(const Expression& expr) {
 		current_random_objects[expr.type] = generated_object;
 		return ObjectBRefRegex(BackRefRegex(generated_object));
 	}
-	std::string test_path =
-		"./test_data/MetamorphicTest/test" + Typization::types_to_string.at(expr.type) + ".txt";
+	std::string test_path;
+	if (user_name == "")
+		test_path = "./test_data/MetamorphicTest";
+	else
+		test_path = user_name;
+	test_path += "/" + Typization::types_to_string.at(expr.type) + ".txt";
 	Parser parser;
 	if (expr.type == ObjectType::RandomDFA) {
 		if (!(in_verification && current_random_objects.count(expr.type))) {