From d6e6109e229b32c8c6fedfa0089a66c1b20f378b Mon Sep 17 00:00:00 2001 From: mhjensen Date: Fri, 27 Nov 2020 14:30:19 +0100 Subject: [PATCH] typos and merge problems --- doc/pub/week48/html/._week48-bs008.html | 2 +- doc/pub/week48/html/._week48-bs013.html | 6 ++++-- doc/pub/week48/html/week48-reveal.html | 8 +++++--- doc/pub/week48/html/week48-solarized.html | 8 +++++--- doc/pub/week48/html/week48.html | 8 +++++--- doc/pub/week48/ipynb/ipynb-week48-src.tar.gz | Bin 822634 -> 822634 bytes doc/pub/week48/ipynb/week48.ipynb | 7 ++++--- doc/src/week48/week48.do.txt | 7 ++++--- 8 files changed, 28 insertions(+), 18 deletions(-) diff --git a/doc/pub/week48/html/._week48-bs008.html b/doc/pub/week48/html/._week48-bs008.html index bbab9d524..9f09ea54d 100644 --- a/doc/pub/week48/html/._week48-bs008.html +++ b/doc/pub/week48/html/._week48-bs008.html @@ -270,7 +270,7 @@ We can rewrite this (see the solutions below) in terms of a convex optimization $$ \begin{align*} &\mathrm{min}_{\lambda}\hspace{0.2cm} \frac{1}{2}\boldsymbol{\lambda}^T\boldsymbol{P}\boldsymbol{\lambda}+\boldsymbol{q}^T\boldsymbol{\lambda},\\ \nonumber - &\mathrm{subject\hspace{0.1cm}to} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. + &\mathrm{s.t} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. \end{align*} $$ diff --git a/doc/pub/week48/html/._week48-bs013.html b/doc/pub/week48/html/._week48-bs013.html index 1c2e7f207..26d698f43 100644 --- a/doc/pub/week48/html/._week48-bs013.html +++ b/doc/pub/week48/html/._week48-bs013.html @@ -274,12 +274,14 @@ $$ \end{align*} $$ -Note: we use s.t. for subject to. +Note: we use s.t. for subject to. + +

Let us show how to perform the optmization using a simple case. Assume we want to optimize the following problem $$ \begin{align*} &\mathrm{min}_{x}\hspace{0.2cm} \frac{1}{2}x^2+5x+3y \\ \nonumber - &\mathrm{subject to} \\ \nonumber + &\mathrm{s.t.} \\ \nonumber &x, y \geq 0 \\ \nonumber &x+3y \geq 15 \\ \nonumber &2x+5y \leq 100 \\ \nonumber diff --git a/doc/pub/week48/html/week48-reveal.html b/doc/pub/week48/html/week48-reveal.html index 294b51082..950ff5042 100644 --- a/doc/pub/week48/html/week48-reveal.html +++ b/doc/pub/week48/html/week48-reveal.html @@ -394,7 +394,7 @@ We can rewrite this (see the solutions below) in terms of a convex optimization $$ \begin{align*} &\mathrm{min}_{\lambda}\hspace{0.2cm} \frac{1}{2}\boldsymbol{\lambda}^T\boldsymbol{P}\boldsymbol{\lambda}+\boldsymbol{q}^T\boldsymbol{\lambda},\\ \nonumber - &\mathrm{subject\hspace{0.1cm}to} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. + &\mathrm{s.t} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. \end{align*} $$

 
@@ -710,13 +710,15 @@ $$ $$

 
-Note: we use s.t. for subject to. +Note: we use s.t. for subject to. + +

