multiple configurable base structure for waveform enabled

classes/SCDclass_algo.m

@@ -24,6 +24,8 @@ classdef SCDclass_algo
        exportedtpspermiss  % tunable parameters loading error permissivity rule
        buslist             % list of buses and their sources
        defaulttunparampermissivity % default tunparams loading permissivity
+       wavegenbasestruct   % base struct name of the next added wavegen
+       exportedwgstructs   % list of exported waveforms structs
     end
     
     properties 
@@ -54,6 +56,8 @@ classdef SCDclass_algo
             obj.timing.dt      = 1e-3;
             obj.buslist = [];
             obj.defaulttunparampermissivity = true;
+            obj.wavegenbasestruct = '';
+            obj.exportedwgstructs = {};
             
             % Buses
             obj.modelslx =  [obj.modelname,'.slx'];
@@ -236,6 +240,11 @@ classdef SCDclass_algo
           obj.refdatadictionaries{end+1} = refdd;
         end
         
+        %% Wavegens setter and getters
+        function obj = addwavegenbasetruct(obj, basestruct)
+            obj.exportedwgstructs{end+1}=basestruct;
+        end
+        
         %% Data dictionary manipulation manipulations
         function addbusestodd(obj)
           % Add buses to data dictionary from .m file descriptions
@@ -509,8 +518,9 @@ classdef SCDclass_algo
                for wgidx=1:numwavegens
                   wg=obj.mdscontainer.mdswavegens(wgidx);                  
                   eval(['simdata.' wg.gettarget '=timeseries(wg.castdata([0;0]),[0;1]);']);
+                  assignin('base',wg.getbasestruct,simdata);
                end
-               assignin('base',[obj.getname '_simdata'],simdata);
+               %assignin('base',wg.getbasestruct,simdata);
             else
                 warning('SCDclass_algo:buildworkspacesimdata','No wavegens configured for this algo, nothing  to do.');
                 return;
@@ -566,14 +576,22 @@ classdef SCDclass_algo
         end
         
         function obj = addwavegen(obj, wavegen)
-          % bind wavegen to modelname, dd and algo timing
+          if ~isempty(obj.exportedwgstructs), wgbasename = obj.exportedwgstructs{end};
+          else, wgbasename = '';
+          end
+          % bind wavegen to modelname, dd, algo timing and base struicture
+          % name
           for ii=1:numel(wavegen)
-            wavegen(ii) = wavegen(ii).bind(obj.modelname,obj.datadictionary,obj.timing);
+            wavegen(ii) = wavegen(ii).bind(obj.modelname,obj.datadictionary,obj.timing,wgbasename);
           end
           % add to algo's mds object container
           obj.mdscontainer=obj.mdscontainer.addwavegen(wavegen);
           % set default wavegen base structure name
-          obj.mdscontainer=obj.mdscontainer.setwavegenbasestruct([obj.getname '_simdata']);
+%           if isempty(obj.wavegenbasestruct)
+%             obj.mdscontainer=obj.mdscontainer.setwavegenbasestruct([obj.getname '_simdata']);
+%           else
+%             obj.mdscontainer=obj.mdscontainer.setwavegenbasestruct([obj.wavegenbasestruct '_simdata']);
+%           end
         end
         
         function obj = printwavegens(obj)

classes/SCDclass_mdswg.m

@@ -53,6 +53,7 @@ classdef SCDclass_mdswg < matlab.mixin.Heterogeneous
             obj.verbose=1;
             obj.wavegenbasestruct='';
             obj.bound=false;
+            
         end
         
         function obj=parseconstructor(obj, srctdi, destwavegen, varargin)
@@ -79,11 +80,12 @@ classdef SCDclass_mdswg < matlab.mixin.Heterogeneous
     
     % Sealed methods for heterogeneous arrays
     methods(Sealed)
-      function obj = bind(obj,modelname,datadictionary,timingsrc)
+      function obj = bind(obj,modelname,datadictionary,timingsrc,basestruct)
         for ii=1:numel(obj)
           obj(ii) = obj(ii).setmodelname(modelname);
           obj(ii) = obj(ii).setdatadictionary(datadictionary);
           obj(ii) = obj(ii).settiminginfo(timingsrc);
+          obj(ii) = obj(ii).setbasestruct(basestruct);
           obj(ii).bound = true;
         end
       end
@@ -140,6 +142,11 @@ classdef SCDclass_mdswg < matlab.mixin.Heterogeneous
         function obj = setbasestruct(obj, basestruct)
             obj.wavegenbasestruct = basestruct;
         end
+
+        function out = getbasestruct(obj)
+            out = obj.wavegenbasestruct;
+        end
+
         
         %function out = gettargetparam(obj)
         %    out = obj.modelparam;