@@ -136,14 +136,9 @@ class LcmDrivenLoop {
136136 // / @param is_forced_publish A flag which enables publishing via diagram.
137137 LcmDrivenLoop (drake::lcm::DrakeLcm* drake_lcm,
138138 std::unique_ptr<drake::systems::Diagram<double >> diagram,
139- <<<<<<< HEAD
140139 const drake::systems::LeafSystem<double >* lcm_parser,
141- const std::string& input_channel, bool is_forced_publish)
142- =======
143- const drake::systems::System<double >* lcm_parser,
144140 const std::string& input_channel, bool is_forced_publish,
145141 int queue_capacity=1 )
146- >>>>>>> 0423e9d80 (update lcm driven loop to use most recent message)
147142 : LcmDrivenLoop(drake_lcm, std::move(diagram), lcm_parser,
148143 std::vector<std::string>(1 , input_channel), input_channel,
149144 " " , is_forced_publish, queue_capacity){};
@@ -321,19 +316,17 @@ class LcmDrivenLoop {
321316 time =
322317 name_to_input_sub_map_.at (active_channel_).message ().utime * 1e-6 ;
323318 last_input_msg_time_ = time;
324- // print current cpu time
325- // get current time point
326- auto now = std::chrono::high_resolution_clock::now ();
327- std::cout << " Time of receipt of robot state: "
328- << std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch ()).count ()<< std::endl;
319+ // print current cpu time for timing analysis
320+ // auto now = std::chrono::high_resolution_clock::now();
321+ // std::cout << "Time of receipt of robot state: "
322+ // << std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count()<<" at utime: "<< time << std::endl;
329323 } else {
330324 // use the robot state to advance
331325 time = state_sub_->message ().utime * 1e-6 ;
332- // print current cpu time
333- // get current time point
334- auto now = std::chrono::high_resolution_clock::now ();
335- std::cout << " Time of receipt of robot state: "
336- << std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch ()).count ()<< std::endl;
326+ // print current cpu time for timing analysis
327+ // auto now = std::chrono::high_resolution_clock::now();
328+ // std::cout << "Time of receipt of robot state: "
329+ // << std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count()<<" at utime: "<< time << std::endl;
337330 state_sub_->clear ();
338331 }
339332
@@ -357,11 +350,10 @@ class LcmDrivenLoop {
357350 if (is_forced_publish_) {
358351 // Force-publish via the diagram
359352 diagram_ptr_->ForcedPublish (diagram_context);
360- // print current cpu time
361- // get current time point
362- auto now = std::chrono::high_resolution_clock::now ();
363- std::cout << " Time of publish: "
364- << std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch ()).count ()<< std::endl;
353+ // print current cpu time for timing analysis
354+ // auto now = std::chrono::high_resolution_clock::now();
355+ // std::cout << "Time of publish: "
356+ // << std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count()<< std::endl;
365357 }
366358
367359 // Clear messages in the current input channel
0 commit comments