Fixes and cosmetics

code/classes/SCDclass_expcode.m

@@ -176,7 +176,7 @@ classdef SCDclass_expcode
         end
       end
       
-      function myslx = getslx(inode,icpu)
+      function myslx = getslxname(inode,icpu)
         if nargin==0
           myslx = 'tcv';
         elseif nargin==1
@@ -598,7 +598,7 @@ classdef SCDclass_expcode
         end
        
         function compile(~,varargin)
-          myslx = SCDclass_expcode.getslx(varargin{:});
+          myslx = SCDclass_expcode.getslxname(varargin{:});
           fprintf('Compiling %s.slx\n',myslx)
           try
             eval(sprintf('%s([],[],[],''compile'')',myslx));
@@ -610,13 +610,13 @@ classdef SCDclass_expcode
         
         function sim(~,varargin)
           SCDconf_setSIMconf
-          myslx = SCDclass_expcode.getslx(varargin{:});
+          myslx = SCDclass_expcode.getslxname(varargin{:});
           fprintf('Simulating %s.slx\n',myslx)
           sim(myslx)
         end  
         
         function open(~,varargin)
-          openslx = SCDclass_expcode.getslx(varargin{:});
+          openslx = SCDclass_expcode.getslxname(varargin{:});
           fprintf('Opening %s.slx\n',openslx)
           open(openslx);
         end
@@ -632,7 +632,7 @@ classdef SCDclass_expcode
               for icpu = 1:nodeinfo.ncpu
                 if nodeinfo.cpuactive(icpu)
                   compileslx_list = [compileslx_list,...
-                    SCDclass_expcode.getthreadslx(node,cpu)]; %#ok<AGROW>
+                    SCDclass_expcode.getslxname(inode,icpu)]; %#ok<AGROW>
                 end
               end
             end
@@ -643,7 +643,7 @@ classdef SCDclass_expcode
             end
           else
             % user passed nodes,threads to compile
-            myslx = SCDclass_expcode.getslx(varargin{:});
+            myslx = SCDclass_expcode.getslxname(varargin{:});
             fprintf('building %s.slx\n',myslx)
           end
          

code/classes/SCDclass_expcodecontainer.m

@@ -109,10 +109,10 @@ classdef SCDclass_expcodecontainer
                presentcodes=[presentcodes; obj.expcodes{ii}{1}];
            end
            
-           if(isempty(find(code==presentcodes)))
-               error('SCDclass_expcodecontainer.getbymaincode','Expcode not present in the container class');
+           if(isempty(find(code==presentcodes, 1)))
+               error('Expcode %d not present in the container class',code);
            else
-               deffunc = obj.expcodes{find(code==presentcodes)}{2};
+               deffunc = obj.expcodes{code==presentcodes}{2};
                %expcode = eval(char(deffunc));
                expcode = deffunc();
                assert(isa(expcode,'SCDclass_expcode'),'SCDclass_expcodecontainer.getbymaincode the configured defining function doesn''t return a SCDclass_expcode object');