Commit 1e952db 1 parent f41538f commit 1e952db Copy full SHA for 1e952db
File tree 1 file changed +9
-4
lines changed
1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change 1405
1405
% adjust nsamp if it is greater than (n p)
1406
1406
if nsamp_gt_ncomb
1407
1407
if isscalar(options .nsamp )
1408
- options.nsamp = ncomb ;
1409
1408
disp([' It is reduced to (n p)=' num2str(ncomb )]);
1409
+ options.nsamp = ncomb ;
1410
1410
elseif numel(options .nsamp ) == 2
1411
+ disp([' nsamp(1) reduced from ' num2str(options .nsamp(1 )) ' to ' num2str(ncomb ) ]);
1411
1412
options .nsamp(1 ) = min(options .nsamp(1 ) , ncomb );
1412
- options .nsamp(2 ) = min(options .nsamp(2 ) , ncomb );
1413
- disp([' It is reduced to nsamp(1)=' num2str(options .nsamp(1 )) ' and nsamp(2)=' num2str(options .nsamp(2 ))]);
1414
1413
end
1415
1414
end
1416
1415
1524
1523
% vector.
1525
1524
LSH = lshift(: )' ;
1526
1525
% total number of subsets to pass to procedure subsets.
1527
- ncombLSH = bc(T - 1 - nummissing ,pini + 1 ); % DDD
1526
+ ncombLSH = bc(T - 1 - nummissing ,pini + 1 );
1527
+ if numel(options .nsamp ) == 2
1528
+ if options .msg == 1 && options .nsamp(2 ) > ncombLSH
1529
+ disp([' nsamp(2) > ncombLSH: only ' num2str(ncombLSH ) , ' samples are used' ]);
1530
+ end
1531
+ nsampsubsequentsteps = min(options .nsamp(2 ) , ncombLSH );
1532
+ end
1528
1533
else
1529
1534
LSH= 0 ;
1530
1535
ncombLSH= 0 ;
You can’t perform that action at this time.
0 commit comments