Skip to content

Commit 5ec9c78

Browse files
committed
bug: small fixes
1 parent 29f5847 commit 5ec9c78

3 files changed

Lines changed: 7 additions & 11 deletions

File tree

pylops/optimization/basic.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ def cgls(
155155
Equal to ``r1norm`` if :math:`\epsilon=0`
156156
cost : :obj:`numpy.ndarray`, optional
157157
History of r1norm through iterations
158-
preallocate : :obj:`bool`, optional
159-
.. versionadded:: 2.5.0
160-
161-
Pre-allocate all variables used by the solver
162158
163159
Notes
164160
-----

pylops/optimization/cls_basic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -922,22 +922,22 @@ def setup(
922922
self.u = y.copy()
923923
else:
924924
x = x0.copy()
925-
if self.preallocate:
925+
if not self.preallocate:
926926
self.u = self.y - self.Op.matvec(x0)
927927
else:
928928
self.u = self.ncp.empty_like(self.y)
929929
self.ncp.subtract(self.y, self.Op.matvec(x0), out=self.u)
930930
self.alfa = 0.0
931931
self.beta = self.ncp.linalg.norm(self.u)
932932
if self.beta > 0.0:
933-
if self.preallocate:
933+
if not self.preallocate:
934934
self.u = self.u / self.beta
935935
else:
936936
self.ncp.divide(self.u, self.beta, out=self.u)
937937
self.v = self.Op.rmatvec(self.u)
938938
self.alfa = self.ncp.linalg.norm(self.v)
939939
if self.alfa > 0:
940-
if self.preallocate:
940+
if not self.preallocate:
941941
self.v = self.v / self.alfa
942942
else:
943943
self.ncp.divide(self.v, self.alfa, out=self.v)

pylops/optimization/cls_sparsity.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,10 @@ def _step_data(self, x: NDArray, engine: str = "scipy", **kwargs_solver) -> NDAr
475475
)[0]
476476
else:
477477
# other iterations (weighted least-squares)
478-
if not self.preallocate and self.iiter == 1:
478+
if self.preallocate and self.iiter == 1:
479479
self.rw = self.ncp.zeros_like(self.y)
480480

481-
if self.preallocate:
481+
if not self.preallocate:
482482
if self.threshR:
483483
self.rw = 1.0 / self.ncp.maximum(self.ncp.abs(self.r), self.epsR)
484484
else:
@@ -538,9 +538,9 @@ def _step_model(
538538
)
539539
else:
540540
# other iterations (weighted least-squares)
541-
if not self.preallocate and self.iiter == 1:
541+
if self.preallocate and self.iiter == 1:
542542
self.rw = self.ncp.zeros_like(x)
543-
if self.preallocate:
543+
if not self.preallocate:
544544
self.rw = self.ncp.abs(x)
545545
self.rw = self.rw / self.rw.max()
546546
else:

0 commit comments

Comments
 (0)