trying to pass cfs12combined tests

algos/cfs12combined/algo_cfs12combined_harness_run.m

@@ -46,6 +46,7 @@ tp2 = Simulink.data.evalinGlobal(obj.getname,'algo_cfs2_tp.Value');
 fp2 = Simulink.data.evalinGlobal(obj.getname,'algo_cfs2_fp');
 
 
+%% Simulink only tests
 % input = evalin('base','algo_cfs12combined_inbus1');
 % input1  = input.signal1.Data;
 % input2  = input.signal2.Data;
@@ -62,4 +63,5 @@ fp2 = Simulink.data.evalinGlobal(obj.getname,'algo_cfs2_fp');
 % assert(max(abs(output2 - (input2.*tp.refmodel.gain+fp.refmodel.offset)))<maxerror2,'Wrong output 2!');
 
 
+
 end

algos/cfs12combined/algoobj_cfs12combined.m

@@ -12,21 +12,36 @@ obj=obj.addfpinitfcn('algo_cfs12combined_loadfp','algo_cfs12combined_fp');
 %% Define cfs1 and cfs2 algo obj in the base workspace
 addpath('../cfs1');
 addpath('../cfs2');
-evalin('base','obj1=algoobj_cfs1; obj1.init; obj1.setup;');
-evalin('base','obj2=algoobj_cfs2; obj2.init; obj2.setup;');
+obj1=algoobj_cfs1;
+obj2=algoobj_cfs2;
+
+%%
+assignin('base','obj1',obj1);
+assignin('base','obj2',obj2);
+evalin('base','obj1.init; obj1.setup; ');
+evalin('base','obj2.init; obj2.setup; ');
 
 %% Referenced data dictionaries
-obj=obj.addrefdd('algo_cfs1.sldd','algo_cfs1');
-obj=obj.addrefdd('algo_cfs2.sldd','algo_cfs2');
-
-% dd=Simulink.data.dictionary.open('algo_cfs1.sldd');
-% dd.addDataSource('algo_cfs12combined.sldd');
-% ddd=dd.getSection('Design Data');
-% ddd.deleteEntry('algo_cfs2_procout');
-% dd=Simulink.data.dictionary.open('algo_cfs2.sldd');
-% dd.addDataSource('algo_cfs12combined.sldd');
-% ddd=dd.getSection('Design Data');
-% ddd.deleteEntry('algo_cfs1_procout');
+obj=obj.addrefdd('algo_cfs1.sldd',obj1);
+obj=obj.addrefdd('algo_cfs2.sldd',obj2);
+
+%% Workaround to define proc buses in one place only
+% NOTE: this is not to be replicated,
+% an higher hyerarchical SCDDS level must be put in place
+% (eg. SPC wrappers and expcodes objects)
+% to do it properly
+dd1=Simulink.data.dictionary.open('algo_cfs1.sldd');
+ddd1=dd1.getSection('Design Data');
+ddd1.deleteEntry('algo_cfs2_procout');
+
+dd2=Simulink.data.dictionary.open('algo_cfs2.sldd');
+ddd2=dd2.getSection('Design Data');
+ddd2.deleteEntry('algo_cfs1_procout');
+
+dd1.addDataSource('algo_cfs2.sldd');
+dd2.addDataSource('algo_cfs1.sldd');
+
+
 % 
 
 end