Skip to content

Commit 0faefbd

Browse files
1 parent aef6656 commit 0faefbd

File tree

64 files changed

+45582
-22105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+45582
-22105
lines changed

clion.html

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -322,22 +322,13 @@ <h1 id="integrating-external-tools-with-clion">Integrating External Tools with C
322322

323323
<h2 id="formatting-files">Formatting files</h2>
324324

325-
<p>You can use clang format to modify the formatting of your file in the GUI. We’ll
326-
introduce three variants:</p>
325+
<p>You can use clang-format to reformat your file in the GUI.</p>
327326

328-
<ul>
329-
<li>Apply clang-format to a whole file.</li>
330-
<li>Apply clang-format to selected lines.</li>
331-
<li>Apply clang-format to correct <code class="language-plaintext highlighter-rouge">#include</code> ordering.</li>
332-
</ul>
333-
334-
<p>These tools modify the selected file. There is a synchronization issue with
327+
<p>The formatter modifies the selected file. There is a synchronization issue with
335328
CLion such that the modification may not be immediately apparent. When in doubt,
336329
select away from the target file and back; this will cause the file to refresh
337330
and you can confirm that the file has been modified as expected.</p>
338331

339-
<h3 id="clang-format-selected-file">Clang format selected file</h3>
340-
341332
<p>Open the <code class="language-plaintext highlighter-rouge">Edit Tool</code> for external tools as outlined above and enter the
342333
following values for the fields:</p>
343334

@@ -352,39 +343,6 @@ <h3 id="clang-format-selected-file">Clang format selected file</h3>
352343

353344
<p>Leave the checkbox options in their default state.</p>
354345

355-
<h3 id="clang-format-selected-lines">Clang format selected lines</h3>
356-
357-
<p>Open the <code class="language-plaintext highlighter-rouge">Edit Tool</code> for external tools as outlined above and enter the
358-
following values for the fields:</p>
359-
360-
<ul>
361-
<li><strong>Name:</strong> <code class="language-plaintext highlighter-rouge">Clang Format Selected Lines</code></li>
362-
<li><strong>Description:</strong> <code class="language-plaintext highlighter-rouge">Apply clang-format to the selected lines</code></li>
363-
<li><strong>Program:</strong> <code class="language-plaintext highlighter-rouge">bazel</code></li>
364-
<li><strong>Arguments:</strong> <code class="language-plaintext highlighter-rouge">run //tools/lint:clang-format -- -lines $SelectionStartLine$:$SelectionEndLine$ -i $FilePath$</code></li>
365-
<li><strong>Working directory:</strong> <code class="language-plaintext highlighter-rouge">$Projectpath$</code></li>
366-
<li><strong>Advanced Options:</strong> Uncheck <code class="language-plaintext highlighter-rouge">Open console for tool output</code></li>
367-
</ul>
368-
369-
<p>Leave the checkbox options in their default state.</p>
370-
371-
<h3 id="correct-include-ordering">Correct #include ordering</h3>
372-
373-
<p>Open the <code class="language-plaintext highlighter-rouge">Edit Tool</code> for external tools as outlined above and enter the
374-
following values for the fields:</p>
375-
376-
<ul>
377-
<li><strong>Name:</strong> <code class="language-plaintext highlighter-rouge">Clang Format Include Ordering</code></li>
378-
<li><strong>Description:</strong> <code class="language-plaintext highlighter-rouge">Runs the clang format for correcting includes on the current
379-
file</code></li>
380-
<li><strong>Program:</strong> <code class="language-plaintext highlighter-rouge">bazel</code></li>
381-
<li><strong>Arguments:</strong> <code class="language-plaintext highlighter-rouge">run //tools/lint:clang-format-includes -- $FilePath$</code></li>
382-
<li><strong>Working directory:</strong> <code class="language-plaintext highlighter-rouge">$Projectpath$</code></li>
383-
<li><strong>Advanced Options:</strong> Uncheck <code class="language-plaintext highlighter-rouge">Open console for tool output</code></li>
384-
</ul>
385-
386-
<p>Leave the checkbox options in their default state.</p>
387-
388346
<h2 id="linting-files">“Linting” files</h2>
389347

390348
<p>“Linting” refers to using tools to find aspects of code which don’t conform
@@ -453,12 +411,10 @@ <h3 id="lint-selected-file-for-drake-style-addenda">Lint selected file for Drake
453411
<li><strong>Advanced Options:</strong> Confirm <code class="language-plaintext highlighter-rouge">Open console for tool output</code> is checked</li>
454412
</ul>
455413

456-
<p>In the event of finding a lint problem (e.g., out-of-order include files), the
414+
<p>In the event of finding a lint problem, the
457415
CLion output will contain a <em>single</em> clickable link. This link is only the
458416
<em>first</em> error encountered in the include section; there may be more. The link
459-
merely provides a hint to the developer to see the problem area. Rather than
460-
fixing by hand, we strongly recommend executing the <code class="language-plaintext highlighter-rouge">Clang Format Include
461-
Ordering</code> external tool on the file.</p>
417+
merely provides a hint to the developer to see the problem area.</p>
462418

