From 1ecd915911da43e823f3a5e622a7883ffef83e13 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <Olivier.Sauter@epfl.ch>
Date: Thu, 19 Mar 2020 18:47:32 +0100
Subject: [PATCH] replace contains with regexp
---
matlab/TCV/gdat_tcv.m | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 1a46f4d0..fda7a801 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -369,8 +369,10 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi')
if liuqe_matlab==0 && strcmp(mapping_for_tcv.method,'tdiliuqe'); substr_tdi = substr_liuqe; end
if iscell(mapping_for_tcv.expression)
if length(mapping_for_tcv.expression)>0
+ aaa_tmp = regexp(mapping_for_tcv.expression{1},{'toray','conf','ibs','proffit','astra'});
if ~isempty(gdat_data.gdat_params.trialindx) && gdat_data.gdat_params.trialindx >= 0 ...
- && contains(mapping_for_tcv.expression{1},{'toray','conf','ibs','proffit','astra'})
+ && ~isempty([aaa_tmp{:}])
+ % contains(mapping_for_tcv.expression{1},{'toray','conf','ibs','proffit','astra'}) % OS: contains not available in matlab850
ij = findstr(mapping_for_tcv.expression{1},':trial');
if isempty(ij)
aa = [mapping_for_tcv.expression{1} ':trial'];
@@ -424,8 +426,10 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi')
end
eval_expr = ['tdi(''' begstr mapping_for_tcv_expression_eff substr_liuqe ''');']
else
+ aaa_tmp = regexp(mapping_for_tcv.expression,{'toray','conf','ibs','proffit','astra'});
if ~isempty(gdat_data.gdat_params.trialindx) && gdat_data.gdat_params.trialindx >= 0 ...
- && contains(mapping_for_tcv.expression,{'toray','conf','ibs','proffit','astra'})
+ && ~isempty([aaa_tmp{:}])
+ % contains(mapping_for_tcv.expression,{'toray','conf','ibs','proffit','astra'}) % OS: not available in matlab850
ij = findstr(mapping_for_tcv.expression,':trial');
if isempty(ij)
aa = [mapping_for_tcv.expression ':trial'];
--
GitLab