Skip to content

Commit 3378fcf

Browse files
committed
use unordered map and adjust tests
1 parent fb3c074 commit 3378fcf

File tree

4 files changed

+201
-97
lines changed

4 files changed

+201
-97
lines changed

hardware_interface/include/hardware_interface/actuator_interface.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#define HARDWARE_INTERFACE__ACTUATOR_INTERFACE_HPP_
1717

1818
#include <limits>
19-
#include <map>
2019
#include <memory>
2120
#include <string>
2221
#include <unordered_map>
@@ -402,8 +401,8 @@ class ActuatorInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNod
402401
const HardwareInfo & get_hardware_info() const { return info_; }
403402

404403
HardwareInfo info_;
405-
std::map<std::string, InterfaceDescription> joint_state_interfaces_;
406-
std::map<std::string, InterfaceDescription> joint_command_interfaces_;
404+
std::unordered_map<std::string, InterfaceDescription> joint_state_interfaces_;
405+
std::unordered_map<std::string, InterfaceDescription> joint_command_interfaces_;
407406

408407
std::unordered_map<std::string, std::shared_ptr<StateInterface>> actuator_states_;
409408
std::unordered_map<std::string, std::shared_ptr<CommandInterface>> actuator_commands_;

hardware_interface/include/hardware_interface/sensor_interface.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#define HARDWARE_INTERFACE__SENSOR_INTERFACE_HPP_
1717

1818
#include <limits>
19-
#include <map>
2019
#include <memory>
2120
#include <string>
2221
#include <unordered_map>
@@ -270,7 +269,7 @@ class SensorInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNodeI
270269

271270
HardwareInfo info_;
272271

273-
std::map<std::string, InterfaceDescription> sensor_state_interfaces_;
272+
std::unordered_map<std::string, InterfaceDescription> sensor_state_interfaces_;
274273

275274
std::unordered_map<std::string, std::shared_ptr<StateInterface>> sensor_states_;
276275

hardware_interface/include/hardware_interface/system_interface.hpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#define HARDWARE_INTERFACE__SYSTEM_INTERFACE_HPP_
1717

1818
#include <limits>
19-
#include <map>
2019
#include <memory>
2120
#include <string>
2221
#include <unordered_map>
@@ -442,13 +441,13 @@ class SystemInterface : public rclcpp_lifecycle::node_interfaces::LifecycleNodeI
442441
const HardwareInfo & get_hardware_info() const { return info_; }
443442

444443
HardwareInfo info_;
445-
std::map<std::string, InterfaceDescription> joint_state_interfaces_;
446-
std::map<std::string, InterfaceDescription> joint_command_interfaces_;
444+
std::unordered_map<std::string, InterfaceDescription> joint_state_interfaces_;
445+
std::unordered_map<std::string, InterfaceDescription> joint_command_interfaces_;
447446

448-
std::map<std::string, InterfaceDescription> sensor_state_interfaces_;
447+
std::unordered_map<std::string, InterfaceDescription> sensor_state_interfaces_;
449448

450-
std::map<std::string, InterfaceDescription> gpio_state_interfaces_;
451-
std::map<std::string, InterfaceDescription> gpio_command_interfaces_;
449+
std::unordered_map<std::string, InterfaceDescription> gpio_state_interfaces_;
450+
std::unordered_map<std::string, InterfaceDescription> gpio_command_interfaces_;
452451

453452
std::unordered_map<std::string, std::shared_ptr<StateInterface>> system_states_;
454453
std::unordered_map<std::string, std::shared_ptr<CommandInterface>> system_commands_;

0 commit comments

Comments
 (0)