463419
<h3 id="alternative-linting-configuration">Alternative linting configuration</h3>
464420

code_style_tools.html

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ <h1 id="automated-style-checks">Automated style checks</h1>
195195
described in <a href="/bazel.html#updating-build-files">Updating BUILD files</a>.</li>
196196
</ul>
197197

198+
<p>To opt-out of all linting (e.g., when committing vendored copies of third-party
199+
external files into Drake’s workspace), add <code class="language-plaintext highlighter-rouge">tags = ["nolint"]</code> to the
200+
<code class="language-plaintext highlighter-rouge">BUILD.bazel</code> rule(s) for the copied code.</p>
201+
198202
<h1 id="manual-style-fixups">Manual style fixups</h1>
199203

200204
<h2 id="cc-clang-format">C/C++: Clang-Format</h2>
@@ -205,19 +209,7 @@ <h2 id="cc-clang-format">C/C++: Clang-Format</h2>
205209
bazel run //tools/lint:clang-format -- -i -style=file [file name]
206210
</code></pre></div></div>
207211

208-
<p>Using <code class="language-plaintext highlighter-rouge">clang-format</code> will modify the entire file that is specified. As an
209-
alternative, you can use <code class="language-plaintext highlighter-rouge">git clang-format</code> on Ubuntu to change only the
210-
portions of a file that you have modified. To run <code class="language-plaintext highlighter-rouge">git clang-format</code>:</p>
211-
212-
<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code># Make sure the clang-format program exists at the path we want to use.
213-
bazel build //tools/lint/...
214-
215-
# For development on Ubuntu: format a file that has been staged in git
216-
git clang-format --binary=/path/to/drake/bazel-bin/tools/lint/clang-format -- [file name]
217-
218-
# For development on Ubuntu: format a file that has been modified but not staged
219-
git clang-format --binary=/path/to/drake/bazel-bin/tools/lint/clang-format -f -- [file name]
220-
</code></pre></div></div>
212+
<p>Using <code class="language-plaintext highlighter-rouge">clang-format</code> will modify the entire file that is specified.</p>
221213

222214
<h3 id="ide-integration">IDE integration</h3>
223215

doxygen_cxx/annotated.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@
528528
<tr id="row_0_9_27_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classdrake_1_1multibody_1_1_deformable_model.html" target="_self">DeformableModel</a></td><td class="desc"><a class="el" href="classdrake_1_1multibody_1_1_deformable_model.html" title="DeformableModel implements the interface in PhysicalModel and provides the functionalities to specify...">DeformableModel</a> implements the interface in <a class="el" href="classdrake_1_1multibody_1_1_physical_model.html" title="(Internal) PhysicalModel provides the functionalities to extend the type of physical model of Multibo...">PhysicalModel</a> and provides the functionalities to specify deformable bodies </td></tr>
529529
<tr id="row_0_9_28_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_controller.html" target="_self">DifferentialInverseKinematicsController</a></td><td class="desc">Differential Inverse Kinematics controller that tracks desired poses / velocities for multiple operational points </td></tr>
530530
<tr id="row_0_9_29_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_integrator.html" target="_self">DifferentialInverseKinematicsIntegrator</a></td><td class="desc">A LeafSystem that integrates successive calls to DoDifferentialInverseKinematics (which produces joint velocity commands) to produce joint position commands </td></tr>
531-
<tr id="row_0_9_30_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_parameters.html" target="_self">DifferentialInverseKinematicsParameters</a></td><td class="desc">Contains parameters for differential inverse kinematics </td></tr>
531+
<tr id="row_0_9_30_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_parameters.html" target="_self">DifferentialInverseKinematicsParameters</a></td><td class="desc">Contains parameters for the family of differential inverse kinematics function overloads below, each named <a class="el" href="group__planning__kinematics.html#ga2f16257d707e2329789beaf507b75b2d" title="Computes a generalized velocity v_next, via the following MathematicalProgram:">DoDifferentialInverseKinematics()</a> </td></tr>
532532
<tr id="row_0_9_31_" style="display:none;"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structdrake_1_1multibody_1_1_differential_inverse_kinematics_result.html" target="_self">DifferentialInverseKinematicsResult</a></td><td class="desc"></td></tr>
533533
<tr id="row_0_9_32_" style="display:none;"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span id="arr_0_9_32_" class="arrow" onclick="toggleFolder('0_9_32_')">&#9658;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" target="_self">DifferentialInverseKinematicsSystem</a></td><td class="desc">The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velocities) for an arbitrary number of "goal" frames on the robot, and produces a generalized velocity command as output to move the goal frames toward the desired state </td></tr>
534534
<tr id="row_0_9_32_0_" style="display:none;"><td class="entry"><span style="width:64px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structdrake_1_1multibody_1_1_differential_inverse_kinematics_system_1_1_callback_details.html" target="_self">CallbackDetails</a></td><td class="desc">(Internal use only) A group of common arguments relevant to multiple different costs and constraints within the <a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" title="The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velociti...">DifferentialInverseKinematicsSystem</a> program formulation </td></tr>