Let us show how to perform the optmization using a simple case. Assume we want to optimize the following problem

 
$$ \begin{align*} &\mathrm{min}_{x}\hspace{0.2cm} \frac{1}{2}x^2+5x+3y \\ \nonumber - &\mathrm{subject to} \\ \nonumber + &\mathrm{s.t.} \\ \nonumber &x, y \geq 0 \\ \nonumber &x+3y \geq 15 \\ \nonumber &2x+5y \leq 100 \\ \nonumber diff --git a/doc/pub/week48/html/week48-solarized.html b/doc/pub/week48/html/week48-solarized.html index 91d65d76d..731b51b68 100644 --- a/doc/pub/week48/html/week48-solarized.html +++ b/doc/pub/week48/html/week48-solarized.html @@ -429,7 +429,7 @@ We can rewrite this (see the solutions below) in terms of a convex optimization $$ \begin{align*} &\mathrm{min}_{\lambda}\hspace{0.2cm} \frac{1}{2}\boldsymbol{\lambda}^T\boldsymbol{P}\boldsymbol{\lambda}+\boldsymbol{q}^T\boldsymbol{\lambda},\\ \nonumber - &\mathrm{subject\hspace{0.1cm}to} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. + &\mathrm{s.t} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. \end{align*} $$ @@ -736,12 +736,14 @@ $$ \end{align*} $$ -Note: we use s.t. for subject to. +Note: we use s.t. for subject to. + +

Let us show how to perform the optmization using a simple case. Assume we want to optimize the following problem $$ \begin{align*} &\mathrm{min}_{x}\hspace{0.2cm} \frac{1}{2}x^2+5x+3y \\ \nonumber - &\mathrm{subject to} \\ \nonumber + &\mathrm{s.t.} \\ \nonumber &x, y \geq 0 \\ \nonumber &x+3y \geq 15 \\ \nonumber &2x+5y \leq 100 \\ \nonumber diff --git a/doc/pub/week48/html/week48.html b/doc/pub/week48/html/week48.html index 2acca5281..05b2118f1 100644 --- a/doc/pub/week48/html/week48.html +++ b/doc/pub/week48/html/week48.html @@ -434,7 +434,7 @@ We can rewrite this (see the solutions below) in terms of a convex optimization $$ \begin{align*} &\mathrm{min}_{\lambda}\hspace{0.2cm} \frac{1}{2}\boldsymbol{\lambda}^T\boldsymbol{P}\boldsymbol{\lambda}+\boldsymbol{q}^T\boldsymbol{\lambda},\\ \nonumber - &\mathrm{subject\hspace{0.1cm}to} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. + &\mathrm{s.t} \hspace{0.2cm} \boldsymbol{G}\boldsymbol{\lambda} \preceq \boldsymbol{h} \hspace{0.2cm} \wedge \boldsymbol{A}\boldsymbol{\lambda}=f. \end{align*} $$ @@ -741,12 +741,14 @@ $$ \end{align*} $$ -Note: we use s.t. for subject to. +Note: we use s.t. for subject to. + +

