Scicos blocks: typo fix 88/12188/2
Paul BIGNIER [Tue, 30 Jul 2013 10:21:52 +0000 (12:21 +0200)]
According to the help files, 'junction_name' clearly refers to 'function_name'

Change-Id: I307f287f44f71898f47e93ca0ca424105997e00f

31 files changed:
scilab/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
scilab/modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci
scilab/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATCATH.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATCATV.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATDET.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATDIAG.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATDIV.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATEIG.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATEXPM.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATINV.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATLU.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATMAGPHI.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATPINV.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATRESH.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATSING.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATTRAN.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci
scilab/modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci
scilab/modules/scicos_blocks/macros/MatrixOp/RICC.sci
scilab/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci
scilab/modules/scicos_blocks/macros/MatrixOp/SQRT.sci
scilab/modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci
scilab/modules/scicos_blocks/macros/Misc/CBLOCK.sci
scilab/modules/scicos_blocks/macros/Misc/CBLOCK4.sci
scilab/modules/scicos_blocks/macros/Misc/generic_block.sci
scilab/modules/scicos_blocks/macros/Misc/generic_block2.sci
scilab/modules/scicos_blocks/macros/Misc/generic_block3.sci
scilab/modules/scicos_blocks/macros/Sources/RAND_m.sci

index b026a3b..78b43eb 100644 (file)
@@ -41,13 +41,13 @@ function [x,y,typ]=CUMSUM(job,arg1,arg2)
             label=lab
             if (typ==1) then
                 if (decomptyp==0) then
-                    junction_name="cumsum_m";
+                    function_name="cumsum_m";
                     out=[-1 -2]
                 elseif (decomptyp==1) then
-                    junction_name="cumsum_r";
+                    function_name="cumsum_r";
                     out=[-1 1];
                 elseif (decomptyp==2) then
-                    junction_name="cumsum_c";
+                    function_name="cumsum_c";
                     out=[1 -2];
                 else message("decomposition type is not supported");ok=%f;
                 end
@@ -55,11 +55,11 @@ function [x,y,typ]=CUMSUM(job,arg1,arg2)
                 ot=1;
             elseif (typ==2) then
                 if (decomptyp==0) then
-                    junction_name="cumsumz_m";
+                    function_name="cumsumz_m";
                 elseif (decomptyp==1) then
-                    junction_name="cumsumz_r";
+                    function_name="cumsumz_r";
                 elseif (decomptyp==2) then
-                    junction_name="cumsumz_c";
+                    function_name="cumsumz_c";
                 else message("decomposition type is not supported");ok=%f;
                 end
                 it=2;
