From 0a46d844d8c6c022f6c700e1f59b354848c2e409 Mon Sep 17 00:00:00 2001 From: Eric Hanson <5846501+ericphanson@users.noreply.github.com> Date: Mon, 9 Sep 2019 10:45:17 -0400 Subject: [PATCH] Fix #319 (#327) --- docs/src/operations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/operations.md b/docs/src/operations.md index 53da5bce7..fedc7a52e 100644 --- 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 |