Fix #319 (#327)

jump-dev · Sep 9, 2019 · 0a46d84 · 0a46d84
1 parent 27fda6c
commit 0a46d84
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/src/operations.md b/docs/src/operations.md
@@ -54,7 +54,7 @@ LP solver.
 | `minimum(x)`                                     | \\(\\min(x)\\)                                                                                                                                        | concave | increasing                                                                                                | none                           |
 | `maximum(x)`                                     | \\(\\max(x)\\)                                                                                                                                        | convex  | increasing                                                                                                | none                           |
 | `[x y]` or `[x; y]` `hcat(x, y)` or `vcat(x, y)` | stacking                                                                                                                                              | affine  | increasing                                                                                                | none                           |
-| `trace(x)`                                       | \\(\\mathrm{tr} \\left(X \\right)\\)                                                                                                                  | affine  | increasing                                                                                                | none                           |
+| `tr(x)`                                          | \\(\\mathrm{tr} \\left(X \\right)\\)                                                                                                                  | affine  | increasing                                                                                                | none                           |
 | `partialtrace(x,sys,dims)`                       | Partial trace                                                                                                                                         | affine  | increasing                                                                                                | none                           |
 | `partialtranspose(x,sys,dims)`                   | Partial transpose                                                                                                                                     | affine  | increasing                                                                                                | none                           |
 | `conv(h,x)`                                      | \\(h \\in \\mathbb{R}^m\\) \\(x \\in \\mathbb{R}^m\\) \\(h\*x \\in \\mathbb{R}^{m+n-1}\\) entry \\(i\\) is given by \\(\\sum\_{j=1}^m h\_jx\_{i-j}\\) | affine  | increasing if \\(h\\ge 0\\) decreasing if \\(h\\le 0\\) not monotonic otherwise                           | PR: \\(h\\) is constant        |