diff options
Diffstat (limited to 'js/MatrixOp')
-rw-r--r-- | js/MatrixOp/CUMSUM.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/EXTRACT.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/EXTTRI.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATBKSL.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATCATH.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATCATV.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATDIV.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATEIG.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATLU.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATMAGPHI.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATMUL.js | 18 | ||||
-rw-r--r-- | js/MatrixOp/MATRESH.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATSING.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATSUM.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATTRAN.js | 2 | ||||
-rw-r--r-- | js/MatrixOp/MATZREIM.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/RICC.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/ROOTCOEF.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/SUBMAT.js | 8 |
19 files changed, 60 insertions, 60 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 4d676392..c7b75fc6 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(0)]; +label=[[sci2exp(1)],[sci2exp(0)]]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,decomptyp,lab]=scicos_getvalue("Set CUMSUM block parameters",["Datatype(1=real double 2=Complex)","Sum along (0=the first non singleton dimension 1=Rows 2=Columns)"],list("vec",1,"vec",1),label); +[ok,typ,decomptyp,lab]=scicos_getvalue("Set CUMSUM block parameters",[["Datatype(1=real double 2=Complex)"],["Sum along (0=the first non singleton dimension 1=Rows 2=Columns)"]],list("vec",1,"vec",1),label); if (!ok) { break; } diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 9cfd2064..b3fbbbc0 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -20,7 +20,7 @@ model.ipar=[1,1,1,1]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp([1]),sci2exp([1])]; +label=[[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,a,b,exprs]=scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); +[ok,typ,a,b,exprs]=scicos_getvalue("Set EXTRACT Block",[["Datatype (1=real double 2=Complex)"],["Lines to extract"],["Columns to extract"]],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); a=a.slice(); b=b.slice(); if (!ok) { @@ -73,7 +73,7 @@ message("invalid index"); ok=false; } } -model.ipar=[a,b,ma,mb]; +model.ipar=[[a],[b],[ma],[mb]]; in1=[model.in1,model.in2]; out=[ma,mb]; funtyp=4; diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 7e7e4e53..3cdcfe75 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(1)]; +label=[[sci2exp(1)],[sci2exp(1)]]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,decomptyp,lab]=scicos_getvalue("Set EXTTRI block parameters",["Datatype(1=real double 2=Complex)","extraction type (1=lower 2=upper 3=diagonal)"],list("vec",1,"vec",1),label); +[ok,typ,decomptyp,lab]=scicos_getvalue("Set EXTTRI block parameters",[["Datatype(1=real double 2=Complex)"],["extraction type (1=lower 2=upper 3=diagonal)"]],list("vec",1,"vec",1),label); if (!ok) { break; } diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index d607823c..b26fdd24 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -5,8 +5,8 @@ model=scicos_model(); function_name="mat_bksl"; funtyp=4; model.sim=list(function_name,funtyp); -model.in1=[-1,-1]; -model.in2=[-2,-3]; +model.in1=[[-1],[-1]]; +model.in2=[[-2],[-3]]; model.intyp=[1,1]; model.out=-2; model.out2=-3; diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 28f4e1eb..868e11cd 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -5,8 +5,8 @@ model=scicos_model(); function_name="mat_cath"; funtyp=4; model.sim=list(function_name,funtyp); -model.in1=[-1,-1]; -model.in2=[-2,-3]; +model.in1=[[-1],[-1]]; +model.in2=[[-2],[-3]]; model.intyp=[1,1]; model.out=-1; model.out2=0; diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index bfb63704..b6b3b387 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -1,13 +1,13 @@ /* autogenerated from "macros/MatrixOp/MATCATV.sci" */ function MATCATV() { MATCATV.prototype.define = function MATCATV() { -l1=[2,2]; +l1=[[2],[2]]; model=scicos_model(); function_name="mat_catv"; funtyp=4; model.sim=list(function_name,funtyp); -model.in2=[-1,-1]; -model.in1=[-2,-3]; +model.in2=[[-1],[-1]]; +model.in1=[[-2],[-3]]; model.intyp=[-1,-1]; model.out=0; model.out2=-1; diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 3315d7f7..9b1b5164 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -5,8 +5,8 @@ model=scicos_model(); function_name="mat_div"; funtyp=4; model.sim=list(function_name,funtyp); -model.in1=[-1,-2]; -model.in2=[-3,-3]; +model.in1=[[-1],[-2]]; +model.in2=[[-3],[-3]]; model.intyp=[1,1]; model.out=-1; model.out2=-2; diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index f035b278..d65c76e0 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(1)]; +label=[[sci2exp(1)],[sci2exp(1)]]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,decomptyp,lab]=scicos_getvalue("Set MATEIG block parameters",["Datatype(1=real double 2=Complex)","decomposition type (1=eig values 2=eig values+eig vectors"],list("vec",1,"vec",1),label); +[ok,typ,decomptyp,lab]=scicos_getvalue("Set MATEIG block parameters",[["Datatype(1=real double 2=Complex)"],["decomposition type (1=eig values 2=eig values+eig vectors"]],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -49,7 +49,7 @@ out=[-1,1]; ot=2; } else if ((decomptyp==2)) { function_name="mat_vpv"; -out=[-1,-1,-1,-1]; +out=[[-1,-1],[-1,-1]]; ot=[2,2]; } else { message("decomposition type is not supported"); @@ -63,7 +63,7 @@ out=[-1,1]; ot=2; } else if ((decomptyp==2)) { function_name="matz_vpv"; -out=[-1,-1,-1,-1]; +out=[[-1,-1],[-1,-1]]; ot=[2,2]; } else { message("decomposition type is not supported"); diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 4436d1d2..e6a67049 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -8,8 +8,8 @@ model.sim=list(function_name,funtyp); model.in1=-1; model.in2=-1; model.intyp=1; -model.out=[-1,-1]; -model.out2=[-1,-1]; +model.out=[[-1],[-1]]; +model.out2=[[-1],[-1]]; model.outtyp=[1,1]; model.evtin=[]; model.evtout=[]; diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 13aea7fe..ffcb5aa6 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -8,8 +8,8 @@ model.sim=list(function_name,funtyp); model.in1=-1; model.in2=-2; model.intyp=2; -model.out=[-1,-1]; -model.out2=[-2,-2]; +model.out=[[-1],[-1]]; +model.out2=[[-2],[-2]]; model.outtyp=[1,1]; model.evtin=[]; model.evtout=[]; @@ -46,11 +46,11 @@ if ((decomptyp==1)) { function_name="matz_abs"; in1=[-1,-2]; it=2; -out=[-1,-2,-1,-2]; +out=[[-1,-2],[-1,-2]]; ot=[1,1]; } else if ((decomptyp==2)) { function_name="matz_absc"; -in1=[-1,-2,-1,-2]; +in1=[[-1,-2],[-1,-2]]; it=[1,1]; out=[-1,-2]; ot=2; diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 73803d6a..72933c06 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -3,8 +3,8 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { model=scicos_model(); model.sim=list("matmul_m",4); -model.in1=[-1,-2]; -model.in2=[-2,-3]; +model.in1=[[-1],[-2]]; +model.in2=[[-2],[-3]]; model.out=-1; model.out2=-3; model.dep_ut=[true,false]; @@ -32,7 +32,7 @@ if (size(label,"*")==2) { label[3-1]=sci2exp(1); } while (true) { -[ok,dtype,rule,np,exprs]=scicos_getvalue(["Set MATMUL parameter","For the Multipication rule:"," 1= Matrix by Matrix"," 2= Matrix by Matrix element wise "," 3= Matrix by Scalar","In the third case the second input will be the scalar"],["Datatype(1=real double 2=Complex 3=int32 ...)","Multiplication rule","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",1,"vec",1),label); +[ok,dtype,rule,np,exprs]=scicos_getvalue([["Set MATMUL parameter"],["For the Multipication rule:"],[" 1= Matrix by Matrix"],[" 2= Matrix by Matrix element wise "],[" 3= Matrix by Scalar"],["In the third case the second input will be the scalar"]],[["Datatype(1=real double 2=Complex 3=int32 ...)"],["Multiplication rule"],["Do on Overflow(0=Nothing 1=Saturate 2=Error)"]],list("vec",1,"vec",1,"vec",1),label); if (!ok) { break; } @@ -48,8 +48,8 @@ ok=false; if ((dtype==1||dtype==2)) { np=0; } -TABMIN=[0,0,-(2^31),-(2^15),-(2^7),0,0,0]; -TABMAX=[0,0,(2^31)-1,(2^15)-1,(2^7)-1,(2^32)-1,(2^16)-1,(2^8)-1]; +TABMIN=[[0],[0],[-(2^31)],[-(2^15)],[-(2^7)],[0],[0],[0]]; +TABMAX=[[0],[0],[(2^31)-1],[(2^15)-1],[(2^7)-1],[(2^32)-1],[(2^16)-1],[(2^8)-1]]; if (rule==2) { if (np==0) { model.sim=list("matmul2_m",4); @@ -126,20 +126,20 @@ kmax=TABMAX(dtype); it=dtype*ones(1,2); ot=dtype; if (rule==1) { -in1=[-1,-2,-2,-3]; +in1=[[-1,-2],[-2,-3]]; out=[-1,-3]; } else if (rule==2) { -in1=[-1,-2,-1,-2]; +in1=[[-1,-2],[-1,-2]]; out=[-1,-2]; } else { -in1=[-1,-2,1,1]; +in1=[[-1,-2],[1,1]]; out=[-1,-2]; } [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { label=exprs; model.ipar=rule; -model.rpar=[kmin,kmax]; +model.rpar=[[kmin],[kmax]]; graphics.exprs=label; x.graphics=graphics; x.model=model; diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 9766c7a5..f9708e24 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp([1,1]),sci2exp([1,1])]; +label=[[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,l1,out,lab]=scicos_getvalue("Set MATRESH block parameters",["Datatype(1=real double 2=Complex)","input size","output size desired"],list("vec",-1,"vec",-1,"vec",-1),label); +[ok,typ,l1,out,lab]=scicos_getvalue("Set MATRESH block parameters",[["Datatype(1=real double 2=Complex)","input size"],["output size desired"]],list("vec",-1,"vec",-1,"vec",-1),label); if (!ok) { break; } diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 44083846..49c5c0d3 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(1)]; +label=[[sci2exp(1)],[sci2exp(1)]]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,decomptyp,lab]=scicos_getvalue("Set MATSVD block parameters",["Datatype(1=real double 2=Complex)","decomposition type (1=singular values 2=sing values+matrix U & V)"],list("vec",1,"vec",1),label); +[ok,typ,decomptyp,lab]=scicos_getvalue("Set MATSVD block parameters",[["Datatype(1=real double 2=Complex)"],["decomposition type (1=singular values 2=sing values+matrix U & V)"]],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -51,7 +51,7 @@ ot=1; } else if ((decomptyp==2)) { function_name="mat_svd"; in1=[-1,-2]; -out=[-1,-1,-1,-2,-2,-2]; +out=[[-1,-1],[-1,-2],[-2,-2]]; ot=[1,1,1]; } else { message("decomposition type is not supported"); @@ -67,7 +67,7 @@ ot=1; } else if ((decomptyp==2)) { function_name="matz_svd"; in1=[-1,-2]; -out=[-1,-1,-1,-2,-2,-2]; +out=[[-1,-1],[-1,-2],[-2,-2]]; ot=[2,1,2]; } else { message("decomposition type is not supported"); diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index eec02228..203f3c20 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(0)]; +label=[[sci2exp(1)],[sci2exp(0)]]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,decomptyp,lab]=scicos_getvalue("Set MATSUM block parameters",["Datatype(1=real double 2=Complex)","Sum along (0=all 1=lines 2=Columns)"],list("vec",1,"vec",1),label); +[ok,typ,decomptyp,lab]=scicos_getvalue("Set MATSUM block parameters",[["Datatype(1=real double 2=Complex)"],["Sum along (0=all 1=lines 2=Columns)"]],list("vec",1,"vec",1),label); if (!ok) { break; } diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 8d9a4186..c6cf1631 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -25,7 +25,7 @@ if (size(label,"*")==1) { label[2-1]=sci2exp(1); } while (true) { -[ok,typ,rule,exprs]=scicos_getvalue("Set MATTRAN Block",["Datatype(1=real double 2=Complex)","rule (1=.\' 2=\')"],list("vec",1,"vec",1),label); +[ok,typ,rule,exprs]=scicos_getvalue("Set MATTRAN Block",[["Datatype(1=real double 2=Complex)"],["rule (1=.\' 2=\')"]],list("vec",1,"vec",1),label); if (!ok) { break; } diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 72fc756c..43de8742 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -8,8 +8,8 @@ model.sim=list(function_name,funtyp); model.in1=-1; model.in2=-2; model.intyp=2; -model.out=[-1,-1]; -model.out2=[-2,-2]; +model.out=[[-1],[-1]]; +model.out2=[[-2],[-2]]; model.outtyp=[1,1]; model.evtin=[]; model.evtout=[]; @@ -46,11 +46,11 @@ if ((decomptyp==1)) { function_name="matz_reim"; in1=[-1,-2]; it=2; -out=[-1,-2,-1,-2]; +out=[[-1,-2],[-1,-2]]; ot=[1,1]; } else if ((decomptyp==2)) { function_name="matz_reimc"; -in1=[-1,-2,-1,-2]; +in1=[[-1,-2],[-1,-2]]; it=[1,1]; out=[-1,-2]; ot=2; diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 16e8e32b..5cbacacf 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -5,8 +5,8 @@ model=scicos_model(); function_name="ricc_m"; funtyp=4; model.sim=list(function_name,funtyp); -model.in1=[-1,-1,-1]; -model.in2=[-1,-1,-1]; +model.in1=[[-1],[-1],[-1]]; +model.in2=[[-1],[-1],[-1]]; model.intyp=[1,1,1]; model.out=-1; model.out2=-1; @@ -16,11 +16,11 @@ model.evtout=[]; model.state=[]; model.dstate=[]; model.rpar=[]; -model.ipar=[1,1]; +model.ipar=[[1],[1]]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(1)]; +label=[[sci2exp(1)],[sci2exp(1)]]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,tpe,mod,exprs]=scicos_getvalue("Set RICC Block",["Type (1=Cont 2=Disc)","Model(1=Schr 2=sign(cont) inv(disc))"],list("vec",1,"vec",1),label); +[ok,tpe,mod,exprs]=scicos_getvalue("Set RICC Block",[["Type (1=Cont 2=Disc)"],["Model(1=Schr 2=sign(cont) inv(disc))"]],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -48,7 +48,7 @@ ot=1; label=exprs; [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { -model.ipar=[tpe,mod]; +model.ipar=[[tpe],[mod]]; graphics.exprs=label; arg1.graphics=graphics; arg1.model=model; diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index ed92f797..5b3d6e3a 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -20,7 +20,7 @@ model.ipar=[]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(1)]; +label=[[sci2exp(1)],[sci2exp(1)]]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==14) { label[9-1]=[]; } while (true) { -[ok,typ,inp,exprs]=scicos_getvalue("Set ROOTCOEF Block",["Datatype(1=real double 2=Complex)","input row size"],list("vec",1,"vec",1),label); +[ok,typ,inp,exprs]=scicos_getvalue("Set ROOTCOEF Block",[["Datatype(1=real double 2=Complex)"],["input row size"]],list("vec",1,"vec",1),label); if (!ok) { break; } diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 6ea6f8a4..77b8cfcd 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -16,11 +16,11 @@ model.evtout=[]; model.state=[]; model.dstate=[]; model.rpar=[]; -model.ipar=[1,1,1,1]; +model.ipar=[[1],[1],[1],[1]]; model.blocktype="c"; model.firing=[]; model.dep_ut=[true,false]; -label=[sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1)]; +label=[[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; gr_i=[]; x=standard_define([2.5,2],model,label,gr_i); } @@ -37,7 +37,7 @@ if (size(label,"*")==5) { label[6-1]=sci2exp([1,1]); } while (true) { -[ok,typ,a,b,c,d,inp,exprs]=scicos_getvalue("Set SUBMAT Block",["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); +[ok,typ,a,b,c,d,inp,exprs]=scicos_getvalue("Set SUBMAT Block",[["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) { break; } @@ -73,7 +73,7 @@ if (d>inp(2)) { message("index of ending column is out of range"); ok=false; } -model.ipar=[a,b,c,d]; +model.ipar=[[a],[b],[c],[d]]; in1=[inp(1),inp(2)]; out=[(b-a)+1,(d-c)+1]; funtyp=4; |