From 13d0ac08a4d0dc3b661fac3f0766ee2b63f8e389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mart=C3=ADnez?= <dmartinez@iri.upc.edu> Date: Tue, 1 Apr 2014 17:48:12 +0200 Subject: [PATCH] Updated monitoring output. --- apps/include/intellact_main.h | 2 +- apps/src/intellact_main.cpp | 2 +- include/rexd/rl_main.h | 2 +- src/rexd/rl_main.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/include/intellact_main.h b/apps/include/intellact_main.h index fccb5b4b..86af398b 100755 --- a/apps/include/intellact_main.h +++ b/apps/include/intellact_main.h @@ -50,7 +50,7 @@ private: virtual void show_info_start_learning(); virtual void show_info_end_learning(const RuleSet& removed_rules, const RuleSet& added_rules); virtual void show_info_start_planning(); - virtual void show_info_end_planning(SymbolConstPtr planning_res, const std::string& excuse, const uint plan_length = 10000, const std::vector<std::string> additional_status_info = std::vector<std::string>()); + virtual void show_info_end_planning(SymbolConstPtr planning_res, const std::string& excuse, const uint plan_length = 10000); virtual void show_info_start_thinking(); virtual void show_info_end_thinking(); virtual void show_info_teacher_request(const std::string& excuse, const std::vector<std::string>& actions_requiring_excuse); diff --git a/apps/src/intellact_main.cpp b/apps/src/intellact_main.cpp index 0350f4ac..94c57577 100755 --- a/apps/src/intellact_main.cpp +++ b/apps/src/intellact_main.cpp @@ -251,7 +251,7 @@ void IntellactServer::show_info_end_learning(const RuleSet& removed_rules, const write_to_monitoring_screen(InfoDisplay::LEARNING, previous_action.name); } -void IntellactServer::show_info_end_planning(SymbolConstPtr planning_res, const std::string& excuse, const uint plan_length, const std::vector<std::string> additional_status_info) +void IntellactServer::show_info_end_planning(SymbolConstPtr planning_res, const std::string& excuse, const uint plan_length) { info_displayer.generate_planning_html_info(false, planning_res, excuse, plan_length); write_to_monitoring_screen(InfoDisplay::PLANNING); diff --git a/include/rexd/rl_main.h b/include/rexd/rl_main.h index 30187a2d..963d83c1 100644 --- a/include/rexd/rl_main.h +++ b/include/rexd/rl_main.h @@ -96,7 +96,7 @@ protected: virtual void show_info_start_learning() =0; virtual void show_info_end_learning(const RuleSet& removed_rules, const RuleSet& added_rules) =0; virtual void show_info_start_planning() =0; - virtual void show_info_end_planning(SymbolConstPtr planning_res, const std::string& excuse, const uint plan_length = 10000, const std::vector<std::string> additional_status_info = std::vector<std::string>()) =0; + virtual void show_info_end_planning(SymbolConstPtr planning_res, const std::string& excuse, const uint plan_length = 10000) =0; virtual void show_info_start_thinking() =0; virtual void show_info_end_thinking() =0; virtual void show_info_teacher_request(const std::string& excuse, const std::vector<std::string>& actions_requiring_excuse) =0; diff --git a/src/rexd/rl_main.cpp b/src/rexd/rl_main.cpp index c28b91c1..605423df 100644 --- a/src/rexd/rl_main.cpp +++ b/src/rexd/rl_main.cpp @@ -209,7 +209,7 @@ void ReinforcementLearner::planning(const State& state) } } - show_info_end_planning(planning_res, boost::lexical_cast<std::string>(excuse), 10000, actions_requiring_excuse); + show_info_end_planning(planning_res, boost::lexical_cast<std::string>(excuse)); // If solution found execute it. Else teacher / explore if (planning_res) { -- GitLab