Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 9857958a authored by hhakim's avatar hhakim
Browse files

Fix a bug in matfaust.FaustFactory.fact_*() functions: the parameter is_update_way_R2L was ignored.

parent 2a4e557b
Branches
Tags
No related merge requests found
...@@ -98,7 +98,7 @@ classdef FaustFactory ...@@ -98,7 +98,7 @@ classdef FaustFactory
mex_constraints{i} = cur_cell; mex_constraints{i} = cur_cell;
end end
% put mex_constraints in a cell array again because mex eats one level of array % put mex_constraints in a cell array again because mex eats one level of array
mex_params = struct('data', M, 'nfacts', p.num_facts, 'cons', {mex_constraints}, 'init_facts', {p.init_facts}, 'niter', p.stop_crit.num_its, 'sc_is_criterion_error', p.stop_crit.is_criterion_error, 'sc_error_treshold', p.stop_crit.error_treshold, 'sc_max_num_its', p.stop_crit.max_num_its); mex_params = struct('data', M, 'nfacts', p.num_facts, 'cons', {mex_constraints}, 'init_facts', {p.init_facts}, 'niter', p.stop_crit.num_its, 'sc_is_criterion_error', p.stop_crit.is_criterion_error, 'sc_error_treshold', p.stop_crit.error_treshold, 'sc_max_num_its', p.stop_crit.max_num_its, 'update_way', p.is_update_way_R2L);
if(isreal(M)) if(isreal(M))
[lambda, core_obj] = mexPalm4MSAReal(mex_params); [lambda, core_obj] = mexPalm4MSAReal(mex_params);
else else
...@@ -175,7 +175,7 @@ classdef FaustFactory ...@@ -175,7 +175,7 @@ classdef FaustFactory
%mex_residuum_constraints{i} = cur_cell; %mex_residuum_constraints{i} = cur_cell;
mex_constraints{2,i} = cur_cell; mex_constraints{2,i} = cur_cell;
end end
mex_params = struct('data', M, 'nfacts', p.num_facts, 'cons', {mex_constraints}, 'niter1', p.stop_crits{1}.num_its,'niter2', p.stop_crits{2}.num_its, 'sc_is_criterion_error', p.stop_crits{1}.is_criterion_error, 'sc_error_treshold', p.stop_crits{1}.error_treshold, 'sc_max_num_its', p.stop_crits{1}.max_num_its, 'sc_is_criterion_error2', p.stop_crits{2}.is_criterion_error, 'sc_error_treshold2', p.stop_crits{2}.error_treshold, 'sc_max_num_its2', p.stop_crits{2}.max_num_its, 'nrow', p.data_num_rows, 'ncol', p.data_num_cols, 'fact_side', p.is_fact_side_left); mex_params = struct('data', M, 'nfacts', p.num_facts, 'cons', {mex_constraints}, 'niter1', p.stop_crits{1}.num_its,'niter2', p.stop_crits{2}.num_its, 'sc_is_criterion_error', p.stop_crits{1}.is_criterion_error, 'sc_error_treshold', p.stop_crits{1}.error_treshold, 'sc_max_num_its', p.stop_crits{1}.max_num_its, 'sc_is_criterion_error2', p.stop_crits{2}.is_criterion_error, 'sc_error_treshold2', p.stop_crits{2}.error_treshold, 'sc_max_num_its2', p.stop_crits{2}.max_num_its, 'nrow', p.data_num_rows, 'ncol', p.data_num_cols, 'fact_side', p.is_fact_side_left, 'update_way', p.is_update_way_R2L);
if(isreal(M)) if(isreal(M))
[lambda, core_obj] = mexHierarchical_factReal(M, mex_params); [lambda, core_obj] = mexHierarchical_factReal(M, mex_params);
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment