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
irp
HoloTomoToolbox
Commits
bca53aa6
Commit
bca53aa6
authored
Jan 12, 2022
by
p.jhagema
Browse files
iterativel phase retrieval: changed default error value to inf
parent
845fbaaa
Pipeline
#265403
passed with stage
in 51 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
functions/phaseRetrieval/iterative/PMinMaxAmplitude.m
View file @
bca53aa6
...
...
@@ -75,7 +75,7 @@ methods
function
[
x
,
residual
]
=
eval
(
obj
,
x
,
~
)
% This projector does not compute any residuals
residual
=
0
;
residual
=
Inf
;
% Special case 1: no minimum- or maximum-constraints are imposed, evaluation is trivial
if
obj
.
settings
.
maxAmplitude
==
inf
&&
obj
.
settings
.
minAmplitude
<=
0
...
...
functions/phaseRetrieval/iterative/PMinMaxPhase.m
View file @
bca53aa6
...
...
@@ -80,7 +80,7 @@ methods
function
[
x
,
residual
]
=
eval
(
obj
,
x
,
~
)
% This projector does not compute any residuals
residual
=
0
;
residual
=
Inf
;
% If no minimum- or maximum-constraints are imposed, evaluation is trivial
if
obj
.
settings
.
maxPhase
==
inf
&&
obj
.
settings
.
minPhase
==
-
inf
...
...
functions/phaseRetrieval/iterative/PSupport.m
View file @
bca53aa6
...
...
@@ -55,7 +55,7 @@ classdef PSupport < Projector
function
[
x
,
error
]
=
eval
(
obj
,
x
,
~
)
x
=
x
.*
obj
.
supp
+
obj
.
valueOutsideSupp
.*
(
1
-
obj
.
supp
);
error
=
0
;
error
=
Inf
;
end
end
% methods
end
...
...
functions/phaseRetrieval/iterative/ProjectorComposition.m
View file @
bca53aa6
...
...
@@ -17,8 +17,11 @@ classdef ProjectorComposition < Projector
end
%end constructor
function
[
result
,
error
]
=
eval
(
obj
,
x
,
itNum
)
result
=
obj
.
proj2
.
eval
(
obj
.
proj1
.
eval
(
x
,
itNum
),
itNum
);
error
=
0
;
[
result
,
err1
]
=
obj
.
proj1
.
eval
(
x
,
itNum
);
[
result
,
err2
]
=
obj
.
proj2
.
eval
(
result
,
itNum
);
% The default value for errors should be Inf, so we avoid
% accidential triggering of the abortion automatic.
error
=
min
(
err1
,
err2
);
end
end
...
...
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