doxygen_cxx/classdrake_1_1multibody_1_1_differential_inverse_kinematics_parameters.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</div><!--header-->
167167
<div class="contents">
168168
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
169-
<div class="textblock"><p>Contains parameters for differential inverse kinematics. </p>
169+
<div class="textblock"><p>Contains parameters for the family of differential inverse kinematics function overloads below, each named <a class="el" href="group__planning__kinematics.html#ga2f16257d707e2329789beaf507b75b2d" title="Computes a generalized velocity v_next, via the following MathematicalProgram:">DoDifferentialInverseKinematics()</a>. </p>
170170
</div>
171171
<p><code>#include &lt;drake/multibody/inverse_kinematics/differential_inverse_kinematics.h&gt;</code></p>
172172
<table class="memberdecls">

doxygen_cxx/differential__inverse__kinematics_8h.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdrake_1_1multibody_1_1_differential_inverse_kinematics_result.html">DifferentialInverseKinematicsResult</a></td></tr>
202202
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
203203
<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_parameters.html">DifferentialInverseKinematicsParameters</a></td></tr>
204-
<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Contains parameters for differential inverse kinematics. <a href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_parameters.html#details">More...</a><br /></td></tr>
204+
<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Contains parameters for the family of differential inverse kinematics function overloads below, each named <a class="el" href="group__planning__kinematics.html#ga2f16257d707e2329789beaf507b75b2d" title="Computes a generalized velocity v_next, via the following MathematicalProgram:">DoDifferentialInverseKinematics()</a>. <a href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_parameters.html#details">More...</a><br /></td></tr>
205205
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
206206
<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structfmt_1_1formatter_3_01drake_1_1multibody_1_1_differential_inverse_kinematics_status_01_4.html">formatter&lt; drake::multibody::DifferentialInverseKinematicsStatus &gt;</a></td></tr>
207207
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>

doxygen_cxx/group__planning__kinematics.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga2f16257d707e2329789beaf
278278
</table>
279279
</dd>
280280
</dl>
281-
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt. </dd></dl>
281+
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt.</dd></dl>
282+
<dl class="section note"><dt>Note</dt><dd>There is a newer framework-based formulation for differential inverse kinematics: <a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" title="The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velociti...">DifferentialInverseKinematicsSystem</a>. This implementation has been shown to be more effective for real-world robots. Furthermore, its architecture is more flexible, allowing for more customization of the cost and constraint functions. </dd></dl>
282283

283284
</div>
284285
</div>
@@ -337,7 +338,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga6e3a66e37411b9d8358efc0
337338
</table>
338339
</dd>
339340
</dl>
340-
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt. </dd></dl>
341+
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt.</dd></dl>
342+
<dl class="section note"><dt>Note</dt><dd>There is a newer framework-based formulation for differential inverse kinematics: <a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" title="The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velociti...">DifferentialInverseKinematicsSystem</a>. This implementation has been shown to be more effective for real-world robots. Furthermore, its architecture is more flexible, allowing for more customization of the cost and constraint functions. </dd></dl>
341343

342344
</div>
343345
</div>
@@ -403,7 +405,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gac15a6d2dc75b3cdcf0d5455
403405
</table>
404406
</dd>
405407
</dl>
406-
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt. </dd></dl>
408+
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt.</dd></dl>
409+
<dl class="section note"><dt>Note</dt><dd>There is a newer framework-based formulation for differential inverse kinematics: <a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" title="The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velociti...">DifferentialInverseKinematicsSystem</a>. This implementation has been shown to be more effective for real-world robots. Furthermore, its architecture is more flexible, allowing for more customization of the cost and constraint functions. </dd></dl>
407410

408411
</div>
409412
</div>
@@ -462,7 +465,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gafd57fd1045276e8221f6f0a
462465
</table>
463466
</dd>
464467
</dl>
465-
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt. </dd></dl>
468+
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt.</dd></dl>
469+
<dl class="section note"><dt>Note</dt><dd>There is a newer framework-based formulation for differential inverse kinematics: <a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" title="The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velociti...">DifferentialInverseKinematicsSystem</a>. This implementation has been shown to be more effective for real-world robots. Furthermore, its architecture is more flexible, allowing for more customization of the cost and constraint functions. </dd></dl>
466470

467471
</div>
468472
</div>
@@ -528,7 +532,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7ab1374802ca61f12cd1447
528532
</table>
529533
</dd>
530534
</dl>
531-
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt. </dd></dl>
535+
<dl class="section return"><dt>Returns</dt><dd>If the solver successfully finds a solution, joint_velocities will be set to v, otherwise it will be nullopt.</dd></dl>
536+
<dl class="section note"><dt>Note</dt><dd>There is a newer framework-based formulation for differential inverse kinematics: <a class="el" href="classdrake_1_1multibody_1_1_differential_inverse_kinematics_system.html" title="The DifferentialInverseKinematicsSystem takes as input desired cartesian poses (or cartesian velociti...">DifferentialInverseKinematicsSystem</a>. This implementation has been shown to be more effective for real-world robots. Furthermore, its architecture is more flexible, allowing for more customization of the cost and constraint functions. </dd></dl>
532537

533538
</div>
534539
</div>

0 commit comments

Comments
 (0)