Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nam
ProxPython
Commits
4b71000c
Commit
4b71000c
authored
Dec 10, 2019
by
markus.meier01
Browse files
Fixed dimension error in phase.py
parent
e5112f74
Changes
1
Hide whitespace changes
Inline
Side-by-side
proxtoolbox/ProxOperators/proxoperators.py
View file @
4b71000c
...
...
@@ -127,17 +127,19 @@ class P_diag(ProxOperator):
m
=
self
.
m
;
p
=
self
.
p
;
K
=
self
.
K
;
print
(
u
.
shape
)
if
m
==
1
:
tmp
=
sum
(
u
,
axis
=
0
,
dtype
=
u
.
dtype
)
elif
n
==
1
:
tmp
=
sum
(
u
,
axis
=
1
,
dtype
=
u
.
dtype
)
elif
p
==
1
:
tmp
=
zeros
((
n
,
m
),
dtype
=
u
.
dtype
)
tmp
=
zeros
((
m
,
n
),
dtype
=
u
.
dtype
)
for
k
in
range
(
K
):
tmp
+=
u
[:,
:,
k
]
print
(
tmp
)
else
:
tmp
=
zeros
((
n
,
m
,
p
),
dtype
=
u
.
dtype
)
tmp
=
zeros
((
m
,
n
,
p
),
dtype
=
u
.
dtype
)
for
k
in
range
(
K
):
tmp
+=
u
[:,
:,
:,
k
]
...
...
@@ -148,9 +150,10 @@ class P_diag(ProxOperator):
elif
n
==
1
:
return
tmp
.
reshape
(
tmp
.
size
,
1
)
@
ones
((
1
,
K
),
dtype
=
u
.
dtype
)
elif
p
==
1
:
u_diag
=
empty
((
n
,
m
,
K
),
dtype
=
u
.
dtype
)
u_diag
=
empty
((
m
,
n
,
K
),
dtype
=
u
.
dtype
)
for
k
in
range
(
K
):
u_diag
[:,
:,
k
]
=
tmp
print
(
u_diag
.
shape
)
return
u_diag
else
:
u_diag
=
empty
((
n
,
m
,
p
,
K
),
dtype
=
u
.
dtype
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment