Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/symbolic_rational_function.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ RationalFunction operator/(double c, const RationalFunction& f);
*/
RationalFunction pow(const RationalFunction& f, int n);
/**
* Provides the following operations:
* Provides the following operations:
*
* - Matrix<RF> * Matrix<Polynomial> => Matrix<RF>
* - Matrix<RF> * Matrix<double> => Matrix<RF>
Expand Down
20 changes: 10 additions & 10 deletions manipulation/schunk_wsg/schunk_wsg_plain_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum class ControlMode { kPosition = 0, kForce = 1 };
* control mode specified for the controller, which can be either
* ControlMode::kPosition or ControlMode::kForce. In both cases, the overall
* layout of the diagram is:
*```
* ```
* ┌─────────────┐
* joint │Joint State │ ┌──────────┐
* state ─────▶│To Control ├──▶│ │
Expand Down Expand Up @@ -45,12 +45,12 @@ enum class ControlMode { kPosition = 0, kForce = 1 };
* │ ┌──┐ └──▶│Saturation├──▶│To Joint ├──▶│ │
* max force / 2 ──┴──▶│-1├─────▶│ │ │Force │ └───┘
* └──┘ └──────────┘ └───────────┘
*```
* ```
* The blocks with double outlines (══) differ between the two control modes:
*
* - Generate Desired Control State
* - ControlMode::kPosition
*```
* ```
* ┌───────────┐
* │Desired │
* │Mean Finger├──▶█
Expand All @@ -62,9 +62,9 @@ enum class ControlMode { kPosition = 0, kForce = 1 };
* grip ───────▶█
* state
*
*```
* ```
* - ControlMode::kForce
*```
* ```
* ┌───────────┐
* │Desired │ desired
* │Mean Finger├────────────────────────▶ control
Expand All @@ -74,10 +74,10 @@ enum class ControlMode { kPosition = 0, kForce = 1 };
* desired ┌────────┐
* grip ───────▶│IGNORED │
* state └────────┘
*```
* ```
* - Handle Feed-Forward Force
* - ControlMode::kPosition
*```
* ```
* █────▶ mean finger force
* pid █
* controller ────────────────▶█
Expand All @@ -86,9 +86,9 @@ enum class ControlMode { kPosition = 0, kForce = 1 };
* feed ┌────────┐
* forward ──────▶│IGNORED │
* force └────────┘
*```
* ```
* - ControlMode::kForce
*```
* ```
* pid
* controller ──────────────────────▶ mean finger force
* output
Expand All @@ -97,7 +97,7 @@ enum class ControlMode { kPosition = 0, kForce = 1 };
* forward ─────────────────────────▶ grip force
* force
*
*```
* ```
* The remaining blocks differ only in their numerical parameters.
*
* Note that the "feed forward force" input is ignored for
Expand Down
2 changes: 1 addition & 1 deletion multibody/tree/door_hinge.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class DoorHinge final : public ForceElement<T> {
@name Advanced Functions
Convenience functions for evaluating %DoorHinge operations without worrying
about context-related issues.
@{
@{
*/

/// Calculates the total frictional torque with the given @p angular_rate
Expand Down
6 changes: 3 additions & 3 deletions perception/point_cloud.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class PointCloud final {
return mutable_xyzs().col(i);
}

/// @} // Geometric Descriptors - XYZs
/// @}

/// @name Geometric Descriptors - Normals
/// @{
Expand All @@ -186,7 +186,7 @@ class PointCloud final {
return mutable_normals().col(i);
}

/// @} // Geometric Descriptors - Normals
/// @}

/// @name Geometric Descriptors - RGBs
/// @{
Expand All @@ -212,7 +212,7 @@ class PointCloud final {
return mutable_rgbs().col(i);
}

/// @} // Geometric Descriptors - RGBs
/// @}

/// @name Run-Time Descriptors
/// @{
Expand Down
4 changes: 2 additions & 2 deletions solvers/constraint.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,11 +449,11 @@ class EvaluatorConstraint : public Constraint {
};

/**
* A constraint on the values of multivariate polynomials.
*
* lb[i] <= P[i](x, y...) <= ub[i], where each P[i] is a multivariate
* polynomial in x, y...
*
* A constraint on the values of multivariate polynomials.
*
* The Polynomial class uses a different variable naming scheme; thus the
* caller must provide a list of Polynomial::VarType variables that correspond
* to the members of the MathematicalProgram::Binding (the individual scalar
Expand Down
8 changes: 3 additions & 5 deletions solvers/test/semidefinite_program_examples.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,15 @@ void SolveSDPwithSecondOrderConeExample1(const SolverInterface& solver,
void SolveSDPwithSecondOrderConeExample2(const SolverInterface& solver,
double tol);

/** Solve an SDP with two PSD constraint, each of the PSD constraint has
* duplicated entries, and the two PSD matrix share a common variables.

/** Solve an SDP with two PSD constraint, where each PSD constraint has
* duplicate entries and the two PSD matrix share a common variables.
* min 2 * x0 + x2
* s.t [x0 x1] is psd
* [x1 x0]

* [x0 x2] is psd
* [x2 x0]
* x1 == 1
* the optimal solution is x = (1, 1, -1).
* The optimal solution will be x = (1, 1, -1).
*/
void SolveSDPwithOverlappingVariables(const SolverInterface& solver,
double tol);
Expand Down
2 changes: 1 addition & 1 deletion systems/analysis/bogacki_shampine3_integrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace systems {
-----------------------------------------------------------------------------
2/9 1/3 4/9 0
7/24 1/4 1/3 1/8
</pre>
</pre>
where the second to last row is the 3rd-order (propagated) solution and
the last row gives a 2nd-order accurate solution used for error control.

Expand Down