Commit ac5fa5d1 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.26.3 

-- Code cleanup delete unused files.
-- Return empty char string if config parameter isn't found instead of empty cell array
-- Fix reposition of duplicate figure in PlotProbeGUI ot make sure it stays within screen bounds
parent 15cf93e8

PlotProbeGUI/PlotProbeGUI.m

+8 −4
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ for iBlk=1:nDataBlks 
    plotProbeAndSetProperties(handles, iBlk, length(plotprobe.handles.data)+1);

end

plotprobe.handles.figureDup = handles.figureDup;



rePositionGuiWithinScreen(plotprobe.handles.figureDup);
@@ -595,9 +595,13 @@ end 
if ~isempty(plotprobe.updateParentGui) 

	plotprobe.updateParentGui('PlotProbeGUI');

end

if ishandles(plotprobe.handles.figureDup)

    delete(plotprobe.handles.figureDup);

end



% Removed closing of duplicate figure at users' request

% JD: Oct 22, 2020



% if ishandles(plotprobe.handles.figureDup)

%     delete(plotprobe.handles.figureDup);

% end

Utils/ConfigFileClass.m

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ classdef ConfigFileClass < FileClass 
        

        % -------------------------------------------------------------------------------------------------

        function val = GetValue(obj, section)

            val = {};

            val = '';

            if nargin<2

                return;

            end

Utils/comp_struct.m

deleted100644 → 0
+0 −233
Original line number Diff line number Diff line 
function [fs1, fs2, er] = comp_struct(s1,s2,n1,n2,p,tol)

% check two structures for differances - i.e. see if strucutre s1 == structure s2

% function [fs1, fs2, er] = comp_struct(s1,s2,n1,n2,p,tol)

%

% inputs  6 - 5 optional

% s1      structure one                              class structure

% s2      structure two                              class structure - optional

% n1      first structure name (variable name)       class char - optional

% n2      second structure name (variable name)      class char - optional

% p       pause flag (0 / 1)                         class integer - optional

% tol     tol default tolerance (real numbers)       class integer - optional

%

% outputs 3 - 3 optional

% fs1     non-matching feilds for structure one      class cell - optional

% fs2     non-matching feilds for structure two      class cell - optional

% er      error flag (value)                         class 

%

% example:      [r1 r2] = comp_struct(data1,data2,'data1','data2',1)

% Created michael arant - april 5 2003

% Modified by jay dubb - january, 21,2011

%

% Hint:

% passing just one structure causes the program to copy the structure

% and compare the two.  This is an easy way to list the structure

%





mode=0;



if nargin < 1; help comp_struct; error('I / O error'); end

if nargin < 2; s2 = s1; end

if nargin < 3; n1 = 's1'; end

if nargin < 4; n2 = 's2'; end

if nargin < 5; p = 0; elseif p ~= 1 && p ~= 0; p = 0; end

if nargin < 6; tol = 1e-6; end



% define fs

fs1 = {}; fs2 = {}; er = {};



% are the variables structures

if isstruct(s1) && isstruct(s2) && (length(s1) == length(s2))



    if(isempty(s1))

        return;

    end



    % both structures - get the field names

    fn1 = fieldnames(s1);

    fn2 = fieldnames(s2);



    % loop through structure 1 and match to structure 2

    pnt1 = zeros(1,length(fn1));

    for ii = 1:length(fn1)

        for jj = 1:length(fn2)

            if strcmp(fn1(ii),fn2(jj)); pnt1(ii) = jj; end

        end

    end

    pnt2 = zeros(1,length(fn2));

    for ii = 1:length(fn2)

        for jj = 1:length(fn1)

            if strcmp(fn2(ii),fn1(jj)); pnt2(ii) = jj; end

        end

    end



    % get un-matched fields

    for ii = find(~pnt1)

        fs1 = [fs1; {[char(n1) '.' char(fn1(ii))]}];

        fs2 = [fs2; {''}]; er = [er; {'Un-matched'}];

    end

    for ii = find(~pnt2)

        fs2 = [fs2; {[char(n2) '.' char(fn2(ii))]}];

        fs1 = [fs1; {''}]; er = [er; {'Un-matched'}];

    end



    pnt1i = find(pnt1); pnt2i = find(pnt2);

    for ii=1:numel(pnt1i)

        % added loop for indexed structured variables

        for jj = 1:size(s1,2)

            % clean display - add index if needed

            if size(s1,2) == 1

                n1p = [n1 '.' char(fn1(pnt1i(ii)))];

                n2p = [n2 '.' char(fn2(pnt2i(ii)))];

            else

                n1p = [n1 '(' num2str(jj) ').' char(fn1(ii))]; ...

                       n2p = [n2 '(' num2str(jj) ').' char(fn2(pnt2(ii)))];

            end

            [fss1 fss2 err] = comp_struct(getfield(s1(jj),char(fn1(pnt1i(ii)))), ...

                                          getfield(s2(jj),char(fn2(pnt2i(ii)))),n1p,n2p,p);

            if ~iscell(err); 

                err = cellstr(err); 

            end

            fs1 = [fs1; fss1]; 

            fs2 = [fs2; fss2]; 

            er = [er; err];

        end

    end

