diff options
Diffstat (limited to 'js/Sources/RAND_m.js')
| -rw-r--r-- | js/Sources/RAND_m.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index f1559e7b..1573b9f3 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -18,13 +18,13 @@ model.outtyp=1; model.evtin=1; model.evtout=[]; model.state=[]; -model.dstate=[int(rand()*(10^7-1)),0*a.slice()]; +model.dstate=[[int(rand()*(10^7-1))],[0*a.slice()]]; model.rpar=[a.slice(),b.slice()]; model.ipar=flag; model.blocktype="d"; model.firing=[]; model.dep_ut=[false,false]; -exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])]; +exprs=[[sci2exp(1)],[string(flag)],[sci2exp([a])],[sci2exp([b])],[sci2exp([model.dstate(1),int(rand()*(10^7-1))])]]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); } @@ -41,7 +41,7 @@ if (size(exprs,"*")==14) { exprs[9-1]=[]; } while (true) { -[ok,typ,flag,a,b,seed_c,exprs]=scicos_getvalue(["Set Random generator block parameters","flag = 0 : Uniform distribution A is min and A+B max","flag = 1 : Normal distribution A is mean and B deviation"," ","A and B must be matrix with equal sizes"],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs); +[ok,typ,flag,a,b,seed_c,exprs]=scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],[["Datatype(1=real double 2=complex)"],["flag"],["A"],["B"],["SEED"]],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs); if (!ok) { break; } @@ -51,14 +51,14 @@ message("flag must be equal to 1 or 0"); out=size(a); if (typ==1) { function_name="rndblk_m"; -model.rpar=[real(a.slice()),real(b.slice())]; -model.dstate=[seed_c(1),0*real(a.slice())]; +model.rpar=[[real(a.slice())],[real(b.slice())]]; +model.dstate=[[seed_c(1)],[0*real(a.slice())]]; ot=1; } else if (typ==2) { function_name="rndblkz_m"; ot=2; -model.rpar=[real(a.slice()),imag(a.slice()),real(b.slice()),imag(b.slice())]; -model.dstate=[seed_c.slice(),0*[real(a.slice()),imag(a.slice())]]; +model.rpar=[[real(a.slice())],[imag(a.slice())],[real(b.slice())],[imag(b.slice())]]; +model.dstate=[[seed_c.slice()],[0*[[real(a.slice())],[imag(a.slice())]]]]; } else { message("Datatype is not supported"); ok=false; |