@@ -73,7 +73,7 @@ function [x,y,typ]=CUMSUM(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -83,9 +83,9 @@ function [x,y,typ]=CUMSUM(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="cumsum_m";
+        function_name="cumsum_m";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index 19509ed..cacb927 100644 (file)
@@ -43,11 +43,11 @@ function [x,y,typ]=EXTRACT(job,arg1,arg2)
             b=b(:);
             if ~ok then break,end
             if (typ==1) then
-                junction_name="extract";
+                function_name="extract";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="extractz";
+                function_name="extractz";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -64,7 +64,7 @@ function [x,y,typ]=EXTRACT(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -73,9 +73,9 @@ function [x,y,typ]=EXTRACT(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="extract";
+        function_name="extract";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index 9dff6f8..a449e67 100644 (file)
@@ -41,22 +41,22 @@ function [x,y,typ]=EXTTRI(job,arg1,arg2)
             label=lab
             if (typ==1) then
                 if (decomptyp==1) then
-                    junction_name="exttril";
+                    function_name="exttril";
                 elseif (decomptyp==2) then
-                    junction_name="exttriu";
+                    function_name="exttriu";
                 elseif (decomptyp==3) then
-                    junction_name="extdiag";
+                    function_name="extdiag";
                 else message("decomposition type is not supported");ok=%f;
                 end
                 it=1;
                 ot=1;
             elseif (typ==2) then
                 if (decomptyp==1) then
-                    junction_name="exttrilz";
+                    function_name="exttrilz";
                 elseif (decomptyp==2) then
-                    junction_name="exttriuz";
+                    function_name="exttriuz";
                 elseif (decomptyp==3) then
-                    junction_name="extdiagz";
+                    function_name="extdiagz";
                 else message("decomposition type is not supported");ok=%f;
                 end
                 it=2;
@@ -70,7 +70,7 @@ function [x,y,typ]=EXTTRI(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -80,9 +80,9 @@ function [x,y,typ]=EXTTRI(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="extrilz";
+        function_name="extrilz";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index 31a5eb7..032da73 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATBKSL(job,arg1,arg2)
             ["Datatype (1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_bksl";
+                function_name="mat_bksl";
                 ot=1;
                 it=[1 1];
             elseif (typ==2) then
-                junction_name="matz_bksl";
+                function_name="matz_bksl";
                 ot=2;
                 it=[2 2];
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATBKSL(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATBKSL(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_bksl";
+        function_name="mat_bksl";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=[-1;-1]
         model.in2=[-2;-3]
         model.intyp=[1 1]
index feb1543..94faa05 100644 (file)
@@ -60,9 +60,9 @@ function [x,y,typ]=MATCATH(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_cath";
+        function_name="mat_cath";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=[-1;-1]
         model.in2=[-2;-3]
         model.intyp=[1 1]
index 6e0e33a..f4b9ea4 100644 (file)
@@ -61,9 +61,9 @@ function [x,y,typ] = MATCATV(job,arg1,arg2)
     case "define" then
         l1=[2;2]
         model=scicos_model()
-        junction_name="mat_catv";
+        function_name="mat_catv";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in2=[-1;-1]
         model.in=[-2;-3]
         model.intyp=[-1 -1]
index 68cc2cc..0bc8712 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATDET(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_det";
+                function_name="mat_det";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_det";
+                function_name="matz_det";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATDET(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATDET(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_det";
+        function_name="mat_det";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-1
index 0156f67..16a13fb 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATDIAG(job,arg1,arg2)
             ["Datatype (1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_diag";
+                function_name="mat_diag";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_diag";
+                function_name="matz_diag";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATDIAG(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATDIAG(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_diag";
+        function_name="mat_diag";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=1
index 9ef9d17..64a445c 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATDIV(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_div";
+                function_name="mat_div";
                 ot=1;
                 it=[1 1];
             elseif (typ==2) then
-                junction_name="matz_div";
+                function_name="matz_div";
                 ot=2;
                 it=[2 2];
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATDIV(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATDIV(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_div";
+        function_name="mat_div";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=[-1;-2]
         model.in2=[-3;-3]
         model.intyp=[1 1]
index ff957c0..59b2b04 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATEIG(job,arg1,arg2)
             label=lab
             if (typ==1) then
                 if (decomptyp==1) then
-                    junction_name="mat_vps";
+                    function_name="mat_vps";
                     out=[-1 1];
                     ot=2;
                 elseif (decomptyp==2) then
-                    junction_name="mat_vpv";
+                    function_name="mat_vpv";
                     out=[-1 -1;-1 -1];
                     ot=[2 2];
                 else message("decomposition type is not supported");ok=%f;
@@ -53,11 +53,11 @@ function [x,y,typ]=MATEIG(job,arg1,arg2)
                 it=1;
             elseif (typ==2) then
                 if (decomptyp==1) then
-                    junction_name="matz_vps";
+                    function_name="matz_vps";
                     out=[-1 1];
                     ot=2;
                 elseif (decomptyp==2) then
-                    junction_name="matz_vpv";
+                    function_name="matz_vpv";
                     out=[-1 -1;-1 -1];
                     ot=[2 2];
                 else message("decomposition type is not supported");ok=%f;
@@ -71,7 +71,7 @@ function [x,y,typ]=MATEIG(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -81,9 +81,9 @@ function [x,y,typ]=MATEIG(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_vps";
+        function_name="mat_vps";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-1
index f7ea66e..2d07546 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATEXPM(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_expm";
+                function_name="mat_expm";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_expm";
+                function_name="matz_expm";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATEXPM(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATEXPM(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_expm";
+        function_name="mat_expm";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-1
index 684a342..2d3f2cb 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATINV(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_inv";
+                function_name="mat_inv";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_inv";
+                function_name="matz_inv";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATINV(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATINV(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_inv";
+        function_name="mat_inv";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-1
index 7e8bf8b..0c97216 100644 (file)
@@ -40,11 +40,11 @@ function [x,y,typ]=MATLU(job,arg1,arg2)
             scicos_getvalue("Set MATLU block parameters",["Datatype(1=real double  2=Complex)"],list("vec",1),label);
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_lu";
+                function_name="mat_lu";
                 ot=[1 1];
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_lu";
+                function_name="matz_lu";
                 ot=[2 2];
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -54,7 +54,7 @@ function [x,y,typ]=MATLU(job,arg1,arg2)
             end
             if ok then
                 funtyp=4;
-                model.sim=list(junction_name,funtyp)
+                model.sim=list(function_name,funtyp)
                 graphics.exprs=lab;
                 x.graphics=graphics;x.model=model
                 break
@@ -62,9 +62,9 @@ function [x,y,typ]=MATLU(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_lu";
+        function_name="mat_lu";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-1
index 01e9145..4d2c1ab 100644 (file)
@@ -40,13 +40,13 @@ function [x,y,typ]=MATMAGPHI(job,arg1,arg2)
             if ~ok then break,end
             label=lab
             if (decomptyp==1) then
-                junction_name="matz_abs";
+                function_name="matz_abs";
                 in=[-1 -2];
                 it=2;
                 out=[-1 -2;-1 -2];
                 ot=[1 1];
             elseif (decomptyp==2) then
-                junction_name="matz_absc";
+                function_name="matz_absc";
                 in=[-1 -2;-1 -2];
                 it=[1 1];
                 out=[-1 -2];
@@ -58,7 +58,7 @@ function [x,y,typ]=MATMAGPHI(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -68,9 +68,9 @@ function [x,y,typ]=MATMAGPHI(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="matz_abs";
+        function_name="matz_abs";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=-1
         model.in2=-2
         model.intyp=2
index ebeac93..6c87da4 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=MATPINV(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_pinv";
+                function_name="mat_pinv";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_pinv";
+                function_name="matz_pinv";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=MATPINV(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=MATPINV(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_pinv";
+        function_name="mat_pinv";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index 3013c38..2e4e44b 100644 (file)
@@ -63,11 +63,11 @@ function [x,y,typ]=MATRESH(job,arg1,arg2)
                 end
             end
             if (typ==1) then
-                junction_name="mat_reshape";
+                function_name="mat_reshape";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="matz_reshape";
+                function_name="matz_reshape";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -78,7 +78,7 @@ function [x,y,typ]=MATRESH(job,arg1,arg2)
             end
             if ok then
                 funtyp=4;
-                model.sim=list(junction_name,funtyp)
+                model.sim=list(function_name,funtyp)
                 graphics.exprs=label
                 arg1.graphics=graphics
                 arg1.model=model
@@ -89,9 +89,9 @@ function [x,y,typ]=MATRESH(job,arg1,arg2)
         needcompile=resume(needcompile)
     case "define" then
         model=scicos_model()
-        junction_name="mat_reshape";
+        function_name="mat_reshape";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=-1
         model.in2=-2
         model.intyp=1
index b0a5f03..c9eb58a 100644 (file)
@@ -41,12 +41,12 @@ function [x,y,typ]=MATSING(job,arg1,arg2)
             label=lab
             if (typ==1) then
                 if (decomptyp==1) then
-                    junction_name="mat_sing";
+                    function_name="mat_sing";
                     in=[-1 -2];
                     out=[-1 1];
                     ot=1;
                 elseif (decomptyp==2) then
-                    junction_name="mat_svd";
+                    function_name="mat_svd";
                     in=[-1 -2];
                     out=[-1 -1;-1 -2;-2 -2];
                     ot=[1 1 1];
@@ -55,12 +55,12 @@ function [x,y,typ]=MATSING(job,arg1,arg2)
                 it=1;
             elseif (typ==2) then
                 if (decomptyp==1) then
-                    junction_name="matz_sing";
+                    function_name="matz_sing";
                     in=[-1 -2];
                     out=[-1 1];
                     ot=1;
                 elseif (decomptyp==2) then
-                    junction_name="matz_svd";
+                    function_name="matz_svd";
                     in=[-1 -2];
                     out=[-1 -1;-1 -2;-2 -2];
                     ot=[2 1 2];
@@ -74,7 +74,7 @@ function [x,y,typ]=MATSING(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -84,9 +84,9 @@ function [x,y,typ]=MATSING(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_sing";
+        function_name="mat_sing";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index 73318a6..1257e44 100644 (file)
@@ -41,13 +41,13 @@ function [x,y,typ]=MATSUM(job,arg1,arg2)
             label=lab
             if (typ==1) then
                 if (decomptyp==0) then
-                    junction_name="mat_sum";
+                    function_name="mat_sum";
                     out=[1 1];
                 elseif (decomptyp==2) then
-                    junction_name="mat_suml";
+                    function_name="mat_suml";
                     out=[-1 1];
                 elseif (decomptyp==1) then
-                    junction_name="mat_sumc";
+                    function_name="mat_sumc";
                     out=[1 -2];
                 else message("decomposition type is not supported");ok=%f;
                 end
@@ -55,13 +55,13 @@ function [x,y,typ]=MATSUM(job,arg1,arg2)
                 ot=1;
             elseif (typ==2) then
                 if (decomptyp==0) then
-                    junction_name="matz_sum";
+                    function_name="matz_sum";
                     out=[1 1];
                 elseif (decomptyp==2) then
-                    junction_name="matz_suml";
+                    function_name="matz_suml";
                     out=[-1 1];
                 elseif (decomptyp==1) then
-                    junction_name="matz_sumc";
+                    function_name="matz_sumc";
                     out=[1 -2];
                 else message("decomposition type is not supported");ok=%f;
                 end
@@ -75,7 +75,7 @@ function [x,y,typ]=MATSUM(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -85,9 +85,9 @@ function [x,y,typ]=MATSUM(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="mat_sum";
+        function_name="mat_sum";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index 21c6776..7ff5dd1 100644 (file)
@@ -42,14 +42,14 @@ function [x,y,typ]=MATTRAN(job,arg1,arg2)
             ["Datatype(1=real double 2=Complex)";"rule (1=.'' 2='')"],list("vec",1,"vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mattran_m";
+                function_name="mattran_m";
                 ot=1;
                 it=1;
             elseif (typ==2) then
                 if rule==1 then
-                    junction_name="matztran_m";
+                    function_name="matztran_m";
                 else
-                    junction_name="mathermit_m";
+                    function_name="mathermit_m";
                 end
                 ot=2;
                 it=2;
@@ -61,7 +61,7 @@ function [x,y,typ]=MATTRAN(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
index 84f824a..5968327 100644 (file)
@@ -35,9 +35,9 @@ function [x,y,typ]=MATZCONJ(job,arg1,arg2)
         x=arg1
     case "define" then
         model=scicos_model()
-        junction_name="matz_conj";
+        function_name="matz_conj";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=-1
         model.in2=-2
         model.intyp=2
index 6441d08..1bd6c7f 100644 (file)
@@ -40,13 +40,13 @@ function [x,y,typ]=MATZREIM(job,arg1,arg2)
             if ~ok then break,end
             label=lab
             if (decomptyp==1) then
-                junction_name="matz_reim";
+                function_name="matz_reim";
                 in=[-1 -2];
                 it=2;
                 out=[-1 -2;-1 -2];
                 ot=[1 1];
             elseif (decomptyp==2) then
-                junction_name="matz_reimc";
+                function_name="matz_reimc";
                 in=[-1 -2;-1 -2];
                 it=[1 1];
                 out=[-1 -2];
@@ -58,7 +58,7 @@ function [x,y,typ]=MATZREIM(job,arg1,arg2)
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
             end
             if ok then
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 arg1.model=model
                 graphics.exprs=label
                 arg1.graphics=graphics
@@ -68,9 +68,9 @@ function [x,y,typ]=MATZREIM(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="matz_reim";
+        function_name="matz_reim";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=-1
         model.in2=-2
         model.intyp=2
index 93a56e9..2d2c96b 100644 (file)
@@ -55,9 +55,9 @@ function [x,y,typ]=RICC(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="ricc_m";
+        function_name="ricc_m";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=[-1;-1;-1]
         model.in2=[-1;-1;-1]
         model.intyp=[1 1 1]
index 11ac367..189ec7f 100644 (file)
@@ -41,11 +41,11 @@ function [x,y,typ]=ROOTCOEF(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)";"input row size";],list("vec",1,"vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="root_coef";
+                function_name="root_coef";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="rootz_coef";
+                function_name="rootz_coef";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -56,7 +56,7 @@ function [x,y,typ]=ROOTCOEF(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -65,9 +65,9 @@ function [x,y,typ]=ROOTCOEF(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="root_coef";
+        function_name="root_coef";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=1
index 437552b..07398f2 100644 (file)
@@ -40,9 +40,9 @@ function [x,y,typ]=SQRT(job,arg1,arg2)
             ["Datatype(1=real double  2=Complex)"],list("vec",1),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="mat_sqrt";
+                function_name="mat_sqrt";
             elseif (typ==2) then
-                junction_name="matz_sqrt";
+                function_name="matz_sqrt";
             else message("type is not supported");ok=%f;
             end
             it=typ
@@ -53,7 +53,7 @@ function [x,y,typ]=SQRT(job,arg1,arg2)
             if ok then
                 label=exprs;
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
index 339a317..b4b417c 100644 (file)
@@ -42,11 +42,11 @@ function [x,y,typ]=SUBMAT(job,arg1,arg2)
             ["Datatype (1=real double  2=Complex)";"Starting Row Index";"Ending Row Index";"Starting Column Index";"Ending Column Index";"Input Dimensions"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label)
             if ~ok then break,end
             if (typ==1) then
-                junction_name="submat";
+                function_name="submat";
                 ot=1;
                 it=1;
             elseif (typ==2) then
-                junction_name="submatz";
+                function_name="submatz";
                 ot=2;
                 it=2;
             else message("Datatype is not supported");ok=%f;
@@ -64,7 +64,7 @@ function [x,y,typ]=SUBMAT(job,arg1,arg2)
             if ok then
 
                 [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[])
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 graphics.exprs=label;
                 arg1.graphics=graphics;arg1.model=model;
                 x=arg1
@@ -73,9 +73,9 @@ function [x,y,typ]=SUBMAT(job,arg1,arg2)
         end
     case "define" then
         model=scicos_model()
-        junction_name="submat";
+        function_name="submat";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=-1
         model.in2=-2
index c57ec16..6b41874 100644 (file)
@@ -35,7 +35,7 @@ function [x,y,typ]=CBLOCK(job,arg1,arg2)
         model=arg1.model;graphics=arg1.graphics;
         label=graphics.exprs;
         while %t do
-            [ok,junction_name,impli,i,o,ci,co,xx,ng,z,rpar,ipar,auto0,depu,dept,lab]=..
+            [ok,function_name,impli,i,o,ci,co,xx,ng,z,rpar,ipar,auto0,depu,dept,lab]=..
             scicos_getvalue("Set C-Block2 block parameters",..
             ["simulation function";
             "is block implicit? (y,n)";
@@ -56,7 +56,7 @@ function [x,y,typ]=CBLOCK(job,arg1,arg2)
             "str",1,"str",1),label(1))
             if ~ok then break,end
             label(1)=lab
-            funam=stripblanks(junction_name)
+            funam=stripblanks(function_name)
             xx=xx(:);z=z(:);rpar=rpar(:);ipar=int(ipar(:));
             nx=size(xx,1);nz=size(z,1);
             i=int(i(:));
index 6c56454..3943828 100644 (file)
@@ -39,7 +39,7 @@ function [x,y,typ]=CBLOCK4(job,arg1,arg2)
         label=graphics.exprs;
 
         while %t do
-            [ok,junction_name,impli,in,it,out,ot,ci,co,xx,z,oz,...
+            [ok,function_name,impli,in,it,out,ot,ci,co,xx,z,oz,...
             rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=..
             scicos_getvalue("Set C-Block4 block parameters",..
             ["Simulation function";
@@ -68,7 +68,7 @@ function [x,y,typ]=CBLOCK4(job,arg1,arg2)
                 break
             end
             label(1)=lab
-            funam=stripblanks(junction_name)
+            funam=stripblanks(function_name)
             xx=xx(:);
             z=z(:);
             rpar=rpar(:);
index e9c561d..48dfd1a 100644 (file)
@@ -36,7 +36,7 @@ function [x,y,typ]=generic_block(job,arg1,arg2)
         model=arg1.model;graphics=arg1.graphics;label=graphics.exprs
         if size(label,"*")==14 then label(9)=[],end //compatiblity
         while %t do
-            [ok,junction_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,auto0,depu,dept,lab]=..
+            [ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,auto0,depu,dept,lab]=..
             scicos_getvalue("Set GENERIC block parameters",..
             ["simulation function";
             "function type (0,1,2,..)";
@@ -56,7 +56,7 @@ function [x,y,typ]=generic_block(job,arg1,arg2)
             "str",1,"str",1),label)
             if ~ok then break,end
             label=lab
-            junction_name=stripblanks(junction_name)
+            function_name=stripblanks(function_name)
             xx=xx(:);z=z(:);rpar=rpar(:);ipar=int(ipar(:));
             i=int(i(:));
             o=int(o(:));
@@ -76,7 +76,7 @@ function [x,y,typ]=generic_block(job,arg1,arg2)
             if ok then
                 // AVERIFIER
                 if funtyp==3 then needcompile=4;end
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 model.state=xx
                 model.dstate=z
                 model.rpar=rpar
@@ -94,9 +94,9 @@ function [x,y,typ]=generic_block(job,arg1,arg2)
         needcompile=resume(needcompile)
     case "define" then
         model=scicos_model()
-        junction_name="sinblk";
+        function_name="sinblk";
         funtyp=1;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=1
         model.out=1
@@ -109,7 +109,7 @@ function [x,y,typ]=generic_block(job,arg1,arg2)
         model.blocktype="c"
         model.firing=[]
         model.dep_ut=[%t %f]
-        label=[junction_name;sci2exp(funtyp);
+        label=[function_name;sci2exp(funtyp);
         sci2exp(model.in);sci2exp(model.out);
         sci2exp(model.evtin);sci2exp(model.evtout);
         sci2exp(model.state);sci2exp(model.dstate);
index fe7d499..0607a7b 100644 (file)
@@ -36,7 +36,7 @@ function [x,y,typ]=generic_block2(job,arg1,arg2)
         model=arg1.model;graphics=arg1.graphics;label=graphics.exprs
         if size(label,"*")==14 then label(9)=[],end //compatiblity
         while %t do
-            [ok,junction_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,nmode,nzcr,auto0,depu,dept,lab]=..
+            [ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,nmode,nzcr,auto0,depu,dept,lab]=..
             scicos_getvalue("Set GENERIC block parameters",..
             ["simulation function";
             "function type (0,1,2,..)";
@@ -58,7 +58,7 @@ function [x,y,typ]=generic_block2(job,arg1,arg2)
             "str",1,"str",1),label)
             if ~ok then break,end
             label=lab
-            junction_name=stripblanks(junction_name)
+            function_name=stripblanks(function_name)
             xx=xx(:);z=z(:);rpar=rpar(:);ipar=int(ipar(:));
             i=int(i(:));
             o=int(o(:));
@@ -78,7 +78,7 @@ function [x,y,typ]=generic_block2(job,arg1,arg2)
             if ok then
                 // AVERIFIER
                 if funtyp==3 then needcompile=4;end
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 model.state=xx
                 model.dstate=z
                 model.rpar=rpar
@@ -98,9 +98,9 @@ function [x,y,typ]=generic_block2(job,arg1,arg2)
         needcompile=resume(needcompile)
     case "define" then
         model=scicos_model()
-        junction_name="sinblk";
+        function_name="sinblk";
         funtyp=1;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=1
         model.out=1
@@ -113,7 +113,7 @@ function [x,y,typ]=generic_block2(job,arg1,arg2)
         model.blocktype="c"
         model.firing=[]
         model.dep_ut=[%t %f]
-        label=[junction_name;sci2exp(funtyp);
+        label=[function_name;sci2exp(funtyp);
         sci2exp(model.in);sci2exp(model.out);
         sci2exp(model.evtin);sci2exp(model.evtout);
         sci2exp(model.state);sci2exp(model.dstate);
index a2678bf..5591d73 100644 (file)
@@ -36,7 +36,7 @@ function [x,y,typ]=generic_block3(job,arg1,arg2)
         model=arg1.model;graphics=arg1.graphics;label=graphics.exprs
         if size(label,"*")==14 then label(9)=[],end //compatiblity
         while %t do
-            [ok,junction_name,funtyp,in,it,out,ot,ci,co,xx,z,oz,...
+            [ok,function_name,funtyp,in,it,out,ot,ci,co,xx,z,oz,...
             rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=..
             scicos_getvalue("Set GENERIC block parameters",..
             ["Simulation function";
@@ -63,7 +63,7 @@ function [x,y,typ]=generic_block3(job,arg1,arg2)
             "str",1,"str",1),label)
             if ~ok then break,end
             label=lab
-            junction_name=stripblanks(junction_name)
+            function_name=stripblanks(function_name)
             xx=xx(:);z=z(:);rpar=rpar(:);ipar=int(ipar(:));
             ci=int(ci(:));
             co=int(co(:));
@@ -82,7 +82,7 @@ function [x,y,typ]=generic_block3(job,arg1,arg2)
             end
             if ok then
                 if funtyp==3 then needcompile=4;end
-                model.sim=list(junction_name,funtyp);
+                model.sim=list(function_name,funtyp);
                 model.state=xx
                 model.dstate=z
                 model.odstate=oz
@@ -103,9 +103,9 @@ function [x,y,typ]=generic_block3(job,arg1,arg2)
         needcompile=resume(needcompile)
     case "define" then
         model=scicos_model()
-        junction_name="sinblk";
+        function_name="sinblk";
         funtyp=4;
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
 
         model.in=1
         model.in2=1
@@ -114,7 +114,7 @@ function [x,y,typ]=generic_block3(job,arg1,arg2)
         model.out2=1
         model.outtyp=1
         model.dep_ut=[%t %f]
-        label=[junction_name;sci2exp(funtyp);
+        label=[function_name;sci2exp(funtyp);
         sci2exp([model.in model.in2]);
         sci2exp(model.intyp);
         sci2exp([model.out model.out2])
index b2d5d30..57a9364 100644 (file)
@@ -50,12 +50,12 @@ function [x,y,typ]=RAND_m(job,arg1,arg2)
             else
                 out=size(a)
                 if typ==1 then
-                    junction_name="rndblk_m";
+                    function_name="rndblk_m";
                     model.rpar=[real(a(:));real(b(:))]
                     model.dstate=[seed_c(1);0*real(a(:))]
                     ot=1
                 elseif typ==2 then
-                    junction_name="rndblkz_m";
+                    function_name="rndblkz_m";
                     ot=2
                     model.rpar=[real(a(:));imag(a(:));real(b(:));imag(b(:))]
                     model.dstate=[seed_c(:);0*[real(a(:));imag(a(:))]]
@@ -63,7 +63,7 @@ function [x,y,typ]=RAND_m(job,arg1,arg2)
                 if ok then
                     [model,graphics,ok]=set_io(model,graphics,list([],[]),list(out,ot),1,[])
                     if ok then
-                        model.sim=list(junction_name,4)
+                        model.sim=list(function_name,4)
                         graphics.exprs=exprs
                         model.ipar=flag
                         x.graphics=graphics;x.model=model
@@ -77,10 +77,10 @@ function [x,y,typ]=RAND_m(job,arg1,arg2)
         b=1
         dt=0
         flag=0
-        junction_name="rndblk_m";
+        function_name="rndblk_m";
         funtyp=4;
         model=scicos_model()
-        model.sim=list(junction_name,funtyp)
+        model.sim=list(function_name,funtyp)
         model.in=[]
         model.in2=[]
         model.intyp=[]