elseif isstruct(s1) ~= isstruct(s2)

    % one structure, one not

    er{1} = 'Type mismatch';

    display_cond(sprintf('%s        %s              Type mismatch - NOT equal',n1,n2),mode);    

    fs1 = n1; 

    fs2 = n2; 

    if p; display_cond('Paused .....',mode); pause; end

elseif (isstruct(s1) && isstruct(s2)) && (length(s1) ~= length(s2))

    % both are structures but of different lengths

    er{1} = 'Length mismatch';

    display_cond(sprintf('%s        %s              Length mismatch',n1,n2),mode);

    fs1 = n1; 

    fs2 = n2; 

    if p; display_cond('Paused .....',mode); pause; end

elseif isa(s1,'sym') && isa(s2,'sym')

    % compare two symbolic expresions

    % direct compare

    [ss1 r] = simple(s1); [ss2 r] = simple(s2);

    t = isequal(simplify(ss1),simplify(ss2));

    if ~t

        % could still be equal, but not able to reduce the symbolic expresions

        % get factors

        f1 = findsym(ss1); f2 = findsym(ss2);

        w = warning; 

        if isequal(f1,f2)

            % same symbolic variables.  same eqn?

            temp = [1 findstr(f1,' ') + 1]; tres = NaN * zeros(1,30);

            for jj = 1:1e3

                ss1e = ss1; ss2e = ss2;

                for ii = 1:length(temp);

                    tv = (real(rand^rand)) / (real(rand^rand));

                    ss1e = subs(ss1e,f1(temp(ii)),tv);

                    ss2e = subs(ss2e,f2(temp(ii)),tv);

                end



                % check for match

                if isnan(ss1e) || isnan(ss2e)

                    tres(jj) = 1;

                elseif (double(ss1e) - double(ss2e)) < tol

                    tres(jj) = 1;

                end

            end



            % now check symbolic equation results

            if sum(tres) == length(tres)

                % symbolics assumed to be the same equation

                t = 1;

            end

        end

        warning(w)

    end

    if t

        display_cond(sprintf('%s        %s              match',n1,n2),mode)

    else

        display_cond(sprintf('%s        %s              do NOT match',n1,n2),mode)

        fs1 = n1; 

        fs2 = n2; 

        er{1} = 'Symbolic disagreement';

    end

else

    % neither is a structure - compare directly

    if isequal(s1,s2);

        display_cond(sprintf('%s        %s              match',n1,n2),mode)

    else

        % check for "false" failures

        % check structure size

        if strcmp(num2str(size(s1)),num2str(size(s2)))

            % structures are same size - check for precision error if numbers

            if ischar(s1) || iscell(s1) || ...

                (isnumeric(s1) && isnumeric(s2) && (max(max(max(abs(s1 - s2)))) > tol * (max(max(max([s1 s2]))) ...

                - min(min(min([s1 s2]))))))

            

                % same size, diferent values or not numbers

                display_cond(sprintf('%s        %s              do NOT match',n1,n2),mode)

                fs1 = [fs1; {n1}]; fs2 = [fs2; {n2}]; er = [er; {'?'}];

                if ischar(s1)

                    er1{1} = sprintf('%s is char - %s',n1,char(s1)); display_cond(er1,mode);

                end

                if ischar(s2)

                    er2{1} = sprintf('%s is char - %s',n2,char(s2)); display_cond(er2,mode);

                end

                if exist('er1','var') && exist('er2','var')

                    er = [er; {[er1 ' ---> ' er2]}];

                end

                if ~ischar(s1) && ~iscell(s1);

                    er{1} = sprintf('Max error (%%) = %g%%', ...

                                  max(max(max(abs(s1 - s2)))) / ...

                                  (max(max(max([s1 s2]))) - min(min(min([s1 s2])))));

                    display_cond(er,mode);

                end

                if p; 

                    display_cond('Paused .....',mode); 

                    pause; 

                end

            else

                % tolerance agreement

                display_cond(sprintf('%s        %s              tolerance match',n1,n2),mode)

            end

        else

            % size difference

            display_cond(sprintf('%s        %s              do NOT match - DIFFERENT SIZES',n1,n2),mode)

            fs1 = [fs1; {n1}]; fs2 = [fs2; {n2}]; er = [er; {'String size error'}];

            if p; 

                display_cond('Paused .....',mode); 

                pause; 

            end

        end

    end

end



% display non matching fields

if ~isempty(fs1)

    for ii = 1:length(fs1)

        if strcmp(n1,fs1(ii))

            display_cond(sprintf('First Structure non-matched fields:        %s',[n1]),mode)

        end

        if p; display_cond('Paused .....',mode); pause; end

    end

end

if ~isempty(fs2)

    for ii = 1:length(fs2)

        if strcmp(n2,fs2(ii))

            display_cond(sprintf('Second Structure non-matched fields:       %s',[n2]),mode)

        end

        if p; display_cond('Paused .....',mode); pause; end

    end