Let us show how to perform the optmization using a simple case. Assume we want to optimize the following problem $$ \begin{align*} &\mathrm{min}_{x}\hspace{0.2cm} \frac{1}{2}x^2+5x+3y \\ \nonumber - &\mathrm{subject to} \\ \nonumber + &\mathrm{s.t.} \\ \nonumber &x, y \geq 0 \\ \nonumber &x+3y \geq 15 \\ \nonumber &2x+5y \leq 100 \\ \nonumber diff --git a/doc/pub/week48/ipynb/ipynb-week48-src.tar.gz b/doc/pub/week48/ipynb/ipynb-week48-src.tar.gz index 5df6a25bd2d57d57545acb8fd4c683c5fc7f3d65..dd8c97e179a41807c4e2fd7a50730a9c1a6f589a 100644 GIT binary patch delta 53 zcmaDg%jnfCBR2VN4u-`4jcl!KjIC@;t!&J#Y%Hy8tgUQ75%yL#j#f6#RyM9yHtwx# HJSn{ZuO|)v delta 53 zcmaDg%jnfCBR2VN4u;BKjcl!KjIC@;t!&J#Y%Hy8tgUQ75%yL#j#f6#RyM9yHtwx# HJSn{ZvPupT diff --git a/doc/pub/week48/ipynb/week48.ipynb b/doc/pub/week48/ipynb/week48.ipynb index e0294ea2a..a5b5bdf28 100644 --- a/doc/pub/week48/ipynb/week48.ipynb +++ b/doc/pub/week48/ipynb/week48.ipynb @@ -304,7 +304,7 @@ "$$\n", "\\begin{align*}\n", " &\\mathrm{min}_{\\lambda}\\hspace{0.2cm} \\frac{1}{2}\\boldsymbol{\\lambda}^T\\boldsymbol{P}\\boldsymbol{\\lambda}+\\boldsymbol{q}^T\\boldsymbol{\\lambda},\\\\ \\nonumber\n", - " &\\mathrm{subject\\hspace{0.1cm}to} \\hspace{0.2cm} \\boldsymbol{G}\\boldsymbol{\\lambda} \\preceq \\boldsymbol{h} \\hspace{0.2cm} \\wedge \\boldsymbol{A}\\boldsymbol{\\lambda}=f.\n", + " &\\mathrm{s.t} \\hspace{0.2cm} \\boldsymbol{G}\\boldsymbol{\\lambda} \\preceq \\boldsymbol{h} \\hspace{0.2cm} \\wedge \\boldsymbol{A}\\boldsymbol{\\lambda}=f.\n", "\\end{align*}\n", "$$" ] @@ -650,7 +650,8 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Note: we use **s.t.** for subject to. \n", + "**Note**: we use **s.t.** for subject to. \n", + "\n", "Let us show how to perform the optmization using a simple case. Assume we want to optimize the following problem" ] }, @@ -661,7 +662,7 @@ "$$\n", "\\begin{align*}\n", " &\\mathrm{min}_{x}\\hspace{0.2cm} \\frac{1}{2}x^2+5x+3y \\\\ \\nonumber\n", - " &\\mathrm{subject to} \\\\ \\nonumber\n", + " &\\mathrm{s.t.} \\\\ \\nonumber\n", " &x, y \\geq 0 \\\\ \\nonumber\n", " &x+3y \\geq 15 \\\\ \\nonumber\n", " &2x+5y \\leq 100 \\\\ \\nonumber\n", diff --git a/doc/src/week48/week48.do.txt b/doc/src/week48/week48.do.txt index b56cdec44..b79d39520 100644 --- a/doc/src/week48/week48.do.txt +++ b/doc/src/week48/week48.do.txt @@ -203,7 +203,7 @@ We can rewrite this (see the solutions below) in terms of a convex optimization !bt \begin{align*} &\mathrm{min}_{\lambda}\hspace{0.2cm} \frac{1}{2}\bm{\lambda}^T\bm{P}\bm{\lambda}+\bm{q}^T\bm{\lambda},\\ \nonumber - &\mathrm{subject\hspace{0.1cm}to} \hspace{0.2cm} \bm{G}\bm{\lambda} \preceq \bm{h} \hspace{0.2cm} \wedge \bm{A}\bm{\lambda}=f. + &\mathrm{s.t} \hspace{0.2cm} \bm{G}\bm{\lambda} \preceq \bm{h} \hspace{0.2cm} \wedge \bm{A}\bm{\lambda}=f. \end{align*} !et Below we discuss how to solve these equations. Here we note that the matrix $\bm{P}$ has matrix elements $p_{ij}=y_iy_jK(\bm{x}_i,\bm{x}_j)$. @@ -490,12 +490,13 @@ We remind ourselves about the general problem we want to solve &\mathrm{s.t.} \hspace{0.2cm} \bm{G}\bm{x} \preceq \bm{h} \wedge \bm{A}\bm{x}=f. \end{align*} !et -Note: we use _s.t._ for subject to. +_Note_: we use _s.t._ for subject to. + Let us show how to perform the optmization using a simple case. Assume we want to optimize the following problem !bt \begin{align*} &\mathrm{min}_{x}\hspace{0.2cm} \frac{1}{2}x^2+5x+3y \\ \nonumber - &\mathrm{subject to} \\ \nonumber + &\mathrm{s.t.} \\ \nonumber &x, y \geq 0 \\ \nonumber &x+3y \geq 15 \\ \nonumber &2x+5y \leq 100 \\ \nonumber