Commit 741184c5 authored by Niklas Rieken's avatar Niklas Rieken

merge

parents 7d8cd45b bc2cdb35
No preview for this file type
No preview for this file type
...@@ -501,7 +501,6 @@ We first only consider the second stage, which is sufficient if setting $x_1 = \ ...@@ -501,7 +501,6 @@ We first only consider the second stage, which is sufficient if setting $x_1 = \
\tcp{Ratio test: choose best pivot row} \tcp{Ratio test: choose best pivot row}
$r \coloneq \arg\min_{i \in B} \left\{\frac{\bar{b}_i}{\bar{a}_{is}} \mid \bar{a}_{is} > 0\right\}$.\\ $r \coloneq \arg\min_{i \in B} \left\{\frac{\bar{b}_i}{\bar{a}_{is}} \mid \bar{a}_{is} > 0\right\}$.\\
\tcp{Pivoting} \tcp{Pivoting}
<<<<<<< HEAD
$B \coloneqq B \setminus \{r\} \cup \{s\}$.\\ $B \coloneqq B \setminus \{r\} \cup \{s\}$.\\
$N \coloneqq N \setminus \{s\} \cup \{r\}$.\\ $N \coloneqq N \setminus \{s\} \cup \{r\}$.\\
$a_{rj} \coloneqq \frac{a_{rj}}{a_{rs}}$ for $j \in \{1, \ldots, n+m\}$.\\ $a_{rj} \coloneqq \frac{a_{rj}}{a_{rs}}$ for $j \in \{1, \ldots, n+m\}$.\\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment