From ac2a61d9bb6a98be8319d68d21d40a8ef9d142c5 Mon Sep 17 00:00:00 2001
From: Laura Nervo <lnervo@esrf.fr>
Date: Mon, 3 Dec 2012 10:34:41 +0000
Subject: [PATCH] renamed findIndexesMultiCols.m
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@940 4c865b51-4357-4376-afb4-474e03ccb993
---
...IndecesMultiCols.m => findIndexesMultiCols.m} | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
rename zUtil_Maths/{findIndecesMultiCols.m => findIndexesMultiCols.m} (72%)
diff --git a/zUtil_Maths/findIndecesMultiCols.m b/zUtil_Maths/findIndexesMultiCols.m
similarity index 72%
rename from zUtil_Maths/findIndecesMultiCols.m
rename to zUtil_Maths/findIndexesMultiCols.m
index b515edc0..eb6cfaae 100644
--- a/zUtil_Maths/findIndecesMultiCols.m
+++ b/zUtil_Maths/findIndexesMultiCols.m
@@ -1,6 +1,6 @@
-function [index,outlist] = findIndecesMultiCols(inlist,values,toll)
-% FINDINDECESMULTICOLS Finds values into a list with a tollerance
-% [index,outlist] = findIndecesMultiCols(inlist,values,toll)
+function [index,outlist] = findIndexesMultiCols(inlist,values,toll)
+% FINDINDEXESMULTICOLS Finds values into a list with a tollerance
+% [index,outlist] = findIndexesMultiCols(inlist,values,toll)
% ----------------------------------------------------------
% INPUT:
% inlist = <double> can be a matrix
@@ -11,6 +11,7 @@ function [index,outlist] = findIndecesMultiCols(inlist,values,toll)
% index = indexes of values in inlist <double>
% outlist = inlist(index,:) <double>
%
+%
% Version 002 04-09-2012 by LNervo
@@ -19,18 +20,21 @@ if ~exist('toll','var') || isempty(toll)
end
ind = [];
-for ii=1:length(values)
+for ii=1:size(values,1)
if size(toll,2)==1
disp(['x < ' num2str(values(ii,1)+toll(1)) ' & x > ' num2str(values(ii,1)-toll(1))])
ind=[ind; find(inlist(:,1) < values(ii,1) + toll(1) & inlist(:,1) > values(ii,1) - toll(1))];
elseif size(toll,2)==2
- disp(['x < ' num2str(values(ii,1)+toll(1)) ' & x > ' num2str(values(ii,1)-toll(1)) ' & y < ' num2str(values(ii,2)+toll(2)) ' & y > ' num2str(values(ii,2)-toll(2))])
+ disp(['x < ' num2str(values(ii,1)+toll(1)) ' & x > ' num2str(values(ii,1)-toll(1)) ...
+ ' & y < ' num2str(values(ii,2)+toll(2)) ' & y > ' num2str(values(ii,2)-toll(2))])
ind=[ind; find(inlist(:,1) < values(ii,1) + toll(1) & inlist(:,1) > values(ii,1) - toll(1) & ...
inlist(:,2) < values(ii,2) + toll(2) & inlist(:,2) > values(ii,2) - toll(2)) ];
elseif size(toll,2)==3
- disp(['x < ' num2str(values(ii,1)+toll(1)) ' & x > ' num2str(values(ii,1)-toll(1)) ' & y < ' num2str(values(ii,2)+toll(2)) ' & y > ' num2str(values(ii,2)-toll(2)) ' & z < ' num2str(values(ii,3)+toll(3)) ' & z > ' num2str(values(ii,3)-toll(3))])
+ disp(['x < ' num2str(values(ii,1)+toll(1)) ' & x > ' num2str(values(ii,1)-toll(1)) ...
+ ' & y < ' num2str(values(ii,2)+toll(2)) ' & y > ' num2str(values(ii,2)-toll(2)) ...
+ ' & z < ' num2str(values(ii,3)+toll(3)) ' & z > ' num2str(values(ii,3)-toll(3))])
ind=[ind; find(inlist(:,1) < values(ii,1) + toll(1) & inlist(:,1) > values(ii,1) - toll(1) & ...
inlist(:,2) < values(ii,2) + toll(2) & inlist(:,2) > values(ii,2) - toll(2) & ...
inlist(:,3) < values(ii,3) + toll(3) & inlist(:,3) > values(ii,3) - toll(3))];
--
GitLab