diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 99fdcad..49cb74d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,6 @@ name: PyProx -on: [push] +on: [push, pull_request] jobs: build: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ec06270..3df5738 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,7 @@ trigger: branches: include: - - master + - main - refs/tags/* jobs: diff --git a/pyproximal/proximal/L1.py b/pyproximal/proximal/L1.py index dafebea..6e0a869 100644 --- a/pyproximal/proximal/L1.py +++ b/pyproximal/proximal/L1.py @@ -57,9 +57,9 @@ class L1(ProxOperator): prox_{\tau \sigma ||.||_1}(\mathbf{x}) = soft(\mathbf{x}, \tau \sigma) = \begin{cases} - x_i - \tau \sigma, & x_i - g_i < -\tau \sigma \\ + x_i + \tau \sigma, & x_i - g_i < -\tau \sigma \\ g_i, & -\sigma \leq x_i - g_i \leq \tau\sigma \\ - x_i + \tau\sigma, & x_i - g_i > \tau\sigma\\ + x_i - \tau\sigma, & x_i - g_i > \tau\sigma\\ \end{cases} where ``soft`` is the so-called called *soft thresholding*. @@ -73,7 +73,7 @@ class L1(ProxOperator): prox^*_{\tau \sigma ||.||_1}(\mathbf{x}) = P_{||.||_\inf <=\sigma} = \begin{cases} -\sigma, & x_i < -\sigma \\ - x_i,& -\sigma \leq x \leq \sigma \\ + x_i,& -\sigma \leq x_i \leq \sigma \\ \sigma, & x_i > \sigma\\ \end{cases}