Skip to content

Commit

Permalink
Merge pull request #12 from mrava87/main
Browse files Browse the repository at this point in the history
Fix typos in L1 proximal docstring
  • Loading branch information
mrava87 authored Apr 8, 2021
2 parents c2f324d + 97fabfa commit fdb2a28
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: PyProx

on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
trigger:
branches:
include:
- master
- main
- refs/tags/*

jobs:
Expand Down
6 changes: 3 additions & 3 deletions pyproximal/proximal/L1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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*.
Expand All @@ -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}
Expand Down

0 comments on commit fdb2a28

Please sign in to comment.