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
7af0eca0
Commit
7af0eca0
authored
Mar 29, 2017
by
alexander.dornheim
Browse files
Switched off noise for testing
Fixed bug in RAAR
parent
0d5fd7ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
proxtoolbox/Algorithms/RAAR.py
View file @
7af0eca0
...
...
@@ -90,7 +90,7 @@ class RAAR(Algorithm):
elif
self
.
Nz
==
1
:
for
j
in
range
(
self
.
dim
):
tmp_change
+=
(
norm
(
u
[:,:,
j
]
-
tmp_u
[:,:,
j
],
'fro'
)
/
normM
)
**
2
;
tmp_gap
+=
(
norm
(
tmp3
[:,:,
j
]
-
tmp2
[:,:,
j
])
/
normM
,
'fro'
)
**
2
;
tmp_gap
+=
(
norm
(
tmp3
[:,:,
j
]
-
tmp2
[:,:,
j
]
,
'fro'
)
/
normM
)
**
2
;
else
:
for
j
in
range
(
self
.
dim
):
for
k
in
range
(
self
.
Nz
):
...
...
proxtoolbox/Problems/Phase/JWST_in.py
View file @
7af0eca0
...
...
@@ -60,7 +60,7 @@ new_config = {
# What are the noise characteristics (Poisson or Gaussian or none)?
'noise'
:
'
Poiss
on'
,
#'Poisson',
'noise'
:
'
n
on
e
'
,
#'Poisson',
#==========================================
# Algorithm parameters
...
...
proxtoolbox/Problems/Phase/phase.py
View file @
7af0eca0
...
...
@@ -154,7 +154,6 @@ class Phase(Problem):
end
;
else
:
#i.e. formulation=='product space'
proj1
=
self
.
config
[
'proxoperators'
][
0
](
self
.
config
)
print
(
proj1
);
u_1
=
proj1
.
work
(
self
.
config
[
'u_0'
]);
proj2
=
self
.
config
[
'proxoperators'
][
1
](
self
.
config
)
u_2
=
proj2
.
work
(
u_1
);
...
...
@@ -180,8 +179,6 @@ class Phase(Problem):
# magnitude of the metric
self
.
config
[
'TOL2'
]
=
self
.
config
[
'data_ball'
]
*
1e-15
;
print
(
self
.
config
);
self
.
algorithm
=
getattr
(
Algorithms
,
self
.
config
[
'algorithm'
])(
self
.
config
);
...
...
proxtoolbox/ProxOperators/proxoperators.py
View file @
7af0eca0
...
...
@@ -315,6 +315,5 @@ class P_amp(ProxOperator):
self
.
amplitude
=
config
[
'amplitude'
];
def
work
(
self
,
u
):
print
(
"1"
);
return
magproj
(
u
,
self
.
amplitude
);
#argument order changed compared to matlab implementation!!!
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