initial_values -> initial_parameters

sloretz · sloretz · commit 29046af5d29a · 2018-06-05T10:43:04.000-07:00
diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp
@@ -85,6 +85,7 @@ class Node : public std::enable_shared_from_this<Node>
    * \param[in] namespace_ Namespace of the node.
    * \param[in] context The context for the node (usually represents the state of a process).
    * \param[in] arguments Command line arguments that should apply only to this node.
+   * \param[in] initial_parameters a list of initial values for parameters on the node.
    * This can be used to provide remapping rules that only affect one instance.
    * \param[in] use_global_arguments False to prevent node using arguments passed to the process.
    * \param[in] use_intra_process_comms True to use the optimized intra-process communication
@@ -96,7 +97,7 @@ class Node : public std::enable_shared_from_this<Node>
     const std::string & namespace_,
     rclcpp::Context::SharedPtr context,
     const std::vector<std::string> & arguments,
-    const std::vector<Parameter> & initial_values,
+    const std::vector<Parameter> & initial_parameters,
     bool use_global_arguments = true,
     bool use_intra_process_comms = false,
     bool start_parameter_services = true);
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_parameters.hpp b/rclcpp/include/rclcpp/node_interfaces/node_parameters.hpp
@@ -51,7 +51,7 @@ class NodeParameters : public NodeParametersInterface
     const node_interfaces::NodeBaseInterface::SharedPtr node_base,
     const node_interfaces::NodeTopicsInterface::SharedPtr node_topics,
     const node_interfaces::NodeServicesInterface::SharedPtr node_services,
-    const std::vector<Parameter> & initial_values,
+    const std::vector<Parameter> & initial_parameters,
     bool use_intra_process,
     bool start_parameter_services);
 
diff --git a/rclcpp/src/rclcpp/node.cpp b/rclcpp/src/rclcpp/node.cpp
@@ -55,7 +55,7 @@ Node::Node(
   const std::string & namespace_,
   rclcpp::Context::SharedPtr context,
   const std::vector<std::string> & arguments,
-  const std::vector<rclcpp::Parameter> & initial_values,
+  const std::vector<rclcpp::Parameter> & initial_parameters,
   bool use_global_arguments,
   bool use_intra_process_comms,
   bool start_parameter_services)
@@ -70,7 +70,7 @@ Node::Node(
       node_base_,
       node_topics_,
       node_services_,
-      initial_values,
+      initial_parameters,
       use_intra_process_comms,
       start_parameter_services
     )),
diff --git a/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp b/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp
@@ -31,7 +31,7 @@ NodeParameters::NodeParameters(
   const rclcpp::node_interfaces::NodeBaseInterface::SharedPtr node_base,
   const rclcpp::node_interfaces::NodeTopicsInterface::SharedPtr node_topics,
   const rclcpp::node_interfaces::NodeServicesInterface::SharedPtr node_services,
-  const std::vector<rclcpp::Parameter> & initial_values,
+  const std::vector<rclcpp::Parameter> & initial_parameters,
   bool use_intra_process,
   bool start_parameter_services)
 {
@@ -54,8 +54,8 @@ NodeParameters::NodeParameters(
 
   // TODO(sloretz) store initial values and use them when a parameter is created
   // Set initial parameter values
-  if (!initial_values.empty()) {
-    rcl_interfaces::msg::SetParametersResult result = set_parameters_atomically(initial_values);
+  if (!initial_parameters.empty()) {
+    rcl_interfaces::msg::SetParametersResult result = set_parameters_atomically(initial_parameters);
     if (!result.successful) {
       throw std::runtime_error("Failed to set initial parameters");
     }
diff --git a/rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_node.hpp b/rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_node.hpp
@@ -89,6 +89,7 @@ class LifecycleNode : public node_interfaces::LifecycleNodeInterface,
    * \param[in] node_name Namespace of the node.
    * \param[in] context The context for the node (usually represents the state of a process).
    * \param[in] arguments Command line arguments that should apply only to this node.
+   * \param[in] initial_parameters a list of initial values for parameters on the node.
    * This can be used to provide remapping rules that only affect one instance.
    * \param[in] use_global_arguments False to prevent node using arguments passed to the process.
    * \param[in] use_intra_process_comms True to use the optimized intra-process communication
@@ -100,7 +101,7 @@ class LifecycleNode : public node_interfaces::LifecycleNodeInterface,
     const std::string & namespace_,
     rclcpp::Context::SharedPtr context,
     const std::vector<std::string> & arguments,
-    const std::vector<rclcpp::Parameter> & initial_values,
+    const std::vector<rclcpp::Parameter> & initial_parameters,
     bool use_global_arguments = true,
     bool use_intra_process_comms = false,
     bool start_parameter_services = true);
diff --git a/rclcpp_lifecycle/src/lifecycle_node.cpp b/rclcpp_lifecycle/src/lifecycle_node.cpp
@@ -62,7 +62,7 @@ LifecycleNode::LifecycleNode(
   const std::string & namespace_,
   rclcpp::Context::SharedPtr context,
   const std::vector<std::string> & arguments,
-  const std::vector<rclcpp::Parameter> & initial_values,
+  const std::vector<rclcpp::Parameter> & initial_parameters,
   bool use_global_arguments,
   bool use_intra_process_comms,
   bool start_parameter_services)
@@ -77,7 +77,7 @@ LifecycleNode::LifecycleNode(
       node_base_,
       node_topics_,
       node_services_,
-      initial_values,
+      initial_parameters,
       use_intra_process_comms,
       start_parameter_services
     )),
