From 133854fcf1f3383340a2ea47bd80ccfcc1742884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Genz?= Date: Tue, 26 Sep 2017 22:55:33 +0200 Subject: [PATCH] fix minor spelling mistakes; change character encoding from CP1252 and ISO-8859-15 to UTF-8 --- README.md | 22 +++++++------- external/combn.m | 2 +- external/cprintf.m | 30 +++++++++---------- external/exactgeodesic/readme.txt | 6 ++-- external/hex2rgb.m | 2 +- external/matlabPyrTools/MEX/corrDn.c | 6 ++-- external/matlabPyrTools/MEX/histo.c | 2 +- external/matlabPyrTools/MEX/pointOp.c | 2 +- external/matlabPyrTools/MEX/range2.c | 2 +- external/matlabPyrTools/MEX/upConv.c | 6 ++-- external/matlabPyrTools/README | 12 ++++---- external/matlabPyrTools/TUTORIALS/README | 6 ++-- external/matlabPyrTools/reconSCFpyr.m | 4 +-- external/myaa.m | 6 ++-- external/patcht.m | 2 +- external/preserve_history.m | 2 +- external/progressbar.m | 2 +- external/read_ply.m | 2 +- external/tabcomplete.m | 20 ++++++------- .../callback_active_contour.m | 4 +-- .../toolbox_fast_marching/compute_alpha_map.m | 4 +-- .../compute_bending_invariant.m | 4 +-- .../compute_distance_landmark.m | 2 +- .../compute_eccentricity_transform.m | 4 +-- .../compute_edge_energy.m | 4 +-- .../toolbox_fast_marching/compute_geodesic.m | 8 ++--- .../compute_geodesic_mesh.m | 2 +- .../compute_heuristic_landmark.m | 2 +- .../compute_levelset_shape.m | 2 +- .../compute_saddle_points.m | 2 +- .../compute_shape_boundary.m | 4 +-- .../compute_voronoi_triangulation.m | 2 +- .../compute_voronoi_triangulation_mesh.m | 2 +- external/toolbox_fast_marching/content.m | 4 +-- .../convert_distance_color.m | 4 +-- .../display_eccentricity.m | 2 +- .../display_segmentation.m | 4 +-- external/toolbox_fast_marching/divgrad.m | 4 +-- .../generate_constrained_map.m | 2 +- .../toolbox_fast_marching/html/content.html | 12 ++++---- .../toolbox_fast_marching/html/gpeyre.xsl | 2 +- external/toolbox_fast_marching/license.txt | 2 +- .../load_potential_map.m | 2 +- .../mex/gw/gw_core/GW_Config.h | 2 +- .../mex/gw/gw_core/GW_PolygonIntersector.h | 2 +- .../mex/gw/gw_maths/GW_MathsConfig.h | 2 +- .../mex/gw/gw_maths/GW_Matrix2x2.h | 2 +- .../mex/gw/gw_maths/GW_Matrix3x3.h | 2 +- .../mex/gw/gw_maths/GW_Matrix4x4.h | 2 +- .../mex/gw/gw_maths/GW_MatrixStatic.h | 2 +- .../mex/gw/gw_maths/GW_Quaternion.h | 2 +- .../mex/gw/gw_maths/GW_Vector4D.h | 2 +- .../mex/perform_front_propagation_2d.cpp | 4 +-- .../toolbox_fast_marching/mex/skeleton.cpp | 6 ++-- .../perform_active_contour.m | 4 +-- .../perform_circular_fast_marching_2d.m | 4 +-- .../perform_farthest_landmark_sampling.m | 2 +- .../perform_farthest_point_sampling.m | 4 +-- ...perform_farthest_point_sampling_boundary.m | 2 +- .../perform_farthest_point_sampling_mesh.m | 4 +-- .../perform_fast_marching.m | 6 ++-- .../perform_fast_marching_mesh.m | 4 +-- .../perform_fast_marching_old.m | 4 +-- .../toolbox_fast_marching/perform_fmstar_2d.m | 2 +- .../toolbox_fast_marching/perform_fmstar_3d.m | 2 +- .../perform_front_propagation_2d.m | 2 +- .../perform_front_propagation_2d_slow.m | 4 +-- .../perform_geodesic_interpolation.m | 4 +-- .../perform_lloyd_mesh.m | 4 +-- .../perform_redistancing.m | 4 +-- external/toolbox_fast_marching/pick_curves.m | 4 +-- .../pick_start_end_point.m | 2 +- .../plot_constrained_path_planing.m | 10 +++---- .../plot_fast_marching_2d.m | 2 +- .../plot_fast_marching_3d.m | 2 +- .../plot_fast_marching_mesh.m | 4 +-- .../plot_volumetric_data.m | 2 +- external/toolbox_fast_marching/publish_html.m | 2 +- external/toolbox_fast_marching/readme | 6 ++-- .../tests/test_active_contour.m | 4 +-- .../tests/test_circular.m | 2 +- .../tests/test_circular_fast_marching_2d.m | 2 +- .../tests/test_circular_prior.m | 2 +- .../tests/test_fast_marching_2d.m | 2 +- .../tests/test_fast_marching_3d.m | 2 +- .../tests/test_fmstar_2d.m | 2 +- .../tests/test_fmstar_3d.m | 2 +- .../tests/test_fmstar_error.m | 2 +- .../tests/test_fmstar_landmark.m | 2 +- .../tests/test_fmstar_path_planing.m | 6 ++-- .../tests/test_fmstar_weight_2d.m | 2 +- .../tests/test_multiple_paths_2d.m | 2 +- .../tests/test_path_planing.m | 4 +-- .../tests/test_propagation_2d.m | 4 +-- .../tests/test_propagation_mesh.m | 2 +- .../tests/test_segmentation.m | 2 +- .../toolbox/check_face_vertex.m | 2 +- .../toolbox_fast_marching/toolbox/clamp.m | 2 +- .../toolbox/compute_cuvilinear_abscice.m | 2 +- .../toolbox/compute_distance_to_points.m | 2 +- .../toolbox/compute_edge_face_ring.m | 2 +- .../toolbox/compute_edges.m | 2 +- .../toolbox/compute_gaussian_filter.m | 8 ++--- .../toolbox/compute_grad.m | 2 +- .../toolbox/compute_vertex_ring.m | 4 +-- external/toolbox_fast_marching/toolbox/crop.m | 4 +-- .../toolbox/getoptions.m | 4 +-- .../toolbox_fast_marching/toolbox/imageplot.m | 6 ++-- .../toolbox/load_image.m | 8 ++--- external/toolbox_fast_marching/toolbox/mmax.m | 2 +- .../toolbox_fast_marching/toolbox/nb_dims.m | 2 +- .../toolbox/num2string_fixeddigit.m | 2 +- .../toolbox/perform_blurring.m | 4 +-- .../toolbox/perform_conjugate_gradient.m | 4 +-- .../toolbox/perform_convolution.m | 2 +- .../toolbox/perform_curve_resampling.m | 2 +- .../toolbox/perform_histogram_equalization.m | 4 +-- .../toolbox/perform_image_resize.m | 2 +- .../toolbox/perform_tensor_recomp.m | 2 +- .../toolbox/perform_vf_normalization.m | 2 +- .../toolbox_fast_marching/toolbox/plot_mesh.m | 4 +-- .../toolbox/prod_vf_sf.m | 2 +- .../toolbox/progressbar.m | 4 +-- .../toolbox_fast_marching/toolbox/read_mesh.m | 4 +-- .../toolbox_fast_marching/toolbox/read_off.m | 2 +- .../toolbox_fast_marching/toolbox/rescale.m | 2 +- .../toolbox/triangulation2adjacency.m | 2 +- .../toolbox_fast_marching.m | 4 +-- external/write_ply.m | 2 +- matrix/admm.m | 2 +- matrix/affine_null_space.m | 2 +- matrix/quadprog_box.m | 4 +-- matrix/sparse_eigs.m | 12 ++++---- mesh/apply_ambient_occlusion.m | 2 +- mesh/connectedComponent.m | 2 +- mesh/connectedComponentV.m | 2 +- mesh/flip_edges.m | 4 +-- mesh/is_boundary_facet.m | 2 +- mesh/laplacian_editing_system.m | 2 +- mesh/linear_elasticity.m | 2 +- mesh/loop.m | 2 +- mesh/readWRL.m | 2 +- mesh/slice_triangles.m | 2 +- mesh/split_edges.m | 2 +- mesh/stiff_points_lbs.m | 4 +-- mesh/surface_graph.m | 2 +- mesh/total_signed_curvature.m | 2 +- mesh/triangles_from_edges.m | 2 +- mesh/tt.m | 2 +- mesh/upsample.m | 2 +- mex/ambient_occlusion.cpp | 6 ++-- mex/fit_rotations_mex.cpp | 2 +- mex/intersect_other.cpp | 2 +- mex/point_mesh_squared_distance.cpp | 2 +- mex/reorient_facets.cpp | 2 +- mex/selfintersect.cpp | 2 +- mex/solid_angle.cpp | 2 +- utility/finish.m | 4 +-- 158 files changed, 282 insertions(+), 282 deletions(-) diff --git a/README.md b/README.md index 21000aff..815db28f 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ gptoolbox - Geometry Processing Toolbox -This is a toolbox of useful matlab functions for geometry processing. There are -also tools related to constrainted optimization and image processing. Typically +This is a toolbox of useful MATLAB functions for geometry processing. There are +also tools related to constrained optimization and image processing. Typically these are utility functions that are not stand alone applications. -Here's an incomplete list of cool features this matlab toolbox contains: +Here's an incomplete list of cool features this MATLAB toolbox contains: - wrappers for TetGen, Triangle, QSlim, meshfix - mesh smoothing @@ -29,7 +29,7 @@ Here's an incomplete list of cool features this matlab toolbox contains: - constructive solid geometry operations on meshes, booleans - accelerated point location in triangle and tetrahedral meshes - image dithering -- deep matlab function dependency +- deep MATLAB function dependency The functions have been organized into folders based on their primary application: @@ -45,7 +45,7 @@ application: ## Installation ## The vast majority of this code is __straight MATLAB__ (`*.m` files). Thus, only -installing MATLAB and adding the qptoolbox directory and its subdirectories to +installing MATLAB and adding the gptoolbox directory and its subdirectories to your MATLAB path is needed for installation. Let's assume you cloned gptoolbox at `/usr/local/gptoolbox/`, then you could issue: @@ -64,18 +64,18 @@ respective `mex/README.md` file. This strives to be full installation instructions, but will no doubt remain incomplete for some time. Begin by adding paths as above. -As stated above, most files are straight matlab and will _just run_ if you have +As stated above, most files are straight MATLAB and will _just run_ if you have gptoolbox in your path. #### Compile `/mex` #### Most of our mex files will depend on -[libigl](https://github.com/libigl/libigl). The following will assume your -usign a "standard" unix-y install of libigl as a static library. +[libigl](https://github.com/libigl/libigl). The following will assume you are +using a "standard" unix-y install of libigl as a static library. In MATLAB issue: cd mex - compile_qptoolbox_mex + compile_gptoolbox_mex #### Compile `toolbox_fast_marching` #### @@ -120,8 +120,8 @@ We will probably switch to a MPL2 license in the near future. The Geometry Processing Toolbox grew out of Alec Jacobson's private codebase during his PhD, but has benefited a lot from various collaborators at NYU and ETH Zurich. Now, the Geometry Processing Toolbox is a group endeavour. If -you're intersted in contributing, please contact Alec Jacobson -(alecjacobson@gmail.com) or submit a pull request on github. +you're interested in contributing, please contact Alec Jacobson +(alecjacobson@gmail.com) or submit a pull request on GitHub. ## Documentation ## For now, documentation is limited to a per-function basis. For example, to find diff --git a/external/combn.m b/external/combn.m index ae929266..3a63f4a9 100644 --- a/external/combn.m +++ b/external/combn.m @@ -26,7 +26,7 @@ % See also PERMS, NCHOOSEK % and COMBNSUB, ALLCOMB, and PERMPOS on the File Exchange -% tested in Matlab R13, R14, 2010b +% tested in MATLAB R13, R14, 2010b % version 4.3 (apr 2013) % (c) Jos van der Geest % email: jos@jasen.nl diff --git a/external/cprintf.m b/external/cprintf.m index 868f34e1..4ab5635d 100644 --- a/external/cprintf.m +++ b/external/cprintf.m @@ -10,7 +10,7 @@ % % CPRINTF then displays the text in the Command Window using the % specified STYLE argument. The accepted styles are those used for -% Matlab's syntax highlighting (see: File / Preferences / Colors / +% MATLAB's syntax highlighting (see: File / Preferences / Colors / % M-file Syntax Highlighting Colors), and also user-defined colors. % % The possible pre-defined STYLE names are: @@ -33,11 +33,11 @@ % STYLE beginning with '*' will be bold (R2011b+ only). For example: % '*Blue' is bold blue; % '*Comments' is bold green etc. -% Note: Matlab does not currently support both bold and underline, +% Note: MATLAB does not currently support both bold and underline, % only one of them can be used in a single cprintf command. But of % course bold and underline can be mixed by using separate commands. % -% STYLE also accepts a regular Matlab RGB vector, that can be underlined +% STYLE also accepts a regular MATLAB RGB vector, that can be underlined % and bolded: -[0,1,1] means underlined cyan, '*[1,0,0]' is bold red. % % STYLE is case-insensitive and accepts unique partial strings just @@ -63,8 +63,8 @@ % Please send to Yair Altman (altmany at gmail dot com) % % Warning: -% This code heavily relies on undocumented and unsupported Matlab -% functionality. It works on Matlab 7+, but use at your own risk! +% This code heavily relies on undocumented and unsupported MATLAB +% functionality. It works on MATLAB 7+, but use at your own risk! % % A technical description of the implementation can be found at: % http://UndocumentedMatlab.com/blog/cprintf/ @@ -75,7 +75,7 @@ % % 2. In R2011a and earlier, consecutive differently-colored multi-line % CPRINTFs sometimes display incorrectly on the bottom line. -% As far as I could tell this is due to a Matlab bug. Examples: +% As far as I could tell this is due to a MATLAB bug. Examples: % >> cprintf('-str','under\nline'); cprintf('err','red\n'); % hidden 'red', unhidden '_' % >> cprintf('str','regu\nlar'); cprintf('err','red\n'); % underline red (not purple) 'lar' % @@ -88,7 +88,7 @@ % the last character of an underlined segment is not underlined for % some unknown reason (add an extra space character to make it look better) % -% 5. In old Matlab versions (e.g., Matlab 7.1 R14), multi-line styles +% 5. In old MATLAB versions (e.g., MATLAB 7.1 R14), multi-line styles % only affect the first line. Single-line styles work as expected. % R14 also appends a single space after underlined segments. % @@ -102,7 +102,7 @@ % 2011-03-04: Performance improvement % 2010-06-27: Fix for R2010a/b; fixed edge case reported by Sharron; CPRINTF with no args runs the demo % 2009-09-28: Fixed edge-case problem reported by Swagat K -% 2009-05-28: corrected nargout behavior sugegsted by Andreas Gäb +% 2009-05-28: corrected nargout behavior sugegsted by Andreas Gäb % 2009-05-13: First version posted on MathWorks File Exchange % % See also: @@ -142,7 +142,7 @@ % In compiled mode try useDesktop = usejava('desktop'); catch, useDesktop = false; end - if isdeployed | ~useDesktop %#ok - for Matlab 6 compatibility + if isdeployed | ~useDesktop %#ok - for MATLAB 6 compatibility % do not display any formatting - use simple fprintf() % See: http://undocumentedmatlab.com/blog/bold-color-text-in-the-command-window/#comment-103035 % Also see: https://mail.google.com/mail/u/0/?ui=2&shva=1#all/1390a26e7ef4aa4d @@ -157,7 +157,7 @@ if underlineFlag format = ['' format '']; - % Matlab 7.1 R14 (possibly a few newer versions as well?) + % MATLAB 7.1 R14 (possibly a few newer versions as well?) % have a bug in rendering consecutive hyperlinks % This is fixed by appending a single non-linked space if majorVersion < 7 || (majorVersion==7 && minorVersion <= 1) @@ -213,7 +213,7 @@ if majorVersion<7 || (majorVersion==7 && minorVersion<13) if bolFlag && ~underlineFlag % Set the leading hyperlink space character ('_') to the bg color, effectively hiding it - % Note: old Matlab versions have a bug in hyperlinks that need to be accounted for... + % Note: old MATLAB versions have a bug in hyperlinks that need to be accounted for... %disp(' '); dumpElement(docElement) setElementStyle(docElement,'CW_BG_Color',1+underlineFlag,majorVersion,minorVersion); %+getUrlsFix(docElement)); %disp(' '); dumpElement(docElement) @@ -277,7 +277,7 @@ style = style(~boldIdx); end if underlineFlag && boldFlag - warning('YMA:cprintf:BoldUnderline','Matlab does not support both bold & underline') + warning('YMA:cprintf:BoldUnderline','MATLAB does not support both bold & underline') end % Check if the remaining style sting is a numeric vector @@ -288,7 +288,7 @@ end end - % Style = valid matlab RGB vector + % Style = valid MATLAB RGB vector if isnumeric(style) && length(style)==3 && all(style<=1) && all(abs(style)>=0) if any(style<0) underlineFlag = 1; @@ -336,14 +336,14 @@ end end -% Convert a Matlab RGB vector into a known style name (e.g., '[255,37,0]') +% Convert a MATLAB RGB vector into a known style name (e.g., '[255,37,0]') function styleName = getColorStyle(rgb) intColor = int32(rgb*255); javaColor = java.awt.Color(intColor(1), intColor(2), intColor(3)); styleName = sprintf('[%d,%d,%d]',intColor); com.mathworks.services.Prefs.setColorPref(styleName,javaColor); -% Fix a bug in some Matlab versions, where the number of URL segments +% Fix a bug in some MATLAB versions, where the number of URL segments % is larger than the number of style segments in a doc element function delta = getUrlsFix(docElement) %#ok currently unused tokens = docElement.getAttribute('SyntaxTokens'); diff --git a/external/exactgeodesic/readme.txt b/external/exactgeodesic/readme.txt index 837746fa..20dee877 100644 --- a/external/exactgeodesic/readme.txt +++ b/external/exactgeodesic/readme.txt @@ -11,7 +11,7 @@ The nice property of the subdivision algorithm is that it becomes Dijkstra when The input mesh is represented as two arrays: vertices (each vertex has tree coordinates) and faces (each face is represented as indices of its vertices). Most of the communication with the algorithms is done through SurfacePoints (points on the surface of the mesh; they have three coordinates and a pointer to a mesh element they belong). -The algorithms are available as C++ code (downloadable at http://code.google.com/p/geodesic/) and Matlab toolbox (downloadable at MathWorks File Exchange). +The algorithms are available as C++ code (downloadable at http://code.google.com/p/geodesic/) and MATLAB toolbox (downloadable at MathWorks File Exchange). C++ NOTES The base class of for all algorithms is GeodesicAlgorithmBase (defined in geodesic_algorithm_base.h). The most important functions defined in this class are @@ -49,5 +49,5 @@ Danil Kirsanov, 01/2008 CHANGES ON 03/03/08 -- fixed libpointer conflict with matlab 2007b -- fixed cellfun error with earlier versions of matlab \ No newline at end of file +- fixed libpointer conflict with MATLAB 2007b +- fixed cellfun error with earlier versions of MATLAB diff --git a/external/hex2rgb.m b/external/hex2rgb.m index 353250cf..65973b53 100644 --- a/external/hex2rgb.m +++ b/external/hex2rgb.m @@ -28,7 +28,7 @@ % % See also HEX2DEC -% Created in Matlab R2011b +% Created in MATLAB R2011b % version 1.0 (feb 2014) % (c) Jos van der Geest % email: jos@jasen.nl diff --git a/external/matlabPyrTools/MEX/corrDn.c b/external/matlabPyrTools/MEX/corrDn.c index d02e272f..3206a57c 100755 --- a/external/matlabPyrTools/MEX/corrDn.c +++ b/external/matlabPyrTools/MEX/corrDn.c @@ -1,12 +1,12 @@ /* RES = corrDn(IM, FILT, EDGES, STEP, START, STOP); >>> See corrDn.m for documentation <<< - This is a matlab interface to the internal_reduce function. + This is a MATLAB interface to the internal_reduce function. EPS, 7/96. */ #define V4_COMPAT -#include /* Matlab matrices */ +#include /* MATLAB matrices */ #include #include "convolve.h" @@ -89,7 +89,7 @@ void mexFunction(int nlhs, /* Num return vals on lhs */ (y_start<1) || (y_start>y_idim)) mexErrMsgTxt("START values must lie between 1 and the image dimensions."); } - x_start--; /* convert from Matlab to standard C indexes */ + x_start--; /* convert from MATLAB to standard C indexes */ y_start--; /* ARG 6 (optional): STOP */ diff --git a/external/matlabPyrTools/MEX/histo.c b/external/matlabPyrTools/MEX/histo.c index 81e7784a..96526f31 100755 --- a/external/matlabPyrTools/MEX/histo.c +++ b/external/matlabPyrTools/MEX/histo.c @@ -5,7 +5,7 @@ */ #define V4_COMPAT -#include /* Matlab matrices */ +#include /* MATLAB matrices */ #include #include /* NULL */ diff --git a/external/matlabPyrTools/MEX/pointOp.c b/external/matlabPyrTools/MEX/pointOp.c index 3623a022..bb257149 100755 --- a/external/matlabPyrTools/MEX/pointOp.c +++ b/external/matlabPyrTools/MEX/pointOp.c @@ -5,7 +5,7 @@ RES = pointOp(IM, LUT, ORIGIN, INCREMENT, WARNINGS) */ #define V4_COMPAT -#include /* Matlab matrices */ +#include /* MATLAB matrices */ #include #include /* NULL */ diff --git a/external/matlabPyrTools/MEX/range2.c b/external/matlabPyrTools/MEX/range2.c index db0c2045..443eed75 100755 --- a/external/matlabPyrTools/MEX/range2.c +++ b/external/matlabPyrTools/MEX/range2.c @@ -5,7 +5,7 @@ */ #define V4_COMPAT -#include /* Matlab matrices */ +#include /* MATLAB matrices */ #include #include /* NULL */ diff --git a/external/matlabPyrTools/MEX/upConv.c b/external/matlabPyrTools/MEX/upConv.c index 98a2bec4..e19ed338 100755 --- a/external/matlabPyrTools/MEX/upConv.c +++ b/external/matlabPyrTools/MEX/upConv.c @@ -1,12 +1,12 @@ /* RES = upConv(IM, FILT, EDGES, STEP, START, STOP, RES); >>> See upConv.m for documentation <<< - This is a matlab interface to the internal_expand function. + This is a MATLAB interface to the internal_expand function. EPS, 7/96. */ #define V4_COMPAT -#include /* Matlab matrices */ +#include /* MATLAB matrices */ #include #include "convolve.h" @@ -109,7 +109,7 @@ void mexFunction(int nlhs, /* Num return vals on lhs */ arg6 = prhs[6]; if notDblMtx(arg6) mexErrMsgTxt("RES arg must be double float matrix."); - /* 7/10/97: Returning one of the args causes problems with Matlab's memory + /* 7/10/97: Returning one of the args causes problems with MATLAB's memory manager, so we don't return anything if the result image is passed */ /* plhs[0] = arg; */ result = mxGetPr(arg6); diff --git a/external/matlabPyrTools/README b/external/matlabPyrTools/README index 1eab6bd4..86bb1e3d 100755 --- a/external/matlabPyrTools/README +++ b/external/matlabPyrTools/README @@ -1,11 +1,11 @@ =========================== matlabPyrTools ============================ -This package contains some MatLab tools for multi-scale image +This package contains some MATLAB tools for multi-scale image processing. Briefly, the tools include: - Recursive multi-scale image decompositions (pyramids), including Laplacian pyramids, QMFs, Wavelets, and steerable pyramids. These operate on 1D or 2D signals of arbitrary dimension. Data - structures are compatible with the MatLab wavelet toolbox. + structures are compatible with the MATLAB wavelet toolbox. - Fast 2D convolution routines, with subsampling and boundary-handling. - Fast point-operations, histograms, histogram-matching. - Fast synthetic image generation: sine gratings, zone plates, fractals, etc. @@ -16,14 +16,14 @@ processing. Briefly, the tools include: The package is available as a gnu-zipped UNIX "tar" file, accessible from the web page: http://www.cns.nyu.edu/~lcv/software.html -The code was originally written in Matlab version 4.2, and continues +The code was originally written in MATLAB version 4.2, and continues to work in new versions (as of 12/09). To use the code (these lines are for UNIX): 1) gunzip matlabPyrTools.tar.gz # unpack g'zipped file 2) tar tvf matlabPyrTools.tar # view contents 3) tar xvf matlabPyrTools.tar # extract into directory "matlabPyrTools" 4) rm matlabPyrTools.tar # delete tarfile - 5) Run matlab, and execute: + 5) Run MATLAB, and execute: addpath(); help matlabPyrTools @@ -36,12 +36,12 @@ as well as Make files. Pre-compiled versions are included for a number of platforms. To compile on your platform, simply run compilePyrTools.m which is located in the MEX subdirectory. -To make sure these are in your matlab path, you can do *one* of the +To make sure these are in your MATLAB path, you can do *one* of the following: 1) Create a symbolic link (or macintosh "alias") for the relavent files in the main matlabPyrTools directory, or 2) Copy the relavent files into the main matlabPyrTools directory, or - 3) Put the MEX subdirectory in your matlab path: addpath('matlabPyrTools/MEX'); + 3) Put the MEX subdirectory in your MATLAB path: addpath('matlabPyrTools/MEX'); Some example script files showing usage of the code are in the directory /TUTORIALS. There is a README file in that directory diff --git a/external/matlabPyrTools/TUTORIALS/README b/external/matlabPyrTools/TUTORIALS/README index b8eb3ea5..1f03e441 100755 --- a/external/matlabPyrTools/TUTORIALS/README +++ b/external/matlabPyrTools/TUTORIALS/README @@ -1,10 +1,10 @@ -This directory contains some Matlab script files that serve to give +This directory contains some MATLAB script files that serve to give example usage of this code, and also to explain some of the representations and algorithms. -The files are NOT meant to be executed from the MatLab prompt (like many -of the MatLab demos). You should instead read through the comments, +The files are NOT meant to be executed from the MATLAB prompt (like many +of the MATLAB demos). You should instead read through the comments, executing the subsequent pieces of code. This gives you a chance to explore as you go... diff --git a/external/matlabPyrTools/reconSCFpyr.m b/external/matlabPyrTools/reconSCFpyr.m index a86f03d5..d557a2d7 100755 --- a/external/matlabPyrTools/reconSCFpyr.m +++ b/external/matlabPyrTools/reconSCFpyr.m @@ -12,7 +12,7 @@ % % PYR is a vector containing the N pyramid subbands, ordered from fine % to coarse. INDICES is an Nx2 matrix containing the sizes of -% each subband. This is compatible with the MatLab Wavelet toolbox. +% each subband. This is compatible with the MATLAB Wavelet toolbox. % % LEVS (optional) should be a list of levels to include, or the string % 'all' (default). 0 corresonds to the residual highpass subband. @@ -26,7 +26,7 @@ % function, in octaves (default = 1, which gives a raised cosine for % the bandpass filters). -% Javier Portilla, 7/04, basing on Eero Simoncelli's Matlab Pyrtools code +% Javier Portilla, 7/04, basing on Eero Simoncelli's MATLAB Pyrtools code % and our common code on texture synthesis (textureSynthesis.m). function res = reconSCFpyr(pyr, indices, levs, bands, twidth) diff --git a/external/myaa.m b/external/myaa.m index 03f94bb5..8ca49632 100644 --- a/external/myaa.m +++ b/external/myaa.m @@ -2,7 +2,7 @@ %MYAA Render figure with anti-aliasing. % MYAA % Anti-aliased rendering of the current figure. This makes graphics look -% a lot better than in a standard matlab figure, which is useful for +% a lot better than in a standard MATLAB figure, which is useful for % publishing results on the web or to better see the fine details in a % complex and cluttered plot. Some simple keyboard commands allow % the user to set the rendering quality interactively, zoom in/out and @@ -23,7 +23,7 @@ % rendering will be bigger. % % myaa('publish'): An experimental parameter, useful for publishing -% matlab programs (see example 3). Beware, it kills the current figure. +% MATLAB programs (see example 3). Beware, it kills the current figure. % % Interactivity: % The anti-aliased figure can be updated with the following keyboard @@ -90,7 +90,7 @@ % % BUGS: % Dotted and dashed lines in plots are not rendered correctly. This is -% probably due to a bug in Matlab and it will hopefully be fixed in a +% probably due to a bug in MATLAB and it will hopefully be fixed in a % future version. % The OpenGL renderer does not always manage to render an image large % enough. Try the zbuffer renderer if you have problems or decrease the diff --git a/external/patcht.m b/external/patcht.m index 253c7b16..c28a4ddc 100644 --- a/external/patcht.m +++ b/external/patcht.m @@ -1,5 +1,5 @@ function patcht(FF,VV,TF,VT,I,Options) -% This function PATCHT, will show a triangulated mesh like Matlab function +% This function PATCHT, will show a triangulated mesh like MATLAB function % Patch but then with a texture. % % Alec: Essentially this calls "surface" for each triangle of the triangle mesh diff --git a/external/preserve_history.m b/external/preserve_history.m index 19d6e251..6a1d6a33 100755 --- a/external/preserve_history.m +++ b/external/preserve_history.m @@ -1,6 +1,6 @@ function preserve_history () % Maintains command history indefinitely in a separate history_saved.m file -% since Matlab is truncating history.m to a fixed size. The code is fast even +% since MATLAB is truncating history.m to a fixed size. The code is fast even % when history_saved.m gets very big. % % Also works with the new format introduced in R2014a which is XML. Its diff --git a/external/progressbar.m b/external/progressbar.m index 6ec6a3b2..ac17118a 100755 --- a/external/progressbar.m +++ b/external/progressbar.m @@ -47,7 +47,7 @@ function progressbar(n,N,w) fprintf('\n'); end -% Copyright (c) 2009, Gabriel Peyre +% Copyright (c) 2009, Gabriel Peyré % All rights reserved. % % Redistribution and use in source and binary forms, with or without diff --git a/external/read_ply.m b/external/read_ply.m index 6fda6674..7fb30263 100755 --- a/external/read_ply.m +++ b/external/read_ply.m @@ -8,7 +8,7 @@ % 'face' is a 'nb.face x 3' array specifying the connectivity of the mesh. % % -% Copyright (c) 2003 Gabriel Peyr? +% Copyright (c) 2003 Gabriel Peyré [d,c] = plyread(filename); vi = d.face.vertex_indices; diff --git a/external/tabcomplete.m b/external/tabcomplete.m index 2ec9400f..707689ca 100644 --- a/external/tabcomplete.m +++ b/external/tabcomplete.m @@ -11,7 +11,7 @@ % % TABCOMPLETE modifies the [matlabroot '/toolbox/local/TC.xml'] file % to set/unset the tab-completion definition of the specified function. -% Note: changes take effect only after a Matlab restart. +% Note: changes take effect only after a MATLAB restart. % % TABCOMPLETE(funcName, argType1, argType2, ...) sets the tab-completion % list for function arguments 1, 2, etc. argType can be one of these pre- @@ -21,8 +21,8 @@ % - 'subfun' - list of accessible sub-functions % - 'dir' - list of accessible folders (directories) % - 'file' - list of accessible files (of any type) -% - 'mfile' - list of accessible *.m files (Matlab functions) -% - 'matfile' - list of accessible *.mat files (Matlab data) +% - 'mfile' - list of accessible *.m files (MATLAB functions) +% - 'matfile' - list of accessible *.mat files (MATLAB data) % - 'figfile' - list of accessible *.fig files (figures) % - 'mdlfile' - list of accessible *.mdl files (Simulink models) % - 'mcospkg' - list of accessible MCOS class packages (R2010a+) @@ -64,13 +64,13 @@ % defs = tabcomplete % returns all currently-defined tab-completions % % Known issues/limitations: -% - The modified tab-completions only take effect after Matlab restart. +% - The modified tab-completions only take effect after MATLAB restart. % - The last (default) argType does NOT accept non-pre-defined keywords -% (this is a limitation of Matlab's TC.xsd definition file). +% (this is a limitation of MATLAB's TC.xsd definition file). % - Arguments *MUST* use at least one of the pre-define keywords for their -% argType (this is another limitation of Matlab's TC.xsd definition file). +% argType (this is another limitation of MATLAB's TC.xsd definition file). % - Only lowercase function names are supported. This is another limitation -% of Matlab's TC.xsd definition file. It can be overcome by editing TC.xsd +% of MATLAB's TC.xsd definition file. It can be overcome by editing TC.xsd % (in the same folder as TC.xml) line #20: Change to: '[A-Za-z_0-9]+(/[A-Za-z_0-9]+)?'/> % - This utility currently does not enable setting previous-arg-based @@ -78,8 +78,8 @@ % You can edit the TC.xml file manually to achieve this functionality. % % Warning: -% This code heavily relies on undocumented and unsupported Matlab -% functionality. It works on Matlab 7+, but use at your own risk! +% This code heavily relies on undocumented and unsupported MATLAB +% functionality. It works on MATLAB 7+, but use at your own risk! % % Technical explanation: % A technical explanation of the code in this utility can be found on @@ -242,7 +242,7 @@ V = sscanf(version, '%d.', 2); if V(1) == 7 && (V(2) >= 10 && V(2) <= 13) && ... % R2010a-R2011b ~ispref(mfilename,'dontUseExtra') - msg = {['Matlab R2010a-R2011b have a bug that cause an endless loop (100% CPU load) when using extra tab-completion values such as "' extra '"'], ... + msg = {['MATLAB R2010a-R2011b have a bug that cause an endless loop (100% CPU load) when using extra tab-completion values such as "' extra '"'], ... '', 'Use the extra parameters anyway?'}; switch getQuestDlg(msg) case 'Yes' % => Yes: use extra, nothing to do here diff --git a/external/toolbox_fast_marching/callback_active_contour.m b/external/toolbox_fast_marching/callback_active_contour.m index ed343d3f..b44cec1f 100755 --- a/external/toolbox_fast_marching/callback_active_contour.m +++ b/external/toolbox_fast_marching/callback_active_contour.m @@ -4,7 +4,7 @@ % % y = callback_active_contour(x, options); % -% Copytight (c) 2007 Gabriel Peyre +% Copytight (c) 2007 Gabriel Peyré % norm of gradient dt = options.dt; @@ -16,4 +16,4 @@ y = x(:) - dt * d(:) .* y(:); else y = x(:) - dt * options.E(:) .* d(:) .* y(:); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/compute_alpha_map.m b/external/toolbox_fast_marching/compute_alpha_map.m index 02e65dbe..abd76619 100755 --- a/external/toolbox_fast_marching/compute_alpha_map.m +++ b/external/toolbox_fast_marching/compute_alpha_map.m @@ -8,7 +8,7 @@ % % a is an alphamap. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré if nargin<2 cname = 'jet'; @@ -41,4 +41,4 @@ c = zeros(length(si),3); for i=1:3 c(:,i) = interp1(s,c0(:,i),si); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/compute_bending_invariant.m b/external/toolbox_fast_marching/compute_bending_invariant.m index ed691fa8..178f4f57 100755 --- a/external/toolbox_fast_marching/compute_bending_invariant.m +++ b/external/toolbox_fast_marching/compute_bending_invariant.m @@ -7,7 +7,7 @@ % Use out-of-sample interpolation to speed up the computation. % The number of landmarks used is set by options.nlandmarks. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; nlandmarks = getoptions(options, 'nlandmarks', 200); @@ -55,4 +55,4 @@ shading interp; camlight; h = plot3(v(1,:), v(2,:), v(3,:), '.'); set(h, 'MarkerSize', 20); -hold off; \ No newline at end of file +hold off; diff --git a/external/toolbox_fast_marching/compute_distance_landmark.m b/external/toolbox_fast_marching/compute_distance_landmark.m index e9bb3ee6..49b8483f 100755 --- a/external/toolbox_fast_marching/compute_distance_landmark.m +++ b/external/toolbox_fast_marching/compute_distance_landmark.m @@ -7,7 +7,7 @@ % DL(:,:,i) is the distance map to the ith landmark point. % 'D1' is an approximation of the distance to 'start_point'. % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré if nargin<4 diff --git a/external/toolbox_fast_marching/compute_eccentricity_transform.m b/external/toolbox_fast_marching/compute_eccentricity_transform.m index b1637b7b..1a4dacc1 100755 --- a/external/toolbox_fast_marching/compute_eccentricity_transform.m +++ b/external/toolbox_fast_marching/compute_eccentricity_transform.m @@ -22,7 +22,7 @@ % For s==Inf only: % Ind(i) is the index of the point j that reaches E(i)=d(i,Ind(i)). % -% Copyright (c) 2006 Gabriel Peyr? +% Copyright (c) 2006 Gabriel Peyré options.null = 0; @@ -124,4 +124,4 @@ if s==Inf Ind = samples(Ind); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/compute_edge_energy.m b/external/toolbox_fast_marching/compute_edge_energy.m index 820fc5bc..d56dedd0 100755 --- a/external/toolbox_fast_marching/compute_edge_energy.m +++ b/external/toolbox_fast_marching/compute_edge_energy.m @@ -12,7 +12,7 @@ % % where G_s is a gaussian smoothing of width s. % -% Copyright (c) 2005 Gabriel PeyrŽ +% Copyright (c) 2005 Gabriel Peyré if nargin<3 epsi = 0.05; @@ -73,4 +73,4 @@ end else error('Works only for 2D and 3D data.'); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/compute_geodesic.m b/external/toolbox_fast_marching/compute_geodesic.m index 7c9e2e2c..443184c7 100755 --- a/external/toolbox_fast_marching/compute_geodesic.m +++ b/external/toolbox_fast_marching/compute_geodesic.m @@ -12,7 +12,7 @@ % Set options.method = 'discrete' if you want to use a pure discrete % gradient descent. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; @@ -60,7 +60,7 @@ % % Same as extract_path_xd but less precise and more robust. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré nd = 2; if size(D,3)>1 @@ -124,7 +124,7 @@ % 'D' is the distance function. % 'end_point' is ending point (should be integer). % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré options.null = 0; @@ -292,7 +292,7 @@ % 'A' is the distance function. % 'x' is starting point (should be integer). % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré options.null = 0; diff --git a/external/toolbox_fast_marching/compute_geodesic_mesh.m b/external/toolbox_fast_marching/compute_geodesic_mesh.m index b31be63a..e10bc934 100755 --- a/external/toolbox_fast_marching/compute_geodesic_mesh.m +++ b/external/toolbox_fast_marching/compute_geodesic_mesh.m @@ -10,7 +10,7 @@ % You can force to use a fully discrete descent using % options.method='discrete'. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; verb = getoptions(options, 'verb', 1); diff --git a/external/toolbox_fast_marching/compute_heuristic_landmark.m b/external/toolbox_fast_marching/compute_heuristic_landmark.m index d52dddc8..f2b41af0 100755 --- a/external/toolbox_fast_marching/compute_heuristic_landmark.m +++ b/external/toolbox_fast_marching/compute_heuristic_landmark.m @@ -7,7 +7,7 @@ % DL(:,:,i) is the distance map to the ith landmark point. % 'H' is an approximation of the distance to 'start_point' (the heuristic map). % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré n = size(DL,1); T = repmat(DL(start_points(1),start_points(2),:), [n,n,1] ); diff --git a/external/toolbox_fast_marching/compute_levelset_shape.m b/external/toolbox_fast_marching/compute_levelset_shape.m index 26b8c126..5eaa9c89 100755 --- a/external/toolbox_fast_marching/compute_levelset_shape.m +++ b/external/toolbox_fast_marching/compute_levelset_shape.m @@ -7,7 +7,7 @@ % name can be: 'circle', 'rectangle', 'small-disks', 'circlerect1', % 'circlerect2', 'square'. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; diff --git a/external/toolbox_fast_marching/compute_saddle_points.m b/external/toolbox_fast_marching/compute_saddle_points.m index 50dea087..b1972ac8 100755 --- a/external/toolbox_fast_marching/compute_saddle_points.m +++ b/external/toolbox_fast_marching/compute_saddle_points.m @@ -11,7 +11,7 @@ % points of the voronoi diagram along the boundary of the domain) and % then the triple points (meeting points of 3 cells). % -% Copyright (c) 2008 Gabriel Peyre +% Copyright (c) 2008 Gabriel Peyré if nargin==3 && not(isempty(mask)) Q(mask==0) = -1; diff --git a/external/toolbox_fast_marching/compute_shape_boundary.m b/external/toolbox_fast_marching/compute_shape_boundary.m index 9c13c671..e09bf328 100755 --- a/external/toolbox_fast_marching/compute_shape_boundary.m +++ b/external/toolbox_fast_marching/compute_shape_boundary.m @@ -7,7 +7,7 @@ % bound is oriented counter clockwise. % This is the 8 connectivity boundary. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré n = size(M,1); @@ -85,4 +85,4 @@ if sum(z<0)>sum(z<0) % should flip the curve bound = bound(end:-1:1,:); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/compute_voronoi_triangulation.m b/external/toolbox_fast_marching/compute_voronoi_triangulation.m index efc93fa7..dce16a10 100755 --- a/external/toolbox_fast_marching/compute_voronoi_triangulation.m +++ b/external/toolbox_fast_marching/compute_voronoi_triangulation.m @@ -10,7 +10,7 @@ % % Works in 2D and in 3D. % -% Copyright (c) 2008 Gabriel Peyre +% Copyright (c) 2008 Gabriel Peyré d = nb_dims(Q); diff --git a/external/toolbox_fast_marching/compute_voronoi_triangulation_mesh.m b/external/toolbox_fast_marching/compute_voronoi_triangulation_mesh.m index e804d262..fb8ab565 100755 --- a/external/toolbox_fast_marching/compute_voronoi_triangulation_mesh.m +++ b/external/toolbox_fast_marching/compute_voronoi_triangulation_mesh.m @@ -7,7 +7,7 @@ % Q is a Voronoi partition function, computed using % perform_fast_marching_mesh. % -% Copyright (c) 2006 Gabriel Peyre +% Copyright (c) 2006 Gabriel Peyré if size(vertex,1)>size(vertex,2) vertex = vertex'; diff --git a/external/toolbox_fast_marching/content.m b/external/toolbox_fast_marching/content.m index 9dca5ebf..3d5d8473 100755 --- a/external/toolbox_fast_marching/content.m +++ b/external/toolbox_fast_marching/content.m @@ -1,10 +1,10 @@ %% Toolbox Fast Marching - A toolbox for Fast Marching and level sets computations % -% Copyright (c) 2008 Gabriel Peyre +% Copyright (c) 2008 Gabriel Peyré % %% -% The toolbox can be downloaded from Matlab Central +% The toolbox can be downloaded from MATLAB Central % http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=6110&objectType=FILE %% Introduction to Fast Marching and Level Sets diff --git a/external/toolbox_fast_marching/convert_distance_color.m b/external/toolbox_fast_marching/convert_distance_color.m index a31e2707..e73369fb 100755 --- a/external/toolbox_fast_marching/convert_distance_color.m +++ b/external/toolbox_fast_marching/convert_distance_color.m @@ -9,7 +9,7 @@ % Very useful to save a result of distance computation to an image file % with nice colors. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré n = size(D,1); if nargin<2 @@ -22,4 +22,4 @@ v = c(I(:),:); v = reshape(v, [n n 3]); A = repmat(rescale(M), [1 1 3]); B = repmat(D, [1 1 3]); -v(B==Inf) = A(B==Inf); \ No newline at end of file +v(B==Inf) = A(B==Inf); diff --git a/external/toolbox_fast_marching/display_eccentricity.m b/external/toolbox_fast_marching/display_eccentricity.m index fa17a79e..d3f09845 100755 --- a/external/toolbox_fast_marching/display_eccentricity.m +++ b/external/toolbox_fast_marching/display_eccentricity.m @@ -7,7 +7,7 @@ function display_eccentricity(E, mode) % mode==1 for colors % mode==2 for level sets % -% Copyright (c) 2006 Gabriel Peyré +% Copyright (c) 2006 Gabriel Peyré if nargin<2 mode = 1; diff --git a/external/toolbox_fast_marching/display_segmentation.m b/external/toolbox_fast_marching/display_segmentation.m index 0cd7f776..1e1991ef 100755 --- a/external/toolbox_fast_marching/display_segmentation.m +++ b/external/toolbox_fast_marching/display_segmentation.m @@ -9,7 +9,7 @@ function display_segmentation(B,M) % % See also: perform_active_contour % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré if min(B(:))>=0 if max(B(:))>2 @@ -48,4 +48,4 @@ function display_segmentation(B,M) end hold off; colormap gray(256); -axis ij; \ No newline at end of file +axis ij; diff --git a/external/toolbox_fast_marching/divgrad.m b/external/toolbox_fast_marching/divgrad.m index ecb6f8b5..698e9320 100755 --- a/external/toolbox_fast_marching/divgrad.m +++ b/external/toolbox_fast_marching/divgrad.m @@ -8,7 +8,7 @@ % if M is a 3D array, compute divergence. % Use centered finite differences. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; if size(M,3)==2 @@ -65,4 +65,4 @@ sel1 = [2:n 1]; sel2 = [n 1:n-1]; g = cat( 3, M(sel1,:)-M(sel2,:), M(:,sel1)-M(:,sel2) )/2; -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/generate_constrained_map.m b/external/toolbox_fast_marching/generate_constrained_map.m index 58a8bc6b..b8cfda20 100755 --- a/external/toolbox_fast_marching/generate_constrained_map.m +++ b/external/toolbox_fast_marching/generate_constrained_map.m @@ -10,7 +10,7 @@ % obj is the size of the size of the rectangle object that moves % (eg. obj=[0.2,0.05]). % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin<2 nb_theta = 10; diff --git a/external/toolbox_fast_marching/html/content.html b/external/toolbox_fast_marching/html/content.html index 9c592c2c..28cb5eab 100755 --- a/external/toolbox_fast_marching/html/content.html +++ b/external/toolbox_fast_marching/html/content.html @@ -19,7 +19,7 @@

