Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SWIG MATLAB fixes #929

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SWIG MATLAB fixes #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a8272f
fixed test_IO.m and test_buildblock.m by replacing func 'isequal' wit…
luciferlys Sep 7, 2021
b0bae0d
Fix recon_demo.m by replacing 'isequal' by 'eq'
luciferlys Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/matlab/recon_demo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

%% run a few iterations and plot intermediate results
s=recon.set_up(target);
if (isequal(s,stir.Succeeded(stir.Succeeded.yes)))
if (eq(s,stir.Succeeded(stir.Succeeded.yes))) % changed
figure()
hold on;
for iter=1:4
Expand Down
10 changes: 5 additions & 5 deletions src/swig/test/matlab/test_IO.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
output_format=InterfileOutputFileFormat();
output_format.write_to_file('stir_matlab_test.hv', image) ;
image2=FloatVoxelsOnCartesianGrid.read_from_file('stir_matlab_test.hv');
assert (isequal(image.get_voxel_size(),image2.get_voxel_size()))
assert (eq(image.get_voxel_size(),image2.get_voxel_size())) % isequal to eq
%assert (image.shape()==image2.shape())
%assert (get_physical_coordinates_for_bounding_box(image) == get_physical_coordinates_for_bounding_box(image2))
assert(image2(ind - image.get_min_indices() + image2.get_min_indices()) == image(ind))
Expand All @@ -47,18 +47,18 @@
projdatainfo=ProjDataInfo.ProjDataInfoCTI(s,3,6,8,6);
assert (projdatainfo.get_scanner().get_num_rings()==32)
projdata=ProjDataInterfile(examinfo, projdatainfo, 'stir_matlab_test.hs');
assert (projdata.get_min_segment_num()==-1)
assert( projdata.get_max_segment_num()==+1)
assert (projdata.get_min_segment_num()==-2)
assert (projdata.get_max_segment_num()==+2)
for seg=projdata.get_min_segment_num() : projdata.get_max_segment_num()
segment=projdatainfo.get_empty_segment_by_view(seg);
segment.fill(double(seg)+100.)
assert(isequal(projdata.set_segment(segment),Succeeded(Succeeded.yes)))
assert(eq(projdata.set_segment(segment),Succeeded(Succeeded.yes)))
end
% now delete object such that the file gets closed and we can read it
delete( projdata)

projdata2=ProjData.read_from_file('stir_matlab_test.hs');
assert (isequal(projdatainfo,projdata2.get_proj_data_info()))
assert (eq(projdatainfo,projdata2.get_proj_data_info()))
for seg=projdatainfo.get_min_segment_num() : projdatainfo.get_max_segment_num()
% construct same segment data as above (TODO: better to stick it into a list or so)
segment=projdatainfo.get_empty_segment_by_view(seg);
Expand Down
5 changes: 3 additions & 2 deletions src/swig/test/matlab/test_buildblock.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
assert( sinogram.get_segment_num()==2)
assert( sinogram.get_axial_pos_num()==1)
assert( sinogram.get_num_views() == projdatainfo.get_num_views())
assert( isequal(sinogram.get_proj_data_info(), projdatainfo))
assert(eq(sinogram.get_proj_data_info(), projdatainfo)) % change isequal to eq
% create some empty objects
segment=projdatainfo.get_empty_segment_by_view(0);
assert(segment.find_max()==0)
Expand All @@ -175,6 +175,7 @@
assert(seg.find_min()==0);
seg.fill(4);
assert(seg.find_min()==4);
assert(isequal(proj_data.set_segment(seg), success));
assert(eq(proj_data.set_segment(seg), success)); % change isequal to eq
seg_temp = proj_data.set_segment(seg);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the purpose of this line addition change.

seg2=proj_data.get_segment_by_sinogram(0);
assert(isequal(seg2.to_matlab(), seg.to_matlab()));