end









function display_cond(str,mode)

if(mode==1)

    disp(str);

elseif(mode==0)

    return;

end

Utils/data_diff.m

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
%

% data_diff.m

%

% Usage:

%    status = data_diff(data1,data2)

%

% Description:

%    Compares two structures and reports on their difference.

% 

% Input: 

%    data1 first structure 

%    data2 second structure

%

% Output: 

%    0 if data1 and data2 are identical

%    1 if the fields are the same but the values aren't

%    2 if the fields aren't the same.

%

% Authors: 

%    Michael Arant - original author of comp_struct.m which this function

%                    uses to compare structures.

%    Jay Dubb      - author of this function and contributor to comp_struct.m

%

function status = data_diff(data1,data2)



status = 0;

if isempty(data1) && ~isempty(data2)

    status = 2;

    return;

end

if ~isempty(data1) && isempty(data2)

    status = 2;

    return;

end



[foo1 foo2 err] = comp_struct(data1,data2);



if ~isempty(foo1) || ~isempty(foo2) || ~isempty(err)

    status = 1;

end



for ii=1:length(foo1)

    if ~isempty(err) && strcmp(err{1},'Type mismatch')

        status=2;

        break;

    end

    if ~ischar(foo1{ii}) || isempty(foo1{ii})

        status=2;

        break;

    end

    if ~ischar(foo2{ii}) || isempty(foo2{ii})

        status=2;

        break;

    end

end

Utils/diffvars.m

deleted100644 → 0
+0 −110
Original line number Diff line number Diff line 
function diffvars(v1,v2,v1name,v2name)



if nargin==2

    v1name = inputname(1);

    v2name = inputname(2);

end

if isempty(v1name)

    v1name = 'v1';

end

if isempty(v2name)

    v2name = 'v2';

end



logger = LogClass();

varcmp(v1, v2, v1name, v2name, logger);

clear logger;





% --------------------------------------------------------------

function varcmp(v1, v2, v1name, v2name, logger)



if nargin==2

    v1name = inputname(1);

    v2name = inputname(2);

end

if isempty(v1name)

    v1name = 'v1';

end

if isempty(v2name)

    v2name = 'v2';

end



if ndims(v1) ~= ndims(v2)

    logger.Write(sprintf('%s ~= %s: ndims\n', v1name, v2name));

    return;

elseif ~all(size(v1) == size(v2))

    logger.Write(sprintf('%s ~= %s: size\n', v1name, v2name));

    return;

elseif ~strcmp(class(v1), class(v2))

    logger.Write(sprintf('%s ~= %s: class\n', v1name, v2name));

    return;

elseif length(v1(:))>20

    if ~isequaln(v1,v2)

        logger.Write(sprintf('%s ~= %s\n', v1name, v2name));

    end

    return;

end





kk=0;

if isbasictype(v1)

    

    for ii=1:length(v1(:))

        if ~isequaln(v1(ii),v2(ii))

            if kk>20

                continue;

            end

            logger.Write(sprintf('%s(%d) ~= %s(%d)\n', v1name, ii, v2name, ii));

            kk=kk+1;

        end

    end

    

elseif iscell(v1)

    

    for ii=1:length(v1(:))

        if ~isequal(v1{ii},v2{ii})

            if kk>20

                continue;

            end

            logger.Write(sprintf('%s{%d} ~= %s{%d}\n', v1name, ii, v2name, ii));

            kk=kk+1;

        end

    end

    

else

    

    fields = unique([propnames(v1); propnames(v2)]);

    for ii=1:length(v1(:))

        for jj=1:length(fields)

            if ~isproperty(v2(ii),fields{jj})

                if kk>20

                    continue;

                end

                logger.Write(sprintf('%s(%d) ~= %s(%d): field %s exists in %s(%d) but not %s(%d)\n', ...

                         v1name, ii, v2name, ii, fields{jj}, v1name, ii, v2name, ii));

                kk=kk+1;

            elseif ~isproperty(v1(ii),fields{jj})

                if kk>20

                    continue;

                end

                logger.Write(sprintf('%s(%d) ~= %s(%d): field %s exists in %s(%d) but not %s(%d)\n', ...

                         v1name, ii, v2name, ii, fields{jj}, v2name, ii, v1name, ii));

                kk=kk+1;

            else

                if v1name(end)==')'

                    eval( sprintf('varcmp(v1(%d).%s, v2(%d).%s, ''%s.%s'', ''%s.%s'', logger);', ...

                        ii, fields{jj}, ii, fields{jj}, v1name, fields{jj}, v2name, fields{jj}) );

                else

                    eval( sprintf('varcmp(v1(%d).%s, v2(%d).%s, ''%s(%d).%s'', ''%s(%d).%s'', logger);', ...

                        ii, fields{jj}, ii, fields{jj}, v1name, ii, fields{jj}, v2name, ii, fields{jj}) );

                end

            end

        end

    end

    

end

CRA Git | Maintained and supported by SUSTech CRA and CCSE