Toolbox Fast Marching - A toolbox for Fast Marching and level sets computations

-

Copyright (c) 2008 Gabriel Peyre

+

Copyright (c) 2008 Gabriel Peyré

Contents

@@ -35,7 +35,7 @@

Contents

  • Anisotropic Fast Marching
    • -

    The toolbox can be downloaded from Matlab Central http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=6110&objectType=FILE

    +

    The toolbox can be downloaded from MATLAB Central http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=6110&objectType=FILE

    Introduction to Fast Marching and Level Sets

    The Fast Marching algorithm, introduced by J. Sethian (1996) is a numerical algorithm that is able to catch the viscosity solution of the Eikonal equation norm(grad(D))=P. The level set {x \ F(x)=t} can be seen as a front advancing with speed P(x). @@ -289,17 +289,17 @@

    Setting-up the Path and Compiling the Mex Files.

    axis ij; end


    - Copyright ® 2008 Gabriel Peyre

    + Copyright ® 2008 Gabriel Peyré

    - \ No newline at end of file + diff --git a/external/toolbox_fast_marching/html/gpeyre.xsl b/external/toolbox_fast_marching/html/gpeyre.xsl index 03b3f039..07244771 100755 --- a/external/toolbox_fast_marching/html/gpeyre.xsl +++ b/external/toolbox_fast_marching/html/gpeyre.xsl @@ -109,7 +109,7 @@ To make changes, update the M-file and republish this document.


    - Copyright ® 2008 Gabriel Peyre
    + Copyright ® 2008 Gabriel Peyré

    diff --git a/external/toolbox_fast_marching/license.txt b/external/toolbox_fast_marching/license.txt index 55b9189e..4346ad8d 100644 --- a/external/toolbox_fast_marching/license.txt +++ b/external/toolbox_fast_marching/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009, Gabriel Peyre +Copyright (c) 2009, Gabriel Peyré All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/external/toolbox_fast_marching/load_potential_map.m b/external/toolbox_fast_marching/load_potential_map.m index 9524bf8b..161b4320 100755 --- a/external/toolbox_fast_marching/load_potential_map.m +++ b/external/toolbox_fast_marching/load_potential_map.m @@ -7,7 +7,7 @@ % 'M' is a cool 2D image you can use for display % 'W' is the potential map % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré options.null = 0; diff --git a/external/toolbox_fast_marching/mex/gw/gw_core/GW_Config.h b/external/toolbox_fast_marching/mex/gw/gw_core/GW_Config.h index 64a0e843..2bf4d2d4 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_core/GW_Config.h +++ b/external/toolbox_fast_marching/mex/gw/gw_core/GW_Config.h @@ -383,4 +383,4 @@ void GW_OutputComment( const char* str ); /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2009 Gabriel Peyre +// Copyright (C) 2009 Gabriel Peyré diff --git a/external/toolbox_fast_marching/mex/gw/gw_core/GW_PolygonIntersector.h b/external/toolbox_fast_marching/mex/gw/gw_core/GW_PolygonIntersector.h index 492f9cb5..4de14bc1 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_core/GW_PolygonIntersector.h +++ b/external/toolbox_fast_marching/mex/gw/gw_core/GW_PolygonIntersector.h @@ -423,7 +423,7 @@ class GW_PolygonIntersector for ( i = 0; i < DIM; i++ ) p[i] = a[i]; } - /** Returns TRUE iff point c lies on the closed segement ab. + /** Returns TRUE if point c lies on the closed segement ab. Assumes it is already known that abc are collinear. */ bool Between( tPointi a, tPointi b, tPointi c ) { diff --git a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MathsConfig.h b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MathsConfig.h index 849b82f9..6284f313 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MathsConfig.h +++ b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MathsConfig.h @@ -359,4 +359,4 @@ struct gw_basic_type_traits /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2009 Gabriel Peyre \ No newline at end of file +// Copyright (C) 2009 Gabriel Peyré diff --git a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix2x2.h b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix2x2.h index 44611f4e..f9986e79 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix2x2.h +++ b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix2x2.h @@ -212,4 +212,4 @@ class GW_Matrix2x2: public GW_MatrixStatic<2,2,GW_Float> #endif // __GW_Matrix2x2_h_ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2009 Gabriel Peyre \ No newline at end of file +// Copyright (C) 2009 Gabriel Peyré diff --git a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix3x3.h b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix3x3.h index fda053ee..5af929de 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix3x3.h +++ b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix3x3.h @@ -438,4 +438,4 @@ class GW_Matrix3x3: public GW_MatrixStatic<3,3,GW_Float> #endif // __GW_Matrix3x3_h_ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2009 Gabriel Peyre \ No newline at end of file +// Copyright (C) 2009 Gabriel Peyré diff --git a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix4x4.h b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix4x4.h index 249c79e7..541fc2aa 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix4x4.h +++ b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_Matrix4x4.h @@ -742,4 +742,4 @@ class GW_Matrix4x4: public GW_MatrixStatic<4,4,GW_Float> #endif // __GW_Matrix4x4_h_ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2009 Gabriel Peyre +// Copyright (C) 2009 Gabriel Peyré diff --git a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MatrixStatic.h b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MatrixStatic.h index b87114e2..e51b968b 100755 --- a/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MatrixStatic.h +++ b/external/toolbox_fast_marching/mex/gw/gw_maths/GW_MatrixStatic.h @@ -971,4 +971,4 @@ GW_MatrixStatic operator - (const GW_MatrixStatic #endif // __GW_Vector4D_h_ /////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2009 Gabriel Peyre +// Copyright (C) 2009 Gabriel Peyré diff --git a/external/toolbox_fast_marching/mex/perform_front_propagation_2d.cpp b/external/toolbox_fast_marching/mex/perform_front_propagation_2d.cpp index d1d7b796..292b5252 100755 --- a/external/toolbox_fast_marching/mex/perform_front_propagation_2d.cpp +++ b/external/toolbox_fast_marching/mex/perform_front_propagation_2d.cpp @@ -12,7 +12,7 @@ % 'start_points' is a 2 x num_start_points matrix where k is the number of starting points. % 'H' is an heuristic (distance that remains to goal). This is a 2D matrix. % -% Copyright (c) 2004 Gabriel Peyr� +% Copyright (c) 2004 Gabriel Peyré *=================================================================*/ // select to test or not to test (debug purpose) @@ -345,4 +345,4 @@ void perform_front_propagation_2d(T_callback_intert_node callback_insert_node) GW_DELETE( *it ); // free fibheap pool GW_DELETEARRAY(heap_pool); -} \ No newline at end of file +} diff --git a/external/toolbox_fast_marching/mex/skeleton.cpp b/external/toolbox_fast_marching/mex/skeleton.cpp index 5fe0bf97..29264e14 100755 --- a/external/toolbox_fast_marching/mex/skeleton.cpp +++ b/external/toolbox_fast_marching/mex/skeleton.cpp @@ -1,6 +1,6 @@ //*************************************************************************** // -// Matlab C routine file: skelgrad.cpp +// MATLAB C routine file: skelgrad.cpp // // Written 8/04 by N. Howe // @@ -399,9 +399,9 @@ compute_skeleton_gradient(T *img, int nrow, int ncol, int nlhs, //*************************************************************************** // -// Gateway driver to call the calculation from Matlab. +// Gateway driver to call the calculation from MATLAB. // -// This is the Matlab entry point. +// This is the MATLAB entry point. // void diff --git a/external/toolbox_fast_marching/perform_active_contour.m b/external/toolbox_fast_marching/perform_active_contour.m index 0c0780d9..8f0fd227 100755 --- a/external/toolbox_fast_marching/perform_active_contour.m +++ b/external/toolbox_fast_marching/perform_active_contour.m @@ -34,7 +34,7 @@ % % See also: display_segmentation. % -% Copyright (c) 2007 Gabriel eyre +% Copyright (c) 2007 Gabriel Peyré dt = getoptions(options, 'dt', 1000); Tmax = getoptions(options, 'Tmax', 1000); @@ -200,4 +200,4 @@ next_svg = svg_list(nb); % next_svg+delta_svg; end end -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/perform_circular_fast_marching_2d.m b/external/toolbox_fast_marching/perform_circular_fast_marching_2d.m index c78d116e..1b2eff64 100755 --- a/external/toolbox_fast_marching/perform_circular_fast_marching_2d.m +++ b/external/toolbox_fast_marching/perform_circular_fast_marching_2d.m @@ -17,7 +17,7 @@ % that remains from a given node to a given target). % This is an array of same size as W. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin<4 @@ -62,6 +62,6 @@ error('You must compile the mex files.'); end -% replace C 'Inf' value (1e9) by Matlab Inf value. +% replace C 'Inf' value (1e9) by MATLAB Inf value. I = find( D>10000 ); D(I) = Inf; diff --git a/external/toolbox_fast_marching/perform_farthest_landmark_sampling.m b/external/toolbox_fast_marching/perform_farthest_landmark_sampling.m index 2d51dda9..215f283a 100755 --- a/external/toolbox_fast_marching/perform_farthest_landmark_sampling.m +++ b/external/toolbox_fast_marching/perform_farthest_landmark_sampling.m @@ -7,7 +7,7 @@ % points can be [] % DL is the distance map to base_points, wich is a 2 x p matrix % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré if size(base_points,1)~=2 base_points = base_points'; diff --git a/external/toolbox_fast_marching/perform_farthest_point_sampling.m b/external/toolbox_fast_marching/perform_farthest_point_sampling.m index bb9f3ec2..8b28ef0e 100755 --- a/external/toolbox_fast_marching/perform_farthest_point_sampling.m +++ b/external/toolbox_fast_marching/perform_farthest_point_sampling.m @@ -7,7 +7,7 @@ % points can be [] or can be a (2,npts) matrix of already computed % sampling locations. % -% Copyright (c) 2005 Gabriel Peyre +% Copyright (c) 2005 Gabriel Peyré options.null = 0; if nargin<3 @@ -127,4 +127,4 @@ Q = D*0+1; else [D,S,Q] = perform_fast_marching(W, x, options); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/perform_farthest_point_sampling_boundary.m b/external/toolbox_fast_marching/perform_farthest_point_sampling_boundary.m index 82b85383..271787f6 100755 --- a/external/toolbox_fast_marching/perform_farthest_point_sampling_boundary.m +++ b/external/toolbox_fast_marching/perform_farthest_point_sampling_boundary.m @@ -6,7 +6,7 @@ % % points can be [] % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré if nbr_pts>1 for i=1:nbr_pts diff --git a/external/toolbox_fast_marching/perform_farthest_point_sampling_mesh.m b/external/toolbox_fast_marching/perform_farthest_point_sampling_mesh.m index 54716d7b..6157d8b5 100755 --- a/external/toolbox_fast_marching/perform_farthest_point_sampling_mesh.m +++ b/external/toolbox_fast_marching/perform_farthest_point_sampling_mesh.m @@ -9,7 +9,7 @@ % % See also: perform_fast_marching_mesh. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; if nargin<3 @@ -62,4 +62,4 @@ end return; end -[D,Z,Q] = perform_fast_marching_mesh(vertex, faces, x, options); \ No newline at end of file +[D,Z,Q] = perform_fast_marching_mesh(vertex, faces, x, options); diff --git a/external/toolbox_fast_marching/perform_fast_marching.m b/external/toolbox_fast_marching/perform_fast_marching.m index 7449f5a5..f9c03684 100755 --- a/external/toolbox_fast_marching/perform_fast_marching.m +++ b/external/toolbox_fast_marching/perform_fast_marching.m @@ -34,7 +34,7 @@ % % See also: perform_fast_marching_3d. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; @@ -122,5 +122,5 @@ end Q = Q+1; -% replace C 'Inf' value (1e9) by Matlab Inf value. -D(D>1e8) = Inf; \ No newline at end of file +% replace C 'Inf' value (1e9) by MATLAB Inf value. +D(D>1e8) = Inf; diff --git a/external/toolbox_fast_marching/perform_fast_marching_mesh.m b/external/toolbox_fast_marching/perform_fast_marching_mesh.m index b1a15946..05fdd052 100755 --- a/external/toolbox_fast_marching/perform_fast_marching_mesh.m +++ b/external/toolbox_fast_marching/perform_fast_marching_mesh.m @@ -29,7 +29,7 @@ % will be expanded. Set some entries of L to -Inf to avoid any % exploration of these points. % -% Copyright (c) 2004-2006 Gabriel Peyr? +% Copyright (c) 2004-2006 Gabriel Peyré options.null = 0; @@ -66,6 +66,6 @@ error('You have to run compiler_mex before.'); end -% replace C 'Inf' value (1e9) by Matlab Inf value. +% replace C 'Inf' value (1e9) by MATLAB Inf value. I = find( D>1e8 ); D(I) = Inf; diff --git a/external/toolbox_fast_marching/perform_fast_marching_old.m b/external/toolbox_fast_marching/perform_fast_marching_old.m index b485891b..b30e1477 100755 --- a/external/toolbox_fast_marching/perform_fast_marching_old.m +++ b/external/toolbox_fast_marching/perform_fast_marching_old.m @@ -34,7 +34,7 @@ % % See also: perform_fast_marching_3d. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; @@ -115,5 +115,5 @@ end Q = Q+1; -% replace C 'Inf' value (1e9) by Matlab Inf value. +% replace C 'Inf' value (1e9) by MATLAB Inf value. D(D>1e8) = Inf; diff --git a/external/toolbox_fast_marching/perform_fmstar_2d.m b/external/toolbox_fast_marching/perform_fmstar_2d.m index e4591d6a..4784b982 100755 --- a/external/toolbox_fast_marching/perform_fmstar_2d.m +++ b/external/toolbox_fast_marching/perform_fmstar_2d.m @@ -19,7 +19,7 @@ % computation (eg. 0.5 will perform the heuristic computation % on a grid of half size). % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré options.null = 0; if isfield(options, 'weight') diff --git a/external/toolbox_fast_marching/perform_fmstar_3d.m b/external/toolbox_fast_marching/perform_fmstar_3d.m index 19cc871e..0cfff715 100755 --- a/external/toolbox_fast_marching/perform_fmstar_3d.m +++ b/external/toolbox_fast_marching/perform_fmstar_3d.m @@ -12,7 +12,7 @@ % computation (eg. 0.5 will perform the heuristic computation % on a grid of half size). % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré options.null = 0; if isfield(options, 'weight') diff --git a/external/toolbox_fast_marching/perform_front_propagation_2d.m b/external/toolbox_fast_marching/perform_front_propagation_2d.m index b99b0b9a..fde701a2 100755 --- a/external/toolbox_fast_marching/perform_front_propagation_2d.m +++ b/external/toolbox_fast_marching/perform_front_propagation_2d.m @@ -9,4 +9,4 @@ % 'start_points' is a 2 x num_start_points matrix where k is the number of starting points. % 'H' is an heuristic (distance that remains to goal). This is a 2D matrix. % -% Copyright (c) 2004 Gabriel Peyré \ No newline at end of file +% Copyright (c) 2004 Gabriel Peyré \ No newline at end of file diff --git a/external/toolbox_fast_marching/perform_front_propagation_2d_slow.m b/external/toolbox_fast_marching/perform_front_propagation_2d_slow.m index 8d1f07e9..9b67330e 100755 --- a/external/toolbox_fast_marching/perform_front_propagation_2d_slow.m +++ b/external/toolbox_fast_marching/perform_front_propagation_2d_slow.m @@ -13,7 +13,7 @@ % 'start_points' is a 2 x num_start_points matrix where k is the number of starting points. % 'H' is an heuristic (distance that remains to goal). This is a 2D matrix. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré data.D = W.*0 + Inf; % action start_ind = sub2ind(size(W), start_points(1,:), start_points(2,:)); @@ -77,7 +77,7 @@ % Data is a structure that records the state before/after a step % of the FM algorithm. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré % some constant kClose = -1; diff --git a/external/toolbox_fast_marching/perform_geodesic_interpolation.m b/external/toolbox_fast_marching/perform_geodesic_interpolation.m index 6286a466..6d5a41b1 100755 --- a/external/toolbox_fast_marching/perform_geodesic_interpolation.m +++ b/external/toolbox_fast_marching/perform_geodesic_interpolation.m @@ -8,7 +8,7 @@ % % options.method can be 'powerlaw' or 'gaussian'. % -% Copyright (c) 2007 Gabriel PeyrŽ +% Copyright (c) 2007 Gabriel Peyré n = size(W,1); @@ -58,4 +58,4 @@ S = repmat(S, [1 1 s 1]); T = repmat( reshape(f, [1 1 s npoints]), [n n 1 1] ); M = S .* T; -M = sum( M, 4 ); \ No newline at end of file +M = sum( M, 4 ); diff --git a/external/toolbox_fast_marching/perform_lloyd_mesh.m b/external/toolbox_fast_marching/perform_lloyd_mesh.m index 0c7de620..c72bd426 100755 --- a/external/toolbox_fast_marching/perform_lloyd_mesh.m +++ b/external/toolbox_fast_marching/perform_lloyd_mesh.m @@ -4,7 +4,7 @@ % % start_points = perform_lloyd_mesh(vertex,faces, start_points, options); % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; @@ -62,4 +62,4 @@ [v,k] = max(D(I)); start_points(i) = I(k); end -start_points = start_points(:); \ No newline at end of file +start_points = start_points(:); diff --git a/external/toolbox_fast_marching/perform_redistancing.m b/external/toolbox_fast_marching/perform_redistancing.m index 50a04408..04d2e1d1 100755 --- a/external/toolbox_fast_marching/perform_redistancing.m +++ b/external/toolbox_fast_marching/perform_redistancing.m @@ -10,7 +10,7 @@ % Note that the distance function is computed with 1 pixel = distance of % 1, so the overall image range over a 1...n=size(D,1) % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; use_interpolation = getoptions(options, 'use_interpolation', 1); @@ -54,4 +54,4 @@ end D1 = perform_fast_marching(ones(n), start_points, options); D1 = D1*n; -D1(D<0) = -D1(D<0); \ No newline at end of file +D1(D<0) = -D1(D<0); diff --git a/external/toolbox_fast_marching/pick_curves.m b/external/toolbox_fast_marching/pick_curves.m index 8db1ea73..4e7c9c06 100755 --- a/external/toolbox_fast_marching/pick_curves.m +++ b/external/toolbox_fast_marching/pick_curves.m @@ -10,7 +10,7 @@ % Left click stop a curve. % Another left click stop the process. % -% Copyright (c) 2007 Gabriel Peyr? +% Copyright (c) 2007 Gabriel Peyré n = size(mask,1); @@ -37,4 +37,4 @@ sk( x+(y-1)*n ) = 1; x1 = x2; y1 = y2; end -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/pick_start_end_point.m b/external/toolbox_fast_marching/pick_start_end_point.m index 346d562a..669125e3 100755 --- a/external/toolbox_fast_marching/pick_start_end_point.m +++ b/external/toolbox_fast_marching/pick_start_end_point.m @@ -4,7 +4,7 @@ % % [start_point,end_point,center_point] = pick_start_end_point(M); % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré if nargin<2 no_end_point = 0; diff --git a/external/toolbox_fast_marching/plot_constrained_path_planing.m b/external/toolbox_fast_marching/plot_constrained_path_planing.m index 3e1b8ab3..d14c2ade 100755 --- a/external/toolbox_fast_marching/plot_constrained_path_planing.m +++ b/external/toolbox_fast_marching/plot_constrained_path_planing.m @@ -1,10 +1,10 @@ -function plot_constrained_path_planing(M,path,obj,nb_s,options) +function plot_constrained_path_planning(M,path,obj,nb_s,options) -% plot_constrained_path_planing - plot the result of the fast marching. +% plot_constrained_path_planning - plot the result of the fast marching. % -% plot_constrained_path_planing(M,path,obj); +% plot_constrained_path_planning(M,path,obj); % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré options.null = 1; if nargin<4 @@ -54,4 +54,4 @@ function plot_box(c,obj,theta, str, box_width) function plot_line(a,b, str, box_width) h = line([a(1) b(1)], [a(2) b(2)], 'LineWidth', box_width); -set(h,'Color','r'); \ No newline at end of file +set(h,'Color','r'); diff --git a/external/toolbox_fast_marching/plot_fast_marching_2d.m b/external/toolbox_fast_marching/plot_fast_marching_2d.m index d4bac965..c1d80da3 100755 --- a/external/toolbox_fast_marching/plot_fast_marching_2d.m +++ b/external/toolbox_fast_marching/plot_fast_marching_2d.m @@ -4,7 +4,7 @@ function plot_fast_marching_2d(W,S,path,start_points,end_points, options) % % plot_fast_marching_2d(W,S,path,start_points,end_points, options); % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré n = size(W,1); diff --git a/external/toolbox_fast_marching/plot_fast_marching_3d.m b/external/toolbox_fast_marching/plot_fast_marching_3d.m index 4fee0e45..5a0657cb 100755 --- a/external/toolbox_fast_marching/plot_fast_marching_3d.m +++ b/external/toolbox_fast_marching/plot_fast_marching_3d.m @@ -7,7 +7,7 @@ function plot_fast_marching_3d(W,S,path,start_points,end_points, options) % If you provide W, path is assumed to lie in [1,n]^3 where n=length(W). % Path can be a cell array of 3D curves or a single 3D curve. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré options.null = 0; if isfield(options, 'plot_isosurface') diff --git a/external/toolbox_fast_marching/plot_fast_marching_mesh.m b/external/toolbox_fast_marching/plot_fast_marching_mesh.m index 3adac3cd..6ad9cb39 100755 --- a/external/toolbox_fast_marching/plot_fast_marching_mesh.m +++ b/external/toolbox_fast_marching/plot_fast_marching_mesh.m @@ -15,7 +15,7 @@ function plot_fast_marching_mesh(vertex,faces, D, paths, options) % You can force color equalization using options.colorfx = 'equalize' % options.start_points is a set of start points (in red), for instance the center of geodesic cells. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; if not(iscell(paths)) @@ -75,4 +75,4 @@ function plot_fast_marching_mesh(vertex,faces, D, paths, options) end hold off; colormap jet(256); -camlight; \ No newline at end of file +camlight; diff --git a/external/toolbox_fast_marching/plot_volumetric_data.m b/external/toolbox_fast_marching/plot_volumetric_data.m index 00f7335b..c8775b6e 100755 --- a/external/toolbox_fast_marching/plot_volumetric_data.m +++ b/external/toolbox_fast_marching/plot_volumetric_data.m @@ -4,7 +4,7 @@ function plot_volumetric_data(W, nb_colors) % % plot_volumetric_data(W, nb_colors); % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré if nargin<2 nb_colors = 256; diff --git a/external/toolbox_fast_marching/publish_html.m b/external/toolbox_fast_marching/publish_html.m index 9cba7438..ade71652 100755 --- a/external/toolbox_fast_marching/publish_html.m +++ b/external/toolbox_fast_marching/publish_html.m @@ -4,7 +4,7 @@ function publish_html(filename, outputDir, stylesheet) % % publish_html(filename, outputDir, stylesheet); % -% Copyright (c) 2008 Gabriel Peyre +% Copyright (c) 2008 Gabriel Peyré if nargin<1 filename = 'content'; diff --git a/external/toolbox_fast_marching/readme b/external/toolbox_fast_marching/readme index 8a9bbea6..f8d77e83 100755 --- a/external/toolbox_fast_marching/readme +++ b/external/toolbox_fast_marching/readme @@ -1,4 +1,4 @@ -WARNING: you have to add the files under toolbox/ in your Matlab path. +WARNING: you have to add the files under toolbox/ in your MATLAB path. The Fast Marching algorithm, introduced by Sethian (1996) is a numerical algorithm that is able to catch the viscosity solution @@ -49,7 +49,7 @@ Additional features: Appleton, B., Talbot, H., Globally Optimal Geodesic Active Contours, Journal of Mathematical Imaging and Vision, to appear. -* Constraint path planing : the script 'test_path_planing' +* Constraint path planning : the script 'test_path_planning' shows the application of 3D fast marching to the extraction of optimal path for a tiny rectangle. The function 'generate_constrained_map' generate the 3D speed @@ -69,4 +69,4 @@ simply run 'compile_mex'. This should be ok if you have set some C++ compiler (use 'mex -setup'). Precompiled version (.dll) for Windows are provided. -Copyright (c) 2004 Gabriel Peyré \ No newline at end of file +Copyright (c) 2004 Gabriel Peyré diff --git a/external/toolbox_fast_marching/tests/test_active_contour.m b/external/toolbox_fast_marching/tests/test_active_contour.m index 3fe15f78..051ba060 100755 --- a/external/toolbox_fast_marching/tests/test_active_contour.m +++ b/external/toolbox_fast_marching/tests/test_active_contour.m @@ -1,6 +1,6 @@ % test for active contours % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.bound = 'per'; @@ -86,4 +86,4 @@ end -D = perform_active_contour(D0, motion, options); \ No newline at end of file +D = perform_active_contour(D0, motion, options); diff --git a/external/toolbox_fast_marching/tests/test_circular.m b/external/toolbox_fast_marching/tests/test_circular.m index a4915bed..0fbbaab7 100755 --- a/external/toolbox_fast_marching/tests/test_circular.m +++ b/external/toolbox_fast_marching/tests/test_circular.m @@ -1,6 +1,6 @@ % test for circular fast marching % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré % some parameters n = 400; diff --git a/external/toolbox_fast_marching/tests/test_circular_fast_marching_2d.m b/external/toolbox_fast_marching/tests/test_circular_fast_marching_2d.m index 5b240880..94893820 100755 --- a/external/toolbox_fast_marching/tests/test_circular_fast_marching_2d.m +++ b/external/toolbox_fast_marching/tests/test_circular_fast_marching_2d.m @@ -1,6 +1,6 @@ % test for circular fast marching % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré % some parameters name = 'stephanodiscusniagarae'; diff --git a/external/toolbox_fast_marching/tests/test_circular_prior.m b/external/toolbox_fast_marching/tests/test_circular_prior.m index bf01dd89..0144e2c7 100755 --- a/external/toolbox_fast_marching/tests/test_circular_prior.m +++ b/external/toolbox_fast_marching/tests/test_circular_prior.m @@ -1,6 +1,6 @@ % test for circular shape priors % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré % some parameters n = 400; diff --git a/external/toolbox_fast_marching/tests/test_fast_marching_2d.m b/external/toolbox_fast_marching/tests/test_fast_marching_2d.m index 623e80de..f10cb50d 100755 --- a/external/toolbox_fast_marching/tests/test_fast_marching_2d.m +++ b/external/toolbox_fast_marching/tests/test_fast_marching_2d.m @@ -1,6 +1,6 @@ % test for fast marching and geodesic extraction % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré n = 600; name = 'road2'; diff --git a/external/toolbox_fast_marching/tests/test_fast_marching_3d.m b/external/toolbox_fast_marching/tests/test_fast_marching_3d.m index 82746e2a..d4250415 100755 --- a/external/toolbox_fast_marching/tests/test_fast_marching_3d.m +++ b/external/toolbox_fast_marching/tests/test_fast_marching_3d.m @@ -1,6 +1,6 @@ % test for fast marching % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré n = 40; diff --git a/external/toolbox_fast_marching/tests/test_fmstar_2d.m b/external/toolbox_fast_marching/tests/test_fmstar_2d.m index 898fa8e3..b5f9d9ab 100755 --- a/external/toolbox_fast_marching/tests/test_fmstar_2d.m +++ b/external/toolbox_fast_marching/tests/test_fmstar_2d.m @@ -2,7 +2,7 @@ % Fast Marching algorithm, % aka FM* % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % speed fonction W diff --git a/external/toolbox_fast_marching/tests/test_fmstar_3d.m b/external/toolbox_fast_marching/tests/test_fmstar_3d.m index bde01430..d567b580 100755 --- a/external/toolbox_fast_marching/tests/test_fmstar_3d.m +++ b/external/toolbox_fast_marching/tests/test_fmstar_3d.m @@ -2,7 +2,7 @@ % Fast Marching algorithm, % aka FM* in 3D % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % speed fonction W diff --git a/external/toolbox_fast_marching/tests/test_fmstar_error.m b/external/toolbox_fast_marching/tests/test_fmstar_error.m index 2349a61c..98bb01fe 100755 --- a/external/toolbox_fast_marching/tests/test_fmstar_error.m +++ b/external/toolbox_fast_marching/tests/test_fmstar_error.m @@ -2,7 +2,7 @@ % Fast Marching algorithm, % aka FM* % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % speed fonction W diff --git a/external/toolbox_fast_marching/tests/test_fmstar_landmark.m b/external/toolbox_fast_marching/tests/test_fmstar_landmark.m index e9455cc7..46139517 100755 --- a/external/toolbox_fast_marching/tests/test_fmstar_landmark.m +++ b/external/toolbox_fast_marching/tests/test_fmstar_landmark.m @@ -2,7 +2,7 @@ % Fast Marching algorithm, % aka FM* with landmark points % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % speed fonction W diff --git a/external/toolbox_fast_marching/tests/test_fmstar_path_planing.m b/external/toolbox_fast_marching/tests/test_fmstar_path_planing.m index e919cdb4..e7d44c04 100755 --- a/external/toolbox_fast_marching/tests/test_fmstar_path_planing.m +++ b/external/toolbox_fast_marching/tests/test_fmstar_path_planing.m @@ -1,4 +1,4 @@ -% test for constrainted path planing using an heuristic. +% test for constrained path planning using an heuristic. % save_image = 0; @@ -44,7 +44,7 @@ path1(:,3) = (path(:,3)-1)/ntheta*pi; clf; -plot_constrained_path_planing(M,path1,obj,40); +plot_constrained_path_planning(M,path1,obj,40); test_type = 'weight'; @@ -77,4 +77,4 @@ str = [rep name '_front_' num2str( round(weight_list(i)*100) )]; saveas( gcf, [str '.png'], 'png' ); end -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/tests/test_fmstar_weight_2d.m b/external/toolbox_fast_marching/tests/test_fmstar_weight_2d.m index a1240a34..2c2a4e79 100755 --- a/external/toolbox_fast_marching/tests/test_fmstar_weight_2d.m +++ b/external/toolbox_fast_marching/tests/test_fmstar_weight_2d.m @@ -2,7 +2,7 @@ % Fast Marching algorithm, % aka FM* % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % speed fonction W diff --git a/external/toolbox_fast_marching/tests/test_multiple_paths_2d.m b/external/toolbox_fast_marching/tests/test_multiple_paths_2d.m index 12a43b1d..7fbbf398 100755 --- a/external/toolbox_fast_marching/tests/test_multiple_paths_2d.m +++ b/external/toolbox_fast_marching/tests/test_multiple_paths_2d.m @@ -1,6 +1,6 @@ % test for multiple path extraction % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré n = 256; diff --git a/external/toolbox_fast_marching/tests/test_path_planing.m b/external/toolbox_fast_marching/tests/test_path_planing.m index 61425032..9778b6da 100755 --- a/external/toolbox_fast_marching/tests/test_path_planing.m +++ b/external/toolbox_fast_marching/tests/test_path_planing.m @@ -1,4 +1,4 @@ -% test for constrainted path planing. +% test for constrained path planning. map_name = 'data/room1.png'; % a small map map_name = 'data/room.png'; % warning : this is a *big* map, expect large computation time. @@ -34,4 +34,4 @@ path(:,3) = (path(:,3)-1)/ntheta*pi; clf; -plot_constrained_path_planing(M,path,obj,40); \ No newline at end of file +plot_constrained_path_planning(M,path,obj,40); diff --git a/external/toolbox_fast_marching/tests/test_propagation_2d.m b/external/toolbox_fast_marching/tests/test_propagation_2d.m index e9d7d2c0..e1c4d517 100755 --- a/external/toolbox_fast_marching/tests/test_propagation_2d.m +++ b/external/toolbox_fast_marching/tests/test_propagation_2d.m @@ -1,6 +1,6 @@ % shows an animation of a propagation % -% Copyright (c) 2005 Gabriel Peyre +% Copyright (c) 2005 Gabriel Peyré path(path, 'toolbox/'); n = 100; @@ -48,4 +48,4 @@ imwrite(rescale(v), [rep name '-propagation-' num2string_fixeddigit(i, 3) '.png' ], 'png'); warning on; end -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/tests/test_propagation_mesh.m b/external/toolbox_fast_marching/tests/test_propagation_mesh.m index 1ca95d3d..57ec265f 100755 --- a/external/toolbox_fast_marching/tests/test_propagation_mesh.m +++ b/external/toolbox_fast_marching/tests/test_propagation_mesh.m @@ -1,6 +1,6 @@ % test for front propagation on 3D meshes % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré path(path, 'toolbox/'); path(path, '../toolbox_graph_data/'); diff --git a/external/toolbox_fast_marching/tests/test_segmentation.m b/external/toolbox_fast_marching/tests/test_segmentation.m index b8434044..9fafea68 100755 --- a/external/toolbox_fast_marching/tests/test_segmentation.m +++ b/external/toolbox_fast_marching/tests/test_segmentation.m @@ -1,6 +1,6 @@ % test for segmentation using front propagation % -% Copyright (c) 2006 Gabriel Peyré +% Copyright (c) 2006 Gabriel Peyré n = 200; map_name = 'data/room.png'; diff --git a/external/toolbox_fast_marching/toolbox/check_face_vertex.m b/external/toolbox_fast_marching/toolbox/check_face_vertex.m index f5b768b2..159bd16e 100755 --- a/external/toolbox_fast_marching/toolbox/check_face_vertex.m +++ b/external/toolbox_fast_marching/toolbox/check_face_vertex.m @@ -4,7 +4,7 @@ % % [vertex,face] = check_face_vertex(vertex,face); % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré vertex = check_size(vertex); face = check_size(face); diff --git a/external/toolbox_fast_marching/toolbox/clamp.m b/external/toolbox_fast_marching/toolbox/clamp.m index a27c96fc..ad08f853 100755 --- a/external/toolbox_fast_marching/toolbox/clamp.m +++ b/external/toolbox_fast_marching/toolbox/clamp.m @@ -6,7 +6,7 @@ % % Default is [a,b]=[0,1]. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin<2 a = 0; diff --git a/external/toolbox_fast_marching/toolbox/compute_cuvilinear_abscice.m b/external/toolbox_fast_marching/toolbox/compute_cuvilinear_abscice.m index fd0ba44d..54dbe346 100755 --- a/external/toolbox_fast_marching/toolbox/compute_cuvilinear_abscice.m +++ b/external/toolbox_fast_marching/toolbox/compute_cuvilinear_abscice.m @@ -6,7 +6,7 @@ % % A curve is a ndims x npts matrix. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if size(c,1)>size(c,2) c = c'; diff --git a/external/toolbox_fast_marching/toolbox/compute_distance_to_points.m b/external/toolbox_fast_marching/toolbox/compute_distance_to_points.m index 45b5f74e..1812e40f 100755 --- a/external/toolbox_fast_marching/toolbox/compute_distance_to_points.m +++ b/external/toolbox_fast_marching/toolbox/compute_distance_to_points.m @@ -8,7 +8,7 @@ % 'seeds' is a [d,k] matrix. % D(i,j) = |X(:,j)-seeds(:,i)|^2. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré nbCluster = size(seeds,2); n = size(X,2); diff --git a/external/toolbox_fast_marching/toolbox/compute_edge_face_ring.m b/external/toolbox_fast_marching/toolbox/compute_edge_face_ring.m index 28c084f2..4ae5d017 100755 --- a/external/toolbox_fast_marching/toolbox/compute_edge_face_ring.m +++ b/external/toolbox_fast_marching/toolbox/compute_edge_face_ring.m @@ -7,7 +7,7 @@ % e2f(i,j) and e2f(j,i) are the number of the two faces adjacent to % edge (i,j). % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré [tmp,face] = check_face_vertex([],face); diff --git a/external/toolbox_fast_marching/toolbox/compute_edges.m b/external/toolbox_fast_marching/toolbox/compute_edges.m index 6ab32b78..aacd2c4f 100755 --- a/external/toolbox_fast_marching/toolbox/compute_edges.m +++ b/external/toolbox_fast_marching/toolbox/compute_edges.m @@ -4,7 +4,7 @@ % % edge = compute_edges(face); % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if isempty(face) edges=[]; diff --git a/external/toolbox_fast_marching/toolbox/compute_gaussian_filter.m b/external/toolbox_fast_marching/toolbox/compute_gaussian_filter.m index 4f6b0f48..d43f931e 100755 --- a/external/toolbox_fast_marching/toolbox/compute_gaussian_filter.m +++ b/external/toolbox_fast_marching/toolbox/compute_gaussian_filter.m @@ -17,7 +17,7 @@ % % The filter is normalised so that it sums to 1. % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré nd = 1; if length(n)>1 & n(2)>1 @@ -51,7 +51,7 @@ % % The filter is normalised so that it sums to 1. % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré function f = build_gaussian_filter_2d(n,s,N) @@ -86,7 +86,7 @@ % % f = build_gaussian_filter_1d(n,s,N); % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré function f = build_gaussian_filter_1d(n,s,N) @@ -105,4 +105,4 @@ x = ( (0:n-1)-(n-1)/2 )/(N-1); f = exp( -x.^2/(2*s^2) ); -f = f / sum(f(:)); \ No newline at end of file +f = f / sum(f(:)); diff --git a/external/toolbox_fast_marching/toolbox/compute_grad.m b/external/toolbox_fast_marching/toolbox/compute_grad.m index 24d9019e..88fa5279 100755 --- a/external/toolbox_fast_marching/toolbox/compute_grad.m +++ b/external/toolbox_fast_marching/toolbox/compute_grad.m @@ -19,7 +19,7 @@ % middle of each pixel (be aware that you have a shift of -1/2 on X and Y for % the location of the gradient). % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin<2 options.null = 0; diff --git a/external/toolbox_fast_marching/toolbox/compute_vertex_ring.m b/external/toolbox_fast_marching/toolbox/compute_vertex_ring.m index bdc93e28..02c22798 100755 --- a/external/toolbox_fast_marching/toolbox/compute_vertex_ring.m +++ b/external/toolbox_fast_marching/toolbox/compute_vertex_ring.m @@ -7,7 +7,7 @@ % vring{i} is the set of vertices that are adjacent % to vertex i. % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré [tmp,face] = check_face_vertex([],face); @@ -21,4 +21,4 @@ for m = 1:length(i) vring{i(m)}(end+1) = j(m); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/toolbox/crop.m b/external/toolbox_fast_marching/toolbox/crop.m index dc6824b7..876a8189 100755 --- a/external/toolbox_fast_marching/toolbox/crop.m +++ b/external/toolbox_fast_marching/toolbox/crop.m @@ -7,7 +7,7 @@ % n is the new size of the image % c is the center of the grop % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré n0 = size(M); n0(3) = size(M,3); @@ -55,4 +55,4 @@ selz(selz<1) = []; selz(selz>n0(3)) = []; -M = M(selx,sely,selz); \ No newline at end of file +M = M(selx,sely,selz); diff --git a/external/toolbox_fast_marching/toolbox/getoptions.m b/external/toolbox_fast_marching/toolbox/getoptions.m index c1872c86..41d90a30 100755 --- a/external/toolbox_fast_marching/toolbox/getoptions.m +++ b/external/toolbox_fast_marching/toolbox/getoptions.m @@ -10,7 +10,7 @@ % v = v0; % end % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré if nargin<4 mendatory = 0; @@ -20,4 +20,4 @@ v = eval(['options.' name ';']); elseif mendatory error(['You have to provide options.' name '.']); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/toolbox/imageplot.m b/external/toolbox_fast_marching/toolbox/imageplot.m index 4dda714c..18e0095e 100755 --- a/external/toolbox_fast_marching/toolbox/imageplot.m +++ b/external/toolbox_fast_marching/toolbox/imageplot.m @@ -12,7 +12,7 @@ % If you want to display several images: % imageplot({M1 M2}, {'title1', 'title2'}); % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré if nargin<2 str = []; @@ -142,7 +142,7 @@ % % d = nb_dims(x); % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if isempty(x) d = 0; @@ -153,4 +153,4 @@ if d==2 && (size(x,1)==1 || size(x,2)==1) d = 1; -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/toolbox/load_image.m b/external/toolbox_fast_marching/toolbox/load_image.m index e0fc5990..c012967b 100755 --- a/external/toolbox_fast_marching/toolbox/load_image.m +++ b/external/toolbox_fast_marching/toolbox/load_image.m @@ -13,7 +13,7 @@ % Natural images: % 'boat', 'lena', 'goldhill', 'mandrill', 'maurice', 'polygons_blurred', or your own. % -% Copyright (c) 2004 Gabriel Peyre +% Copyright (c) 2004 Gabriel Peyré if nargin<2 n = 512; @@ -583,7 +583,7 @@ % generate an image M whose Fourier spectrum amplitude is % |M^(omega)| = 1/f^{omega} % -% Copyright (c) 2004 Gabriel Peyr? +% Copyright (c) 2004 Gabriel Peyré if nargin<1 n = 128; @@ -616,7 +616,7 @@ % % The signal is scale in [0,1]. % -% Copyright (c) 2003 Gabriel Peyr? +% Copyright (c) 2003 Gabriel Peyré @@ -673,7 +673,7 @@ % % Works for 2D, 2D 2 or 3 channels, 3D images. % -% Copyright (c) 2004 Gabriel Peyr? +% Copyright (c) 2004 Gabriel Peyré if nargin==2 % size specified as an array diff --git a/external/toolbox_fast_marching/toolbox/mmax.m b/external/toolbox_fast_marching/toolbox/mmax.m index 6c933e6f..8e20a473 100755 --- a/external/toolbox_fast_marching/toolbox/mmax.m +++ b/external/toolbox_fast_marching/toolbox/mmax.m @@ -4,6 +4,6 @@ % % m = mmax(A) % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré m = max(A(:)); \ No newline at end of file diff --git a/external/toolbox_fast_marching/toolbox/nb_dims.m b/external/toolbox_fast_marching/toolbox/nb_dims.m index ea62d80b..aaedcfd9 100755 --- a/external/toolbox_fast_marching/toolbox/nb_dims.m +++ b/external/toolbox_fast_marching/toolbox/nb_dims.m @@ -4,7 +4,7 @@ % % d = nb_dims(x); % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if isempty(x) d = 0; diff --git a/external/toolbox_fast_marching/toolbox/num2string_fixeddigit.m b/external/toolbox_fast_marching/toolbox/num2string_fixeddigit.m index 8f5d14dd..afbb1b0c 100755 --- a/external/toolbox_fast_marching/toolbox/num2string_fixeddigit.m +++ b/external/toolbox_fast_marching/toolbox/num2string_fixeddigit.m @@ -6,7 +6,7 @@ % % examples for d=3: 12.3->'012', 99->'099', 999->'999', 1200->'1200' (overflow). % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré num = round(num); diff --git a/external/toolbox_fast_marching/toolbox/perform_blurring.m b/external/toolbox_fast_marching/toolbox/perform_blurring.m index d279ba84..3c29290d 100755 --- a/external/toolbox_fast_marching/toolbox/perform_blurring.m +++ b/external/toolbox_fast_marching/toolbox/perform_blurring.m @@ -7,7 +7,7 @@ % M is the original data % sigma is the width of blurs (in pixels) % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; n = size(M,1); @@ -17,4 +17,4 @@ p = min(p,round(n/2)*2-1); h = compute_gaussian_filter(p*[1 1],sigma/(2*n),[n n]); -M = perform_convolution(M, h, options); \ No newline at end of file +M = perform_convolution(M, h, options); diff --git a/external/toolbox_fast_marching/toolbox/perform_conjugate_gradient.m b/external/toolbox_fast_marching/toolbox/perform_conjugate_gradient.m index f7f2ce64..737ee4a8 100755 --- a/external/toolbox_fast_marching/toolbox/perform_conjugate_gradient.m +++ b/external/toolbox_fast_marching/toolbox/perform_conjugate_gradient.m @@ -23,7 +23,7 @@ % options.epsilon is maximum error % options.niter_max is maximum number of error % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré options.null = 0; niter = getoptions(options, 'niter_max', 100); @@ -115,4 +115,4 @@ r0 = ( norm(r, 'fro') )^2; %% ... compute norm of new residual k = k + 1; err(end+1) = sqrt(r0); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/toolbox/perform_convolution.m b/external/toolbox_fast_marching/toolbox/perform_convolution.m index 0379b41e..65d7e5c2 100755 --- a/external/toolbox_fast_marching/toolbox/perform_convolution.m +++ b/external/toolbox_fast_marching/toolbox/perform_convolution.m @@ -13,7 +13,7 @@ % 'bound' is either 'per' (periodic extension) % or 'sym' (symmetric extension). % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin<3 bound = 'sym'; diff --git a/external/toolbox_fast_marching/toolbox/perform_curve_resampling.m b/external/toolbox_fast_marching/toolbox/perform_curve_resampling.m index 7dace6d4..4a9c768f 100755 --- a/external/toolbox_fast_marching/toolbox/perform_curve_resampling.m +++ b/external/toolbox_fast_marching/toolbox/perform_curve_resampling.m @@ -11,7 +11,7 @@ % % For 'interp_type', see the 'method' parameter in 'help interp1'. % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré if nargin<3 diff --git a/external/toolbox_fast_marching/toolbox/perform_histogram_equalization.m b/external/toolbox_fast_marching/toolbox/perform_histogram_equalization.m index f66ba0f1..4a292e1e 100755 --- a/external/toolbox_fast_marching/toolbox/perform_histogram_equalization.m +++ b/external/toolbox_fast_marching/toolbox/perform_histogram_equalization.m @@ -20,7 +20,7 @@ % x = perform_histogram_equalization(x,'linear',options); % to impose gaussian or uniform density. % -% Copyright (c) 2006 Gabriel Peyre +% Copyright (c) 2006 Gabriel Peyré @@ -108,4 +108,4 @@ x = x .* s; end -x = reshape(x,sx); \ No newline at end of file +x = reshape(x,sx); diff --git a/external/toolbox_fast_marching/toolbox/perform_image_resize.m b/external/toolbox_fast_marching/toolbox/perform_image_resize.m index a6428ebb..45dfa40b 100755 --- a/external/toolbox_fast_marching/toolbox/perform_image_resize.m +++ b/external/toolbox_fast_marching/toolbox/perform_image_resize.m @@ -8,7 +8,7 @@ % % Works for 2D, 2D 2 or 3 channels, 3D images. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin==2 % size specified as an array diff --git a/external/toolbox_fast_marching/toolbox/perform_tensor_recomp.m b/external/toolbox_fast_marching/toolbox/perform_tensor_recomp.m index e929f04c..54e56153 100755 --- a/external/toolbox_fast_marching/toolbox/perform_tensor_recomp.m +++ b/external/toolbox_fast_marching/toolbox/perform_tensor_recomp.m @@ -12,7 +12,7 @@ % You have % T = l1*e1*e1' + l2*e2*e2' % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré T = zeros( [size(l1),2,2] ); diff --git a/external/toolbox_fast_marching/toolbox/perform_vf_normalization.m b/external/toolbox_fast_marching/toolbox/perform_vf_normalization.m index c23b5517..d3f0aadf 100755 --- a/external/toolbox_fast_marching/toolbox/perform_vf_normalization.m +++ b/external/toolbox_fast_marching/toolbox/perform_vf_normalization.m @@ -4,7 +4,7 @@ % % v2 = perform_vf_normalization(v1); % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré n = sum(v1.^2,3); diff --git a/external/toolbox_fast_marching/toolbox/plot_mesh.m b/external/toolbox_fast_marching/toolbox/plot_mesh.m index 459a1b99..874e3004 100755 --- a/external/toolbox_fast_marching/toolbox/plot_mesh.m +++ b/external/toolbox_fast_marching/toolbox/plot_mesh.m @@ -13,7 +13,7 @@ % % See also: mesh_previewer. % -% Copyright (c) 2004 Gabriel PeyrŽ +% Copyright (c) 2004 Gabriel Peyré if nargin<2 @@ -86,4 +86,4 @@ axis tight; axis equal; -cameramenu; \ No newline at end of file +cameramenu; diff --git a/external/toolbox_fast_marching/toolbox/prod_vf_sf.m b/external/toolbox_fast_marching/toolbox/prod_vf_sf.m index 41ffe2ff..76c7bebe 100755 --- a/external/toolbox_fast_marching/toolbox/prod_vf_sf.m +++ b/external/toolbox_fast_marching/toolbox/prod_vf_sf.m @@ -6,7 +6,7 @@ % % The result is the vector field defined by pointwise product. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré v2 = zeros(size(v1)); diff --git a/external/toolbox_fast_marching/toolbox/progressbar.m b/external/toolbox_fast_marching/toolbox/progressbar.m index 9ab2f2dd..5338e617 100755 --- a/external/toolbox_fast_marching/toolbox/progressbar.m +++ b/external/toolbox_fast_marching/toolbox/progressbar.m @@ -8,7 +8,7 @@ function progressbar(n,N,w) % n should start at 1. % w is the width of the bar (default w=20). % -% Copyright (c) Gabriel PeyrŽ 2006 +% Copyright (c) Gabriel Peyré 2006 if nargin<3 w = 20; @@ -42,4 +42,4 @@ function progressbar(n,N,w) pprev = p; if n==N fprintf('\n'); -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/toolbox/read_mesh.m b/external/toolbox_fast_marching/toolbox/read_mesh.m index b7b55944..4f07fe58 100755 --- a/external/toolbox_fast_marching/toolbox/read_mesh.m +++ b/external/toolbox_fast_marching/toolbox/read_mesh.m @@ -10,7 +10,7 @@ % % Supported file extensions are: .off, .ply, .wrl, .obj, .m, .gim. % -% Copyright (c) 2007 Gabriel Peyre +% Copyright (c) 2007 Gabriel Peyré switch file case {'triangle' 'square' 'square1' 'L' 'L1' 'tetra' 'oct' 'ico' 'rand'} @@ -78,4 +78,4 @@ if strcmp(name, 'mannequin') vertex = -vertex; -end \ No newline at end of file +end diff --git a/external/toolbox_fast_marching/toolbox/read_off.m b/external/toolbox_fast_marching/toolbox/read_off.m index b1aad94a..2581855a 100755 --- a/external/toolbox_fast_marching/toolbox/read_off.m +++ b/external/toolbox_fast_marching/toolbox/read_off.m @@ -7,7 +7,7 @@ % 'vertex' is a 'nb.vert x 3' array specifying the position of the vertices. % 'face' is a 'nb.face x 3' array specifying the connectivity of the mesh. % -% Copyright (c) 2003 Gabriel Peyré +% Copyright (c) 2003 Gabriel Peyré fid = fopen(filename,'r'); diff --git a/external/toolbox_fast_marching/toolbox/rescale.m b/external/toolbox_fast_marching/toolbox/rescale.m index e1afc7bd..a17ca0a5 100755 --- a/external/toolbox_fast_marching/toolbox/rescale.m +++ b/external/toolbox_fast_marching/toolbox/rescale.m @@ -4,7 +4,7 @@ % % y = rescale(x,a,b); % -% Copyright (c) 2004 Gabriel Peyr? +% Copyright (c) 2004 Gabriel Peyré if nargin<2 a = 0; diff --git a/external/toolbox_fast_marching/toolbox/triangulation2adjacency.m b/external/toolbox_fast_marching/toolbox/triangulation2adjacency.m index 2bc6b304..eb70f544 100755 --- a/external/toolbox_fast_marching/toolbox/triangulation2adjacency.m +++ b/external/toolbox_fast_marching/toolbox/triangulation2adjacency.m @@ -7,7 +7,7 @@ % or for getting a weighted graph % A = triangulation2adjacency(face,vertex); % -% Copyright (c) 2005 Gabriel Peyré +% Copyright (c) 2005 Gabriel Peyré [tmp,face] = check_face_vertex([],face); diff --git a/external/toolbox_fast_marching/toolbox_fast_marching.m b/external/toolbox_fast_marching/toolbox_fast_marching.m index 9858ad46..0bf75996 100755 --- a/external/toolbox_fast_marching/toolbox_fast_marching.m +++ b/external/toolbox_fast_marching/toolbox_fast_marching.m @@ -36,11 +36,11 @@ % % perform_fmstar_2d and perform_fmstar_3d implement the algorithm described in % Heuristically Driven Front Propagation for Path Planning and Geodesic Extraction -% Gabriel Peyré and Laurent Cohen, 2005 ,To appear. +% Gabriel Peyré and Laurent Cohen, 2005 ,To appear. % See script test_fmstar_2d and test_fmstar_3d for samples of use. % % The main computation are done in a mex file so it is very % fast (using a C++ heap structure). Precompiled version % for windows are given. % -% Copyright (c) 2005 Gabriel Peyré \ No newline at end of file +% Copyright (c) 2005 Gabriel Peyré \ No newline at end of file diff --git a/external/write_ply.m b/external/write_ply.m index 3e8cd68a..a7c96cb2 100755 --- a/external/write_ply.m +++ b/external/write_ply.m @@ -9,7 +9,7 @@ function write_ply(vertex,face,filename, mode) % % IMPORTANT: works only for triangular meshes. % -% Copyright (c) 2004 Gabriel Peyré +% Copyright (c) 2004 Gabriel Peyré if nargin<4 mode = 'ascii'; diff --git a/matrix/admm.m b/matrix/admm.m index 4aed7106..f353a65e 100644 --- a/matrix/admm.m +++ b/matrix/admm.m @@ -9,7 +9,7 @@ % Z #Z by dim list of dual variables % U #c by dim list of scaled Lagrange multipliers % rho current penalty parameter - % data empty [] on first call, or `data` ouput from previous call + % data empty [] on first call, or `data` output from previous call % Outputs: % X #X by dim list of primary variables % data persistent callback data diff --git a/matrix/affine_null_space.m b/matrix/affine_null_space.m index 79b072db..41831133 100644 --- a/matrix/affine_null_space.m +++ b/matrix/affine_null_space.m @@ -132,7 +132,7 @@ % Assume: (L R') is invertible: % [U11 U12; 0] y = (L R')\(P b) % [U11 U12; 0] y = [b1;b2]; - % Invertible iff b2 = 0 + % Invertible if b2 = 0 % [U11 U12; 0] y = [b1;0]; % y = [U11\b1;y2] for any y2 % And might as well set y2 to 0 diff --git a/matrix/quadprog_box.m b/matrix/quadprog_box.m index 8e86b933..f5243fab 100644 --- a/matrix/quadprog_box.m +++ b/matrix/quadprog_box.m @@ -8,7 +8,7 @@ % [X,state] = quadprog_box(H,f,Aieq,Bieq,Aeq,Beq,lx,ux,X0,state) % % Inputs: - % H #X by #X sparse quadratic coefficients matrix (with Ñ–mplied ½, like + % H #X by #X sparse quadratic coefficients matrix (with implied ½, like % quadprog, but unlike min_quad_with_fixed) % f #X by dim linear quadratic coefficients vector/matrix %% Aieq ignored (todo/match quadprog api) @@ -21,7 +21,7 @@ % X0 #X by dim initial guess {[]} % Outputs: % X #X by dim solution - % state struct containing precomputation information. This is reusable iff + % state struct containing precomputation information. This is reusable if % the H and Aeq do not change. It is OK, for f, Beq, lx and ux to change. % % diff --git a/matrix/sparse_eigs.m b/matrix/sparse_eigs.m index 9767b545..4c63ef53 100644 --- a/matrix/sparse_eigs.m +++ b/matrix/sparse_eigs.m @@ -7,7 +7,7 @@ % Inputs: % L #L by #L sparse, semi-positive definite "stiffness" matrix % D #L by #L diagonal positive definite "mass" matrix - % k number of modes requestedd + % k number of modes requested % mu sparsity parameter (larger is more sparse) {10} % Optional: % 'Method' followed by one of the following: @@ -70,7 +70,7 @@ US = UEUS(n+(1:n),:); % Based on the Python code: Y = Dsqrt*(E-UE + S-US); - % Matlab: [U,S,V] = svd(A) --> U*S*V' = A + % MATLAB: [U,S,V] = svd(A) --> U*S*V' = A % Numpy: [U,S,VT] = svd(A) --> U*S*VT = A [V,W,VT] = svd(Y'*Y); Wisqrt = isqrt(W); @@ -131,8 +131,8 @@ case 'neumann' % Even if I measure the L1 norm of S weighted by vertex area, I'm getting bias % toward higher resolution areas. If I warm start from a regular mesh, this - % almost goes away sugtesting it's a local minimum issue, but there's still - % some assymmetric bais. My only idea to fix this so far is to also measure + % almost goes away suggesting it's a local minimum issue, but there's still + % some asymmetric bias. My only idea to fix this so far is to also measure % the penalties on the auxiliary variables using weighted vertex areas... % (S-Phi)'*M(S-Phi) instead of (S-Phi)'*(S-Phi). This should not change the % actual energy landscape, but maybe knock things into a more fair local @@ -158,7 +158,7 @@ tol_abs = 1e-8; tol_rel = 1e-6; % Python codes uses qr factorization of random numbers in [-1,1] range, - % presummably to start with orthogonal vectors + % presumably to start with orthogonal vectors %[Psi,~] = qr(2*rand(n,k)-1,0); %Phi = Disqrt*Psi; % This is (more) deterministic. The cost is negligible in comparison to the @@ -195,7 +195,7 @@ % Based on the Python code: Y = Dsqrt*(E-UE + S-US); - % Matlab: [U,S,V] = svd(A) --> U*S*V' = A + % MATLAB: [U,S,V] = svd(A) --> U*S*V' = A % Numpy: [U,S,VT] = svd(A) --> U*S*VT = A [V,W,VT] = svd(Y'*Y); Phi_prev = Phi; diff --git a/mesh/apply_ambient_occlusion.m b/mesh/apply_ambient_occlusion.m index 411161eb..cda9f467 100644 --- a/mesh/apply_ambient_occlusion.m +++ b/mesh/apply_ambient_occlusion.m @@ -60,7 +60,7 @@ I = (1:size(V,1))'; nao = size(V,1); N = per_vertex_normals(V,T); - % Matlab uses backwards normals + % MATLAB uses backwards normals t.VertexNormals = -N; lighting phong; elseif size(C,1) == size(F,1) diff --git a/mesh/connectedComponent.m b/mesh/connectedComponent.m index 22ea4ddc..1c588066 100644 --- a/mesh/connectedComponent.m +++ b/mesh/connectedComponent.m @@ -1,6 +1,6 @@ function [C] = connectedComponent(TT,TAG) % CONNECTEDCOMPONENT Compute the connected components of a subset of triangles -% on a tri surface. Two faces are considered connected iff they share an edge. +% on a tri surface. Two faces are considered connected if they share an edge. % % % [C] = connectedComponent(TT,TAG) diff --git a/mesh/connectedComponentV.m b/mesh/connectedComponentV.m index 2cba488e..fc855551 100644 --- a/mesh/connectedComponentV.m +++ b/mesh/connectedComponentV.m @@ -1,6 +1,6 @@ function [C] = connectedComponentV(VV,TAG) % CONNECTEDCOMPONENTV Compute the connected components of a subset of vertices -% on a tri surface. Two vertices are considered connected iff an edge connects +% on a tri surface. Two vertices are considered connected if an edge connects % them. % % [C] = connectedComponent(VV,TAG) diff --git a/mesh/flip_edges.m b/mesh/flip_edges.m index ab3f199b..ab918164 100644 --- a/mesh/flip_edges.m +++ b/mesh/flip_edges.m @@ -72,7 +72,7 @@ uE = unique(sortE,'rows'); DA = sparse(sortE(:,1),sortE(:,2),1-2*(allE(:,2)>allE(:,1)),nv,nv); - % Edge partiy sum adjacency matrix + % Edge parity sum adjacency matrix EP = DA - DA'; % Symmetrize EP = EP + EP'; @@ -140,7 +140,7 @@ new_EE = sort([FF(fJ_left) FF(fJ_right)],2); if ~allow_nm - % If edge-after-flip already exists then this will create a non-manifold + % If edge-after-flip already exists then this will create a non-manifold % edge [found] = ismember(new_EE,uE,'rows'); % If two edges will be the same edge after flip then this will create a diff --git a/mesh/is_boundary_facet.m b/mesh/is_boundary_facet.m index 3d292ce2..7ef5fa09 100644 --- a/mesh/is_boundary_facet.m +++ b/mesh/is_boundary_facet.m @@ -8,7 +8,7 @@ % E #E by element-size-1 list of facets % F #F by element-size list of elements % Outputs: - % B #E list bools. true iff unoriented facet occurs exactly once in F + % B #E list bools. true if unoriented facet occurs exactly once in F % (non-manifold and non-existant edges will be false) % diff --git a/mesh/laplacian_editing_system.m b/mesh/laplacian_editing_system.m index b359f4eb..e634bd33 100644 --- a/mesh/laplacian_editing_system.m +++ b/mesh/laplacian_editing_system.m @@ -28,7 +28,7 @@ if(isempty(F) || size(F,2) ==2) % curve case %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % Matlab script for 2D Laplacian Editing + % MATLAB script for 2D Laplacian Editing % % Please refer to "Laplacian Surface Editing" by Olga Sorkine, % Daniel Cohen-Or, Yaron Lipman, Marc Alexa, Christian Rössl and diff --git a/mesh/linear_elasticity.m b/mesh/linear_elasticity.m index 882ea401..513330d7 100644 --- a/mesh/linear_elasticity.m +++ b/mesh/linear_elasticity.m @@ -100,7 +100,7 @@ mu = .5.*young./(1+nu); end - % This matches the matlab code by Jonas Koko, in + % This matches the MATLAB code by Jonas Koko, in % "Vectorized Matlab Codes for Linear Two-Dimensional Elasticity" % Gradient/divergence operator diff --git a/mesh/loop.m b/mesh/loop.m index 3589f0d2..55be07a9 100644 --- a/mesh/loop.m +++ b/mesh/loop.m @@ -1,5 +1,5 @@ function [VV,FF,SS,J] = loop(V,F,iter) -% LOOP perform loop subdivision. After n iterations of loop subivision, the +% LOOP perform loop subdivision. After n iterations of loop subdivision, the % resulting mesh will have % 4^n |F| faces % 2^(n-1)*(2*|E| + 3*|F|*(2^n-1)) edges diff --git a/mesh/readWRL.m b/mesh/readWRL.m index ed1efce4..3acb79a2 100644 --- a/mesh/readWRL.m +++ b/mesh/readWRL.m @@ -3,7 +3,7 @@ % % [V, F] = readWRL(filename); % -% Copyright (c) 2004 Gabriel Peyr +% Copyright (c) 2004 Gabriel Peyré fp = fopen(filename,'r'); if fp == -1 diff --git a/mesh/slice_triangles.m b/mesh/slice_triangles.m index cf7b64d7..82dad8b5 100644 --- a/mesh/slice_triangles.m +++ b/mesh/slice_triangles.m @@ -13,7 +13,7 @@ % HACK! [U,E,J] = slice_tets(V,F(:,[1 2 3 3]),plane); - % matlab fails to reutrn one face as row vecto + % MATLAB fails to return one face as row vector if size(E,2) == 1 && size(E,1) == 3 E = E'; end diff --git a/mesh/split_edges.m b/mesh/split_edges.m index 5425c1d1..8790ed23 100644 --- a/mesh/split_edges.m +++ b/mesh/split_edges.m @@ -44,7 +44,7 @@ uE = unique(sortE,'rows'); DA = sparse(sortE(:,1),sortE(:,2),1-2*(allE(:,2)>allE(:,1)),nv,nv); - % Edge partiy sum adjacency matrix + % Edge parity sum adjacency matrix EP = DA - DA'; % Symmetrize EP = EP + EP'; diff --git a/mesh/stiff_points_lbs.m b/mesh/stiff_points_lbs.m index e7b100ed..2685d120 100644 --- a/mesh/stiff_points_lbs.m +++ b/mesh/stiff_points_lbs.m @@ -43,9 +43,9 @@ % and Rij is the bone rotation of points i and j % Mask weights with bone incidence - % M(i,k) is 1 iff handle i is incident on bone k + % M(i,k) is 1 if handle i is incident on bone k M = sparse([SE(:,1)' SE(:,2)'],[1:ns 1:ns],1); - % M(j,i,k) is 1 only iff handle i is incident on bone k + % M(j,i,k) is 1 only if handle i is incident on bone k M = permute(repmat(full(M),[1 1 n]),[3 1 2]); WSP = permute(repmat(WS,[1 1 np]),[1 3 2]) .* M; % normalize per vertex per handle diff --git a/mesh/surface_graph.m b/mesh/surface_graph.m index fca975fc..836898d3 100644 --- a/mesh/surface_graph.m +++ b/mesh/surface_graph.m @@ -8,7 +8,7 @@ % % Inputs: % P #P by 3 list input points - % V #V by 3 list of mesh veretex positions + % V #V by 3 list of mesh vertex positions % F #F by 3 list of triangle indices into V % Outputs: % E #E by 2 list of edge indices into P diff --git a/mesh/total_signed_curvature.m b/mesh/total_signed_curvature.m index 89340e24..11c648a1 100644 --- a/mesh/total_signed_curvature.m +++ b/mesh/total_signed_curvature.m @@ -9,7 +9,7 @@ % P #P by 2 list of positions of a closed piecewise-linear curve % or % P #P by 2 list of positions - % E #E by 2 list of orientedd edge indices into P + % E #E by 2 list of oriented edge indices into P % Outputs: % tsc total signed curvature scalar, should be 2*pi*k where k∈0,1,2,... % alpha #P by 1 list of exterior angles (boundaries will get 0) diff --git a/mesh/triangles_from_edges.m b/mesh/triangles_from_edges.m index 2d4edab1..ac8f78e9 100644 --- a/mesh/triangles_from_edges.m +++ b/mesh/triangles_from_edges.m @@ -20,7 +20,7 @@ % If there exists exactly two unique paths from an edge to a vertex then both % endpoints must be connected to the edge (no other way to get two paths). % - % 3-clique iff #paths from edge to vertex == 2 + % 3-clique if #paths from edge to vertex == 2 [I,J] = find(E2V*V2V==2); F = unique(sort([E(I,:) J],2),'rows'); end diff --git a/mesh/tt.m b/mesh/tt.m index d9dc27c9..6393ef73 100644 --- a/mesh/tt.m +++ b/mesh/tt.m @@ -41,7 +41,7 @@ Ei = sparse(E(:,1),E(:,2),1:size(E,1)); % adjacency list of edges as if edges represent undirected graph unadj = Ei>0; - % "non-adjacency" list, (i,j) > 0 iff i-->j exists but j-->i does not exist + % "non-adjacency" list, (i,j) > 0 if i-->j exists but j-->i does not exist nonadj = unadj-(unadj'); adj = ((unadj + nonadj)==1).*Ei; diff --git a/mesh/upsample.m b/mesh/upsample.m index 16807160..4cfc399a 100644 --- a/mesh/upsample.m +++ b/mesh/upsample.m @@ -1,6 +1,6 @@ function [VV,FF,FO] = upsample(V,F,varargin) % UPSAMPLE Upsample a mesh by adding vertices on existing edges/faces After n - % iterations of loop subivision, the resulting mesh will have + % iterations of loop subdivision, the resulting mesh will have % 4^n |F| faces % 2^n*|E| + 3*2^(n-1)*(2^n-1))*|F| edges % |V| + (2^n-1)|E| + (1+2^(n-1)*(2^n-3))*|F| vertices diff --git a/mex/ambient_occlusion.cpp b/mex/ambient_occlusion.cpp index 858619d7..5056302b 100644 --- a/mex/ambient_occlusion.cpp +++ b/mex/ambient_occlusion.cpp @@ -9,7 +9,7 @@ #include #include -// Parse right hand side arguments for a matlab mex function. +// Parse right hand side arguments for a MATLAB mex function. // // Inputs: // nrhs number of right hand side arguments @@ -20,7 +20,7 @@ // P #P by 3 list of origin points // N #P by 3 list of origin normals // num_samples number of samples -// Throws matlab errors if dimensions are not sane. +// Throws MATLAB errors if dimensions are not sane. void parse_rhs( const int nrhs, const mxArray *prhs[], @@ -78,7 +78,7 @@ void parse_rhs( void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { - // This is useful for debugging whether Matlab is caching the mex binary + // This is useful for debugging whether MATLAB is caching the mex binary //mexPrintf("%s %s\n",__TIME__,__DATE__); igl::matlab::MexStream mout; std::streambuf *outbuf = std::cout.rdbuf(&mout); diff --git a/mex/fit_rotations_mex.cpp b/mex/fit_rotations_mex.cpp index 6adfbc93..602bbedb 100644 --- a/mex/fit_rotations_mex.cpp +++ b/mex/fit_rotations_mex.cpp @@ -20,7 +20,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { - // This is useful for debugging whether Matlab is caching the mex binary + // This is useful for debugging whether MATLAB is caching the mex binary //mexPrintf("%s %s\n",__TIME__,__DATE__); igl::matlab::MexStream mout; std::streambuf *outbuf = std::cout.rdbuf(&mout); diff --git a/mex/intersect_other.cpp b/mex/intersect_other.cpp index 567d7c61..9ac0c7ce 100644 --- a/mex/intersect_other.cpp +++ b/mex/intersect_other.cpp @@ -38,7 +38,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { - // This is useful for debugging whether Matlab is caching the mex binary + // This is useful for debugging whether MATLAB is caching the mex binary //mexPrintf("%s %s\n",__TIME__,__DATE__); igl::matlab::MexStream mout; std::streambuf *outbuf = std::cout.rdbuf(&mout); diff --git a/mex/point_mesh_squared_distance.cpp b/mex/point_mesh_squared_distance.cpp index cad4a9d8..679b974c 100644 --- a/mex/point_mesh_squared_distance.cpp +++ b/mex/point_mesh_squared_distance.cpp @@ -16,7 +16,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { - // This is useful for debugging whether Matlab is caching the mex binary + // This is useful for debugging whether MATLAB is caching the mex binary //mexPrintf("%s %s\n",__TIME__,__DATE__); igl::matlab::MexStream mout; std::streambuf *outbuf = std::cout.rdbuf(&mout); diff --git a/mex/reorient_facets.cpp b/mex/reorient_facets.cpp index d7544cb2..e838fc02 100644 --- a/mex/reorient_facets.cpp +++ b/mex/reorient_facets.cpp @@ -16,7 +16,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { using namespace igl::matlab; - // This is useful for debugging whether Matlab is caching the mex binary + // This is useful for debugging whether MATLAB is caching the mex binary //mexPrintf("%s %s\n",__TIME__,__DATE__); MexStream mout; std::streambuf *outbuf = std::cout.rdbuf(&mout); diff --git a/mex/selfintersect.cpp b/mex/selfintersect.cpp index 9cf78804..511e147b 100644 --- a/mex/selfintersect.cpp +++ b/mex/selfintersect.cpp @@ -35,7 +35,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { - // This is useful for debugging whether Matlab is caching the mex binary + // This is useful for debugging whether MATLAB is caching the mex binary //mexPrintf("%s %s\n",__TIME__,__DATE__); igl::matlab::MexStream mout; std::streambuf *outbuf = std::cout.rdbuf(&mout); diff --git a/mex/solid_angle.cpp b/mex/solid_angle.cpp index 5bc1b1d5..d83c7dd5 100644 --- a/mex/solid_angle.cpp +++ b/mex/solid_angle.cpp @@ -160,7 +160,7 @@ void solid_angle_mex2( } //mexPrintVector(v[t],true); // finish edge length computation - // Matlab crashes on NaN + // MATLAB crashes on NaN if(vl[t]!=0) { vl[t] /= sqrt(vl[t]); diff --git a/utility/finish.m b/utility/finish.m index ffb724d1..48b46fc4 100755 --- a/utility/finish.m +++ b/utility/finish.m @@ -37,7 +37,7 @@ end catch preserve_history_failed_ = true; - disp Exiting Matlab was halted so you can investigate. - disp Type "preserve_history" after you fix it before exiting this Matlab session. + disp Exiting MATLAB was halted so you can investigate. + disp Type "preserve_history" after you fix it before exiting this MATLAB session. end end