Skip to content

Commit

Permalink
linters
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina committed Apr 22, 2021
1 parent 0cd9f97 commit 87fc331
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/ServerPrivate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ void ServerPrivate::AddRecordPlugin(const ServerConfig &_config)

// In the case that the --compress flag is set, then
// this field will be populated with just the file extension
if(_config.LogRecordCompressPath() == ".zip")
if (_config.LogRecordCompressPath() == ".zip")
{
sdfCompressPath = std::string(sdfRecordPath);
if (!std::string(1, sdfCompressPath.back()).compare(
Expand Down
6 changes: 3 additions & 3 deletions src/SimulationRunner.cc
Original file line number Diff line number Diff line change
Expand Up @@ -864,18 +864,18 @@ void SimulationRunner::LoadLoggingPlugins(const ServerConfig &_config)
{
std::list<ServerConfig::PluginInfo> plugins;

if(_config.UseLogRecord() && !_config.LogPlaybackPath().empty())
if (_config.UseLogRecord() && !_config.LogPlaybackPath().empty())
{
ignwarn <<
"Both recording and playback are specified, defaulting to playback\n";
}

if(!_config.LogPlaybackPath().empty())
if (!_config.LogPlaybackPath().empty())
{
auto playbackPlugin = _config.LogPlaybackPlugin();
plugins.push_back(playbackPlugin);
}
else if(_config.UseLogRecord())
else if (_config.UseLogRecord())
{
auto recordPlugin = _config.LogRecordPlugin();
plugins.push_back(recordPlugin);
Expand Down
4 changes: 2 additions & 2 deletions test/integration/wheel_slip.cc
Original file line number Diff line number Diff line change
Expand Up @@ -554,12 +554,12 @@ TEST_F(WheelSlipTest, TricyclesUphill)
server.AddSystem(testSlipSystem.systemPtr);
server.Run(true, 2000, false);

// Slip works on DART>=6.10, which isn't available on Ubuntu Focal
#ifndef __linux__
// compute expected slip
// normal force as passed to Wheel Slip in test world
const double wheelNormalForce = 32;
const double mass = 14.5;
// Slip works on DART>=6.10, which isn't available on Ubuntu Focal
#ifndef __linux__
const double forceRatio =
(mass/2) * std::abs(gravity->Data().X()) / wheelNormalForce;
#endif
Expand Down

0 comments on commit 87fc331

Please sign in to comment.