diff --git a/core/include/dsr/core/types/type_checking/dsr_attr_name.h b/core/include/dsr/core/types/type_checking/dsr_attr_name.h index f2e9a4f..f9b096e 100644 --- a/core/include/dsr/core/types/type_checking/dsr_attr_name.h +++ b/core/include/dsr/core/types/type_checking/dsr_attr_name.h @@ -177,7 +177,7 @@ REGISTER_TYPE(unseen_time, int, false) REGISTER_TYPE(obj_checked, bool, false) REGISTER_TYPE(average_size, std::reference_wrapper, false) REGISTER_TYPE(is_an_obstacle, bool, false) - +REGISTER_TYPE(room_id, uint64_t, false) /* * Object affordances * @@ -300,10 +300,7 @@ REGISTER_TYPE(corner1, std::reference_wrapper>, false); REGISTER_TYPE(corner2, std::reference_wrapper>, false); REGISTER_TYPE(corner3, std::reference_wrapper>, false); REGISTER_TYPE(corner4, std::reference_wrapper>, false); -REGISTER_TYPE(corner_id, int, false); -REGISTER_TYPE(valid, bool, false); -REGISTER_TYPE(room_id, uint64_t, false); -REGISTER_TYPE(connected_room_name, std::reference_wrapper, false); + /* * * * * * * * * * * * MELEX-RODAO ATTR * @@ -425,6 +422,18 @@ REGISTER_TYPE(task_destination_values, std::reference_wrapper, false) +REGISTER_TYPE(connected_room_name, std::reference_wrapper, false) + /* * INTENTION EDGE * */ @@ -461,28 +470,4 @@ REGISTER_TYPE(test_vec6_type, std::reference_wrapper , false) REGISTER_TYPE(compresssed_id, int, false) REGISTER_TYPE(compressed_data, std::reference_wrapper>, false) -/* -*TTS -*/ -REGISTER_TYPE(tts_to_say, std::string, false) - -/* -*ASR -*/ -REGISTER_TYPE(asr_texto, std::string, false) -REGISTER_TYPE(asr_escucha, bool, false) - -/* -*LLAMA -*/ -REGISTER_TYPE(llama_inicio, std::string, false) -REGISTER_TYPE(llama_in_llama, std::string, false) -REGISTER_TYPE(llama_out_llama, std::string, false) - -/* -*AMBIENTAL -*/ -REGISTER_TYPE(ambiental_temperature, float, false) -REGISTER_TYPE(ambiental_humidity, float, false) -REGISTER_TYPE(ambiental_light, float, false) #endif //DSR_ATTR_NAME_H diff --git a/core/include/dsr/core/types/type_checking/dsr_node_type.h b/core/include/dsr/core/types/type_checking/dsr_node_type.h index bf64658..50e112a 100644 --- a/core/include/dsr/core/types/type_checking/dsr_node_type.h +++ b/core/include/dsr/core/types/type_checking/dsr_node_type.h @@ -129,25 +129,7 @@ REGISTER_NODE_TYPE(compressed) //Agent REGISTER_NODE_TYPE(agent) -//TTS -REGISTER_NODE_TYPE(tts) - -//ASR -REGISTER_NODE_TYPE(asr) - -//Llama -REGISTER_NODE_TYPE(llm) - -//Ambiental -REGISTER_NODE_TYPE(ambiental) - -//Sonido -REGISTER_NODE_TYPE(sound) - -//Actuador -REGISTER_NODE_TYPE(actuador) //pioneer REGISTER_NODE_TYPE(wayp) - #endif //DSR_NODE_TYPE_H