From 5daf82f477fc1b1a6b1b1ea7dd36264cac0b3397 Mon Sep 17 00:00:00 2001
From: mrava87 <matteoravasi@gmail.com>
Date: Thu, 8 Apr 2021 08:47:09 +0300
Subject: [PATCH 1/2] Fix pipelines to run on main

---
 .github/workflows/build.yaml | 2 +-
 azure-pipelines.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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:

From 97fabfac1951a7e5660e404b11f0d0ce80ce633f Mon Sep 17 00:00:00 2001
From: mrava87 <matteoravasi@gmail.com>
Date: Thu, 8 Apr 2021 08:49:17 +0300
Subject: [PATCH 2/2] Fix typos in L1 proximal docstring

---
 pyproximal/proximal/L1.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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}