diff --git a/scenarios/autas/det/rexd_config.cfg b/scenarios/autas/det/rexd_config.cfg index 06a86d5940321dfd6a4fb046708a0ea46fd83080..011d2861b0175d5118bb0a31f71475ed5df9d832 100644 --- a/scenarios/autas/det/rexd_config.cfg +++ b/scenarios/autas/det/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/scenarios/autas/horiz/rexd_config.cfg b/scenarios/autas/horiz/rexd_config.cfg index 30c147328b0c3ff6b647b56806491fbf086e2a69..cba840011cd377d29b8f85937ad4541315fedc69 100644 --- a/scenarios/autas/horiz/rexd_config.cfg +++ b/scenarios/autas/horiz/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = true auto_teacher_dangerous_actions = true diff --git a/scenarios/autas/horiz2/rexd_config.cfg b/scenarios/autas/horiz2/rexd_config.cfg index 5592e25a3554ba830849ddcf441830de640d2c98..5be4ce55b01f49fe7c54b66571d8de6ece8262ff 100644 --- a/scenarios/autas/horiz2/rexd_config.cfg +++ b/scenarios/autas/horiz2/rexd_config.cfg @@ -10,7 +10,7 @@ simulator_init_state_path = simulated_init_state transitions_backup_path = transitions_full.dat rule_analysis = true -rule_analysis_equivalent_rules = false +rule_analysis_equivalent_rules = true rule_analysis_subgoals = false # exploration @@ -61,11 +61,11 @@ teacher_can_fail = false auto_teacher = true auto_teacher_excuse_autoexecute = true auto_teacher_infinite = true -auto_teacher_infinite_retries = 10 +auto_teacher_infinite_retries = 15 auto_teacher_infinite_full_retries = 3 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = false auto_teacher_autas_hacks = true auto_teacher_dangerous_actions = true diff --git a/scenarios/autas/p06/rexd_config.cfg b/scenarios/autas/p06/rexd_config.cfg index 1ea178fcf09ef7b3a09c3e968d2beb2609cf9680..a5b98b065fc1ee3c632de7f3b197dcfa0c6eae96 100644 --- a/scenarios/autas/p06/rexd_config.cfg +++ b/scenarios/autas/p06/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/scenarios/autas/rexdet/rexd_config.cfg b/scenarios/autas/rexdet/rexd_config.cfg index ad3a37d72d2687a67ff0ba5f7b27b0a598b55907..981045753e766a957ab962883f6b4f7b4ab05b52 100644 --- a/scenarios/autas/rexdet/rexd_config.cfg +++ b/scenarios/autas/rexdet/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/scenarios/autas/rexp06/rexd_config.cfg b/scenarios/autas/rexp06/rexd_config.cfg index df0197051c3b184bd428ab01f57510ed28f0b776..ebcb150ff4f4392af99fc18b72d89fbd48053385 100644 --- a/scenarios/autas/rexp06/rexd_config.cfg +++ b/scenarios/autas/rexp06/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/scenarios/exblock/p1/rexd_config.cfg b/scenarios/exblock/p1/rexd_config.cfg index fd7fa1685cc8289fdd2b7297d0ab6ca124b4bbed..251bfb19df696176f2a985ebe16b864d271a45ce 100644 --- a/scenarios/exblock/p1/rexd_config.cfg +++ b/scenarios/exblock/p1/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/exblock/p2/rexd_config.cfg b/scenarios/exblock/p2/rexd_config.cfg index fd7fa1685cc8289fdd2b7297d0ab6ca124b4bbed..251bfb19df696176f2a985ebe16b864d271a45ce 100644 --- a/scenarios/exblock/p2/rexd_config.cfg +++ b/scenarios/exblock/p2/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/exblock/p3/rexd_config.cfg b/scenarios/exblock/p3/rexd_config.cfg index fd7fa1685cc8289fdd2b7297d0ab6ca124b4bbed..251bfb19df696176f2a985ebe16b864d271a45ce 100644 --- a/scenarios/exblock/p3/rexd_config.cfg +++ b/scenarios/exblock/p3/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/exblock/p3/simulated_init_state.dat b/scenarios/exblock/p3/simulated_init_state.dat index d24e19ad23c5b5709d898276d9aa6f666452efdc..cb3776aeeb6043e157c528a0e4a03a54e74a50f5 100644 --- a/scenarios/exblock/p3/simulated_init_state.dat +++ b/scenarios/exblock/p3/simulated_init_state.dat @@ -1 +1 @@ -emptyhand() on(61 65) on(62 b3) onTable(63) onTable(64) on(65 66) on(66 64) clear(61) clear(62) noDetonated(61) noDestroyed(61) noDetonated(62) noDestroyed(62) noDetonated(63) noDestroyed(63) noDetonated(64) noDestroyed(64) noDetonated(65) noDestroyed(65) noDetonated(66) noDestroyed(66) noDestroyedTable() +emptyhand() on(61 65) on(62 63) onTable(63) onTable(64) on(65 66) on(66 64) clear(61) clear(62) noDetonated(61) noDestroyed(61) noDetonated(62) noDestroyed(62) noDetonated(63) noDestroyed(63) noDetonated(64) noDestroyed(64) noDetonated(65) noDestroyed(65) noDetonated(66) noDestroyed(66) noDestroyedTable() diff --git a/scenarios/exblock/p4/rexd_config.cfg b/scenarios/exblock/p4/rexd_config.cfg index fd7fa1685cc8289fdd2b7297d0ab6ca124b4bbed..251bfb19df696176f2a985ebe16b864d271a45ce 100644 --- a/scenarios/exblock/p4/rexd_config.cfg +++ b/scenarios/exblock/p4/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/exblock/p5/rexd_config.cfg b/scenarios/exblock/p5/rexd_config.cfg index 225a88d5e0a9f58ffb93407975f2fc4cd2e3aae3..c951474e73b6cbe3b8548f53eadfa4f1431d47a0 100644 --- a/scenarios/exblock/p5/rexd_config.cfg +++ b/scenarios/exblock/p5/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite = true auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/exblock/p5rmin/rexd_config.cfg b/scenarios/exblock/p5rmin/rexd_config.cfg index 100ff92d53175dbb913a1363483e166816134572..48dc7613bb96500d555655b2e834df199b2bf9c9 100644 --- a/scenarios/exblock/p5rmin/rexd_config.cfg +++ b/scenarios/exblock/p5rmin/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite = false auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/exblock/p6/rexd_config.cfg b/scenarios/exblock/p6/rexd_config.cfg index 0d960afb4fb4a876ebad8f4a418c9de62903af5b..f79bb61c434be010eaaec95cbe0083b93863889a 100644 --- a/scenarios/exblock/p6/rexd_config.cfg +++ b/scenarios/exblock/p6/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/kitchen/p1/rexd_config.cfg b/scenarios/kitchen/p1/rexd_config.cfg index 23226df98afbdc11a9b4010aea7009e3b93134aa..3b55cf167270b3d93986a5f2fe7be028fb0e232a 100644 --- a/scenarios/kitchen/p1/rexd_config.cfg +++ b/scenarios/kitchen/p1/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/kitchen/p2/rexd_config.cfg b/scenarios/kitchen/p2/rexd_config.cfg index 3ea3e7d1ccf5de62cc02e99a684bba9049da1d79..3fa97f60a5bd6022c2f1551f96b37a1e6f2b8080 100644 --- a/scenarios/kitchen/p2/rexd_config.cfg +++ b/scenarios/kitchen/p2/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/kitchen/p3IncFast/rexd_config.cfg b/scenarios/kitchen/p3IncFast/rexd_config.cfg index e4bc814bf11b17d183c9899ab689b3de1237700a..546b239da755cca7bc9d2f38704d693992744724 100644 --- a/scenarios/kitchen/p3IncFast/rexd_config.cfg +++ b/scenarios/kitchen/p3IncFast/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/rescue/p1/rexd_config.cfg b/scenarios/rescue/p1/rexd_config.cfg index 53f5196898a6601724e3a6de0f6439e969f142af..d47c629147e6bc7ee07c038692db6d9bde1cf08d 100644 --- a/scenarios/rescue/p1/rexd_config.cfg +++ b/scenarios/rescue/p1/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite = false auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/triangle/p1/rexd_config.cfg b/scenarios/triangle/p1/rexd_config.cfg index 5a5318588c0e38c99821969c133bae1dcbf7c7b0..edd8f1785085952909bc13cd9829c938975cd455 100644 --- a/scenarios/triangle/p1/rexd_config.cfg +++ b/scenarios/triangle/p1/rexd_config.cfg @@ -61,7 +61,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/triangle/p1rmin/rexd_config.cfg b/scenarios/triangle/p1rmin/rexd_config.cfg index 3c9ea8921ea685103a97ef76ca5c48d6a189e8cf..8207084ffb0c453ce955ac49f00dc350d31f5cfc 100644 --- a/scenarios/triangle/p1rmin/rexd_config.cfg +++ b/scenarios/triangle/p1rmin/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/triangle/p1rminvar1/rexd_config.cfg b/scenarios/triangle/p1rminvar1/rexd_config.cfg index 06243b6317e2931ef98de46d277f05d433804a41..c036974b82ac0f8adabdefe4bfdc2708bd705293 100644 --- a/scenarios/triangle/p1rminvar1/rexd_config.cfg +++ b/scenarios/triangle/p1rminvar1/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/triangle/p1var1/rexd_config.cfg b/scenarios/triangle/p1var1/rexd_config.cfg index 5a5318588c0e38c99821969c133bae1dcbf7c7b0..edd8f1785085952909bc13cd9829c938975cd455 100644 --- a/scenarios/triangle/p1var1/rexd_config.cfg +++ b/scenarios/triangle/p1var1/rexd_config.cfg @@ -61,7 +61,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/triangle/p1var2/rexd_config.cfg b/scenarios/triangle/p1var2/rexd_config.cfg index d28f80b4d4bf7aafb2305467ab079fc3e17adcde..40880b4e5776e650ab58e6a3a9754322cd81095b 100644 --- a/scenarios/triangle/p1var2/rexd_config.cfg +++ b/scenarios/triangle/p1var2/rexd_config.cfg @@ -62,7 +62,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/triangle/p2/rexd_config.cfg b/scenarios/triangle/p2/rexd_config.cfg index 24429a8faba7254ba7b887fa4085876d24fcf09a..79a519c5473ae38d95dac2876667fca0d0f2aaec 100644 --- a/scenarios/triangle/p2/rexd_config.cfg +++ b/scenarios/triangle/p2/rexd_config.cfg @@ -61,7 +61,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/scenarios/zenotravel/p1/rexd_config.cfg b/scenarios/zenotravel/p1/rexd_config.cfg index 277e7ad9d3adcbb3aa5e25471970199eebca22ce..9f0ccc52f380c53aad383e416a75097b7fc8ef6c 100644 --- a/scenarios/zenotravel/p1/rexd_config.cfg +++ b/scenarios/zenotravel/p1/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/src/lfd/auto_teacher.cpp b/src/lfd/auto_teacher.cpp index f8935e4fa2ce74544647ba4101976eeaf45e03b5..863908bc26490cf338f5bd0eda7e70455450fe42 100644 --- a/src/lfd/auto_teacher.cpp +++ b/src/lfd/auto_teacher.cpp @@ -99,8 +99,8 @@ SymbolOptional AutoTeacher::get_planned_action(const State& state, symbolic_action.make_symbolic(); // always add if it is a new action - if (config_reader.get_variable<bool>("auto_teacher_zealous")) { - CINFO("teacher") << "Auto teacher: " << action << " - zealous mode."; + if (config_reader.get_variable<bool>("auto_teacher_forced")) { + CINFO("teacher") << "Auto teacher: " << action << " - forced mode."; } else if (std::find(action_list.begin(), action_list.end(), symbolic_action)!=action_list.end()) { // not a new action diff --git a/src/lfd/auto_teacher.h b/src/lfd/auto_teacher.h index 2a9482d4e636aed64809f2eb4bb37d387ed0acb3..e73d42aaa67ec83dc66f3893eb049d19c722bda7 100644 --- a/src/lfd/auto_teacher.h +++ b/src/lfd/auto_teacher.h @@ -64,7 +64,7 @@ public: * - auto_teacher_infinite_retries: max number of retries getting new planned action. * - auto_teacher_infinite_full_retries: max number of full retries. A full retry is done after auto_teacher_infinite_retries normal retries. * A full retry consists in getting a new state and redoing all the system standard planning process (including generating excuses again). - * - auto_teacher_zealous: always select planned action. + * - auto_teacher_forced: always select planned action. * - auto_teacher_excuse_autoexecute: select planned action if it is recommended by excuses. * - auto_teacher_autodead: signals a dead-end if no planned action is found. * diff --git a/src/rexd/config_reader.cpp b/src/rexd/config_reader.cpp index a724fd2ba2c86636696dba2d859eb19d98280be0..c9ba9d5e1680bee51848a4a3686aed7fd5312b20 100644 --- a/src/rexd/config_reader.cpp +++ b/src/rexd/config_reader.cpp @@ -114,7 +114,7 @@ bool ConfigReader::init(const std::string& config_path, const std::string& files ("auto_teacher", po::value<bool>()->default_value(true), "User automatic teacher") ("auto_teacher_excuse_autoexecute", po::value<bool>()->default_value(true), "Automatically execute recommended action when matches excuse") ("auto_teacher_autodead", po::value<bool>()->default_value(false), "Set as dead when autoteacher does not find a plan") - ("auto_teacher_zealous", po::value<bool>()->default_value(false), "All autoteacher plans are valid") + ("auto_teacher_forced", po::value<bool>()->default_value(false), "All autoteacher plans are forced") ("auto_teacher_autas_hacks", po::value<bool>()->default_value(false), "Hacks for autas") ("auto_teacher_infinite", po::value<bool>()->default_value(true), "Retry planning until a satisfactory solution is found") ("auto_teacher_infinite_retries", po::value<uint>()->default_value(5), "Number of autoteacher retries)") diff --git a/tests/domain_tests/rexd_config.cfg b/tests/domain_tests/rexd_config.cfg index 4e0f05cebe73730cc424e491a86d21e68cd9f4a0..358da2595088b6ed86099566d8746d158c12135b 100644 --- a/tests/domain_tests/rexd_config.cfg +++ b/tests/domain_tests/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 3 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/excuse_tests/autas_horiz_2/rexd_config.cfg b/tests/excuse_tests/autas_horiz_2/rexd_config.cfg index 0a6efc40ee72374e721b9be631dc6e55ebd9563b..36e667ca0db38746d53b53a93d79dda367ab19f2 100644 --- a/tests/excuse_tests/autas_horiz_2/rexd_config.cfg +++ b/tests/excuse_tests/autas_horiz_2/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = true auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/autas_p06_1/rexd_config.cfg b/tests/excuse_tests/autas_p06_1/rexd_config.cfg index 62f511a9eb726aa81729c72ff9ad3294399286fc..0fadbc6128577d21c97965bc582c68c88e4cb113 100644 --- a/tests/excuse_tests/autas_p06_1/rexd_config.cfg +++ b/tests/excuse_tests/autas_p06_1/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/excuse_tests/autas_p06_2/rexd_config.cfg b/tests/excuse_tests/autas_p06_2/rexd_config.cfg index 62f511a9eb726aa81729c72ff9ad3294399286fc..0fadbc6128577d21c97965bc582c68c88e4cb113 100644 --- a/tests/excuse_tests/autas_p06_2/rexd_config.cfg +++ b/tests/excuse_tests/autas_p06_2/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/excuse_tests/exblock_p5_1/rexd_config.cfg b/tests/excuse_tests/exblock_p5_1/rexd_config.cfg index 756a347241a6a7582707d8f00297e5e217e4ee2b..a1664a63b351659ec06f06fe89c2bc636b6f6cb3 100644 --- a/tests/excuse_tests/exblock_p5_1/rexd_config.cfg +++ b/tests/excuse_tests/exblock_p5_1/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite = true auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/exblock_p5_2/rexd_config.cfg b/tests/excuse_tests/exblock_p5_2/rexd_config.cfg index 756a347241a6a7582707d8f00297e5e217e4ee2b..a1664a63b351659ec06f06fe89c2bc636b6f6cb3 100644 --- a/tests/excuse_tests/exblock_p5_2/rexd_config.cfg +++ b/tests/excuse_tests/exblock_p5_2/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite = true auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/exblock_p5_3/rexd_config.cfg b/tests/excuse_tests/exblock_p5_3/rexd_config.cfg index 756a347241a6a7582707d8f00297e5e217e4ee2b..a1664a63b351659ec06f06fe89c2bc636b6f6cb3 100644 --- a/tests/excuse_tests/exblock_p5_3/rexd_config.cfg +++ b/tests/excuse_tests/exblock_p5_3/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite = true auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/exblock_p5_4/rexd_config.cfg b/tests/excuse_tests/exblock_p5_4/rexd_config.cfg index 756a347241a6a7582707d8f00297e5e217e4ee2b..a1664a63b351659ec06f06fe89c2bc636b6f6cb3 100644 --- a/tests/excuse_tests/exblock_p5_4/rexd_config.cfg +++ b/tests/excuse_tests/exblock_p5_4/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite = true auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_1/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_1/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_1/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_1/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_2/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_2/rexd_config.cfg index e2fd4808cfa08813b0afb1f62279d13451be0e75..db7d832355563d6a48e8c9627aa83259708513d6 100644 --- a/tests/excuse_tests/kitchen_p1_2/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_2/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_3/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_3/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_3/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_3/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_4/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_4/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_4/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_4/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_5/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_5/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_5/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_5/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_6/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_6/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_6/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_6/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_7/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_7/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_7/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_7/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_8/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_8/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_8/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_8/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/kitchen_p1_9/rexd_config.cfg b/tests/excuse_tests/kitchen_p1_9/rexd_config.cfg index fb61eff6c5944fc2538f96d71c71401efa8aaf48..0fbad9a9804b3646ce4a6172485d471edaf6bffd 100644 --- a/tests/excuse_tests/kitchen_p1_9/rexd_config.cfg +++ b/tests/excuse_tests/kitchen_p1_9/rexd_config.cfg @@ -66,7 +66,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1_1/rexd_config.cfg b/tests/excuse_tests/triangle_p1_1/rexd_config.cfg index 5513565a8fad3e280c4cebb788442ede67237e97..14d3f7969af1f3f0b145ddfc68e1fac29f769237 100644 --- a/tests/excuse_tests/triangle_p1_1/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1_1/rexd_config.cfg @@ -62,7 +62,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1_2/rexd_config.cfg b/tests/excuse_tests/triangle_p1_2/rexd_config.cfg index 5513565a8fad3e280c4cebb788442ede67237e97..14d3f7969af1f3f0b145ddfc68e1fac29f769237 100644 --- a/tests/excuse_tests/triangle_p1_2/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1_2/rexd_config.cfg @@ -62,7 +62,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1_3/rexd_config.cfg b/tests/excuse_tests/triangle_p1_3/rexd_config.cfg index 5513565a8fad3e280c4cebb788442ede67237e97..14d3f7969af1f3f0b145ddfc68e1fac29f769237 100644 --- a/tests/excuse_tests/triangle_p1_3/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1_3/rexd_config.cfg @@ -62,7 +62,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1_4/rexd_config.cfg b/tests/excuse_tests/triangle_p1_4/rexd_config.cfg index 5513565a8fad3e280c4cebb788442ede67237e97..14d3f7969af1f3f0b145ddfc68e1fac29f769237 100644 --- a/tests/excuse_tests/triangle_p1_4/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1_4/rexd_config.cfg @@ -62,7 +62,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 2 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1vmin_1/rexd_config.cfg b/tests/excuse_tests/triangle_p1vmin_1/rexd_config.cfg index 14eab8aaacfef876338b8e178cae3f848ef21405..20d063c268317d5ca490f23ede425feca582eea7 100644 --- a/tests/excuse_tests/triangle_p1vmin_1/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1vmin_1/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1vmin_2/rexd_config.cfg b/tests/excuse_tests/triangle_p1vmin_2/rexd_config.cfg index 14eab8aaacfef876338b8e178cae3f848ef21405..20d063c268317d5ca490f23ede425feca582eea7 100644 --- a/tests/excuse_tests/triangle_p1vmin_2/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1vmin_2/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1vmin_3/rexd_config.cfg b/tests/excuse_tests/triangle_p1vmin_3/rexd_config.cfg index 14eab8aaacfef876338b8e178cae3f848ef21405..20d063c268317d5ca490f23ede425feca582eea7 100644 --- a/tests/excuse_tests/triangle_p1vmin_3/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1vmin_3/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1vmin_4/rexd_config.cfg b/tests/excuse_tests/triangle_p1vmin_4/rexd_config.cfg index 14eab8aaacfef876338b8e178cae3f848ef21405..20d063c268317d5ca490f23ede425feca582eea7 100644 --- a/tests/excuse_tests/triangle_p1vmin_4/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1vmin_4/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1vmin_5/rexd_config.cfg b/tests/excuse_tests/triangle_p1vmin_5/rexd_config.cfg index 14eab8aaacfef876338b8e178cae3f848ef21405..20d063c268317d5ca490f23ede425feca582eea7 100644 --- a/tests/excuse_tests/triangle_p1vmin_5/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1vmin_5/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/excuse_tests/triangle_p1vmin_6/rexd_config.cfg b/tests/excuse_tests/triangle_p1vmin_6/rexd_config.cfg index 14eab8aaacfef876338b8e178cae3f848ef21405..20d063c268317d5ca490f23ede425feca582eea7 100644 --- a/tests/excuse_tests/triangle_p1vmin_6/rexd_config.cfg +++ b/tests/excuse_tests/triangle_p1vmin_6/rexd_config.cfg @@ -65,7 +65,7 @@ auto_teacher_infinite_retries = 5 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = true -auto_teacher_zealous = true +auto_teacher_forced = true auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = true diff --git a/tests/exploration_tests/1action_unknown/rexd_config.cfg b/tests/exploration_tests/1action_unknown/rexd_config.cfg index b559be521a0ef14fd8a3af8b5c973ab5142582c4..24381df4718262c519e901fc936886e4e20824b9 100644 --- a/tests/exploration_tests/1action_unknown/rexd_config.cfg +++ b/tests/exploration_tests/1action_unknown/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/exploration_tests/almost_explored/rexd_config.cfg b/tests/exploration_tests/almost_explored/rexd_config.cfg index b559be521a0ef14fd8a3af8b5c973ab5142582c4..24381df4718262c519e901fc936886e4e20824b9 100644 --- a/tests/exploration_tests/almost_explored/rexd_config.cfg +++ b/tests/exploration_tests/almost_explored/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/exploration_tests/almost_explored2/rexd_config.cfg b/tests/exploration_tests/almost_explored2/rexd_config.cfg index b559be521a0ef14fd8a3af8b5c973ab5142582c4..24381df4718262c519e901fc936886e4e20824b9 100644 --- a/tests/exploration_tests/almost_explored2/rexd_config.cfg +++ b/tests/exploration_tests/almost_explored2/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/exploration_tests/almost_explored3/rexd_config.cfg b/tests/exploration_tests/almost_explored3/rexd_config.cfg index b559be521a0ef14fd8a3af8b5c973ab5142582c4..24381df4718262c519e901fc936886e4e20824b9 100644 --- a/tests/exploration_tests/almost_explored3/rexd_config.cfg +++ b/tests/exploration_tests/almost_explored3/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/exploration_tests/empty_known/rexd_config.cfg b/tests/exploration_tests/empty_known/rexd_config.cfg index b559be521a0ef14fd8a3af8b5c973ab5142582c4..24381df4718262c519e901fc936886e4e20824b9 100644 --- a/tests/exploration_tests/empty_known/rexd_config.cfg +++ b/tests/exploration_tests/empty_known/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false diff --git a/tests/exploration_tests/explored/rexd_config.cfg b/tests/exploration_tests/explored/rexd_config.cfg index b559be521a0ef14fd8a3af8b5c973ab5142582c4..24381df4718262c519e901fc936886e4e20824b9 100644 --- a/tests/exploration_tests/explored/rexd_config.cfg +++ b/tests/exploration_tests/explored/rexd_config.cfg @@ -64,7 +64,7 @@ auto_teacher_infinite_retries = 10 auto_teacher_infinite_full_retries = 1 auto_teacher_autodead = false -auto_teacher_zealous = false +auto_teacher_forced = false auto_teacher_autas_hacks = false auto_teacher_dangerous_actions = false