diff options
Diffstat (limited to 'js/Misc')
56 files changed, 465 insertions, 123 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 32a3a3e9..284a982b 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -2,15 +2,15 @@ function AUTOMAT() { AUTOMAT.prototype.define = function AUTOMAT() { NMode=2; -Minitial=1; +this.Minitial=1; NX=1; -X0=[0.0]; -XP=[[1],[1]]; +this.X0=[0.0]; +this.XP=[[1],[1]]; C1=[2]; C2=[1]; -exprs=[[string(NMode)],[string(Minitial)],[string(NX)],[sci2exp(X0)],[sci2exp(XP)],[sci2exp(C1)],[sci2exp(C2)]]; -ipar=[[NMode],[Minitial],[NX],[XP],[C1],[C2]]; -rpar=[X0]; +exprs=[[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]]; +ipar=[[NMode],[this.Minitial],[NX],[this.XP],[C1],[C2]]; +rpar=[this.X0]; model=scicos_model(); model.sim=list("automat",10004); model.in1=[[2*NX+1],[2*NX+1]]; @@ -52,7 +52,7 @@ VEC=VEC+","+"\'mat\',[-1,1]"; } GTV="[ok,NMode,Minitial,NX,X0,XP,"+CX+",exprs]=scicos_getvalue(\'Set Finite state machine model\', [\'Number (finite-state) Modes\';\'Initial Mode\';\'Number of continuous-time states\';\'Continuous-time states intial values\';\'Xproperties of continuous-time states in each Mode\';"+MSG+"], list(\'vec\',1,\'vec\',1,\'vec\',1,\'mat\',[-1,-1],\'mat\',[-1,-1],"+VEC+"),exprs)"; execstr(GTV); -if (!ok) { +if (!this.ok) { break; } NMode_old=size(exprs,"*")-5; @@ -65,11 +65,11 @@ if ((NMode_old<NMode)) { exprs.slice(NMode_old+6-1,NMode+5)=exprs[NMode_old+4-1]; ModifEncore=true; } -if ((NX!=size(X0,"*"))) { +if ((NX!=size(this.X0,"*"))) { messagebox("the size of intial continuous-time states should be NX="+string(NX),"modal","error"); ModifEncore=true; } -[rXP,cXP]=size(XP); +[rXP,cXP]=size(this.XP); if (cXP!=NX) { messagebox("Xproperty matrix is not valid: it should have NX="+string(NX)+" columns","modal","error"); ModifEncore=true; @@ -78,13 +78,13 @@ messagebox("Xproperty matrix is not valid: it should have NMode="+string(NMode)+ ModifEncore=true; } else if ((rXP==1)) { for (i=1;i<=NMode-1;i+=1) { -XP=[[XP],[XP[1-1].slice()]]; +this.XP=[[this.XP],[this.XP[1-1].slice()]]; } } if ((NMode_old==NMode)&&(!ModifEncore)) { -XP=matrix(transpose(XP),NMode*NX,1); -ipar=[[NMode],[Minitial],[NX],[XP]]; -rpar=matrix(X0,NX,1); +this.XP=matrix(transpose(this.XP),NMode*NX,1); +ipar=[[NMode],[this.Minitial],[NX],[this.XP]]; +rpar=matrix(this.X0,NX,1); INP=ones(NMode,1); if (NX>0) { OUT=[[2],[2*NX]]; @@ -115,8 +115,8 @@ ModifEncore=true; } } if (!ModifEncore) { -[model,graphics,ok]=check_io(model,graphics,INP,OUT,[],[1]); -if (!ok) { +[model,graphics,this.ok]=check_io(model,graphics,INP,OUT,[],[1]); +if (!this.ok) { break; } model.nzcross=nzcross; diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle new file mode 100644 index 00000000..4c7386e3 --- /dev/null +++ b/js/Misc/AUTOMAT.pickle @@ -0,0 +1,15 @@ +c__builtin__ +set +p0 +((lp1 +S'X0' +p2 +aS'ok' +p3 +aS'XP' +p4 +aS'Minitial' +p5 +atp6 +Rp7 +.
\ No newline at end of file diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BACKLASH.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BOUNCE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BOUNCEXY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BPLATFORM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 78bd0696..8e3eb3ad 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -87,12 +87,12 @@ dep_ut=[depu,dept]; if (funam==" ") { break; } -if (model.sim[1-1]!=funam||sign[size(model.state,"*")-1]!=sign[nx-1]||sign[size(model.dstate,"*")-1]!=sign[nz-1]||model.nzcross!=ng||sign[size(model.evtout,"*")-1]!=sign[nevout-1]) { +if (model.sim[1-1]!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=ng||sign(size(model.evtout,"*"))!=sign(nevout)) { tt=[]; } tt=label[2-1]; while (true) { -[ok,tt,cancel]=CFORTR2[funam-1][tt-1]; +[ok,tt,cancel]=CFORTR2(funam,tt); if (!ok) { if (cancel) { break; diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/CBLOCK.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index bdd0232f..f375d946 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -69,7 +69,7 @@ dep_ut=[depu,dept]; if (funam==" ") { break; } -if (model.sim[1-1]!=funam||sign[size(model.state,"*")-1]!=sign[nx-1]||sign[size(model.dstate,"*")-1]!=sign[nz-1]||model.nzcross!=nzcr||sign[size(model.evtout,"*")-1]!=sign[nevout-1]) { +if (model.sim[1-1]!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=nzcr||sign(size(model.evtout,"*"))!=sign(nevout)) { tt=[]; } tt=label[2-1]; @@ -77,7 +77,7 @@ tt=label[2-1]; } if (ok) { while (true) { -[ok,tt,cancel]=CC4[funam-1][tt-1]; +[ok,tt,cancel]=this.CC4[funam-1][tt-1]; if (!ok) { if (cancel) { break; diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle new file mode 100644 index 00000000..96223756 --- /dev/null +++ b/js/Misc/CBLOCK4.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'CC4' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/CONSTRAINT_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/DEADBAND.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 9aa7813d..8b2bf634 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -19,13 +19,13 @@ exprs=graphics.exprs; textmp=exprs[2-1]; ok=true; while (1==1) { -[txt]=dialog[[["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]]-1][textmp-1]; +[txt]=this.dialog[[["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]]-1][textmp-1]; if (txt!=[]) { tt=["block=debug_scicos(block,flag)"]; if (execstr("deff(tt,txt)","errcatch")==0) { warnMode=warning("query"); warning("off"); -save(TMPDIR+"/debug_scicos",debug_scicos); +save(this.TMPDIR+"/debug_scicos",this.debug_scicos); warning(warnMode); exprs[2-1]=txt; if ((scicos_debug()!=2&&scicos_debug()!=3)) { diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle new file mode 100644 index 00000000..0f09469f --- /dev/null +++ b/js/Misc/DEBUG.pickle @@ -0,0 +1,13 @@ +c__builtin__ +set +p0 +((lp1 +S'debug_scicos' +p2 +aS'TMPDIR' +p3 +aS'dialog' +p4 +atp5 +Rp6 +.
\ No newline at end of file diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js index 4186fc9f..fdc690a8 100644 --- a/js/Misc/DEBUG_SCICOS.js +++ b/js/Misc/DEBUG_SCICOS.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/Misc/DEBUG_SCICOS.sci" */ function DEBUG_SCICOS() { DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() { -x=DEBUG["define"-1]; +x=DEBUG("define"); } DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() { } @@ -9,6 +9,6 @@ x=DEBUG["define"-1]; } DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { arg1.gui="DEBUG"; -[x,y,typ]=DEBUG["set"-1][arg1-1]; +[x,y,typ]=DEBUG("set",arg1); } } diff --git a/js/Misc/DEBUG_SCICOS.pickle b/js/Misc/DEBUG_SCICOS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/DEBUG_SCICOS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/DIFF_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 857c2199..00dad0ab 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -7,7 +7,7 @@ function DSUPER() { DSUPER.prototype.get = function DSUPER() { } DSUPER.prototype.set = function DSUPER() { -y=needcompile; +y=this.needcompile; typ=list(); graphics=arg1.graphics; if ((length(graphics.exprs)==0)) { @@ -36,12 +36,12 @@ tt=tt+",scicos_context."+exprs0[i-1]; ss=graphics.exprs[2-1][3-1]; scicos_context=PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); -if (ok) { +if (this.ok) { x=arg1; PREVAR_scicos_context=scicos_context; sblock=x.model.rpar; -[sblock,%w,needcompile2,ok]=do_eval(sblock,list(),scicos_context); -y=max(2,needcompile,needcompile2); +[sblock,%w,needcompile2,this.ok]=do_eval(sblock,list(),scicos_context); +y=max(2,this.needcompile,needcompile2); x.graphics.exprs[1-1]=exprs; x.model.rpar=sblock; } else { diff --git a/js/Misc/DSUPER.pickle b/js/Misc/DSUPER.pickle new file mode 100644 index 00000000..44fb8b06 --- /dev/null +++ b/js/Misc/DSUPER.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'needcompile' +p2 +aS'ok' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 0d85569d..e8cbd733 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -8,7 +8,7 @@ model.in1=1; model.out=1; model.dstate=0; model.nzcross=1; -model.ipar=sign[edge-1]; +model.ipar=sign(edge); model.blocktype="c"; model.dep_ut=[true,false]; exprs=[string(edge)]; @@ -29,7 +29,7 @@ while (true) { if (!ok) { break; } -model.ipar=sign[edge-1]; +model.ipar=sign(edge); graphics.exprs=exprs; x.graphics=graphics; x.model=model; diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/EDGETRIGGER.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index bb2418b5..aebcc2d2 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -2,7 +2,7 @@ function EDGE_TRIGGER() { EDGE_TRIGGER.prototype.define = function EDGE_TRIGGER() { scs_m_1=scicos_diagram(); -scs_m_1.objs[1-1]=EDGETRIGGER["define"-1]; +scs_m_1.objs[1-1]=this.EDGETRIGGER["define"-1]; scs_m_1.objs[2-1]=IFTHEL_f("define"); scs_m_1.objs[3-1]=IN_f("define"); scs_m_1.objs[4-1]=CLKOUTV_f("define"); @@ -105,9 +105,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (diffobjs(xxn,xx)) { +if (diffobjs(this.xxn,xx)) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)) { @@ -130,7 +130,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -145,7 +145,7 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; y=max(y,needcompile); } diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle new file mode 100644 index 00000000..78b2b289 --- /dev/null +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'EDGETRIGGER' +p2 +aS'xxn' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 65bd7268..6fa4b1ab 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -33,9 +33,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (!isequalbitwise[xxn-1][xx-1]) { +if (!this.isequalbitwise[this.xxn-1][xx-1]) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) { @@ -58,7 +58,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -73,7 +73,7 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; y=max(y,needcompile); } diff --git a/js/Misc/ENDBLK.pickle b/js/Misc/ENDBLK.pickle new file mode 100644 index 00000000..794658bf --- /dev/null +++ b/js/Misc/ENDBLK.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'xxn' +p2 +aS'isequalbitwise' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle new file mode 100644 index 00000000..2d95f3ab --- /dev/null +++ b/js/Misc/EXPRESSION.pickle @@ -0,0 +1,13 @@ +c__builtin__ +set +p0 +((lp1 +S'getfield' +p2 +aS'PREVAR_foo' +p3 +aS'PREVAR_scicos_context' +p4 +atp5 +Rp6 +.
\ No newline at end of file diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/Extract_Activation.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index c4c750b3..6083d128 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -14,7 +14,7 @@ model.nzcross=nzz; model.nmode=1; model.blocktype="c"; model.dep_ut=[true,false]; -exprs=[[string(rpar)],[string(sign[nzz-1])]]; +exprs=[[string(rpar)],[string(sign(nzz))]]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/HYSTHERESIS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/IMPSPLIT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/LOGICAL_OP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 4d5f6201..f4d2b319 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -1,35 +1,35 @@ /* autogenerated from "macros/Misc/MBLOCK.sci" */ function MBLOCK() { MBLOCK.prototype.define = function MBLOCK() { -in1=["u1"]; -intype=["I"]; -out=[["y1"],["y2"]]; -outtype=[["I"],["E"]]; +this.in1=["u1"]; +this.intype=["I"]; +this.out=[["y1"],["y2"]]; +this.outtype=[["I"],["E"]]; param=[["R"],["L"]]; paramv=list(0.1,.0001); pprop=[[0],[0]]; nameF="generic"; -exprs=tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(in1.slice()),sci2exp(intype.slice()),sci2exp(out.slice()),sci2exp(outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); +exprs=tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); model=scicos_model(); model.blocktype="c"; model.dep_ut=[false,true]; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { +for (i=1;i<=lstsize(paramv);i+=1) { model.rpar=[[model.rpar],[paramv[i-1].slice()]]; } mo=modelica(); mo.model=nameF; mo.parameters=list(param,paramv); model.sim=list(mo.model,30004); -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; model.in1=ones(size(mo.inputs,"r"),1); model.out=ones(size(mo.outputs,"r"),1); model.equations=mo; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); -x.graphics.in_implicit=intype; -x.graphics.out_implicit=outtype; +x.graphics.in_implicit=this.intype; +x.graphics.out_implicit=this.outtype; } MBLOCK.prototype.details = function MBLOCK() { } @@ -40,7 +40,7 @@ x=arg1; model=arg1.model; graphics=arg1.graphics; exprs=graphics.exprs; -if (type[exprs-1]==15) { +if (this.type[exprs-1]==15) { paramv=list(); pprop=[]; for (i=1;i<=size(model.rpar,"*");i+=1) { @@ -62,7 +62,7 @@ messagebox("Error in evaluation of variables.","modal","error"); ok=false; } if (ok) { -for (i=1;i<=size(in1,"*");i+=1) { +for (i=1;i<=size(this.in1,"*");i+=1) { r=false; ierr=execstr("r=validvar(in(i))","errcatch"); if (!r) { @@ -71,11 +71,11 @@ break; } } if (!ok) { -messagebox([["Invalid variable name for the input "+string(i)+"."],["\""+in1[i-1]+"\""],["Please choose another variable name."]],"modal","error"); +messagebox([["Invalid variable name for the input "+string(i)+"."],["\""+this.in1[i-1]+"\""],["Please choose another variable name."]],"modal","error"); } } if (ok) { -for (i=1;i<=size(out,"*");i+=1) { +for (i=1;i<=size(this.out,"*");i+=1) { r=false; ierr=execstr("r=validvar(out(i))","errcatch"); if (!r) { @@ -84,7 +84,7 @@ break; } } if (!ok) { -messagebox([["Invalid variable name for the output "+string(i)+"."],["\""+out[i-1]+"\""],["Please choose another variable name."]],"modal","error"); +messagebox([["Invalid variable name for the output "+string(i)+"."],["\""+this.out[i-1]+"\""],["Please choose another variable name."]],"modal","error"); } } if (ok) { @@ -102,8 +102,8 @@ messagebox([["Invalid variable name for the parameter "+string(i)+"."],["\""+par } } if (ok) { -for (i=1;i<=size(intype,"*");i+=1) { -if (intype[i-1]!="E"&&intype[i-1]!="I") { +for (i=1;i<=size(this.intype,"*");i+=1) { +if (this.intype[i-1]!="E"&&this.intype[i-1]!="I") { messagebox("Input type should be \'E\' or \'I\'!","modal","error"); ok=false; break; @@ -111,8 +111,8 @@ break; } } if (ok) { -for (i=1;i<=size(outtype,"*");i+=1) { -if (outtype[i-1]!="E"&&outtype[i-1]!="I") { +for (i=1;i<=size(this.outtype,"*");i+=1) { +if (this.outtype[i-1]!="E"&&this.outtype[i-1]!="I") { messagebox("Output type should be \'E\' or \'I\'!","modal","error"); ok=false; break; @@ -120,13 +120,13 @@ break; } } if (ok) { -if (or(size(intype)!=size(in1))) { +if (or(size(this.intype)!=size(this.in1))) { messagebox("Input variables are not well defined!","modal","error"); ok=false; } } if (ok) { -if (or(size(outtype)!=size(out))) { +if (or(size(this.outtype)!=size(this.out))) { messagebox("Output variables are not well defined!","modal","error"); ok=false; } @@ -145,34 +145,34 @@ ok=false; } } if (ok) { -if (funam=="") { +if (this.funam=="") { messagebox("The filename is not defined!","modal","error"); ok=false; } } if (ok) { -[dirF,nameF,extF]=fileparts(funam); +[dirF,nameF,extF]=fileparts(this.funam); if ((extF!=""&&extF!=".mo")||(dirF!=""&&extF!=".mo")) { messagebox("Filename extention should be \'.mo \' !","modal","error"); ok=false; } } if (ok) { -intypex=find(intype=="I"); -outtypex=find(outtype=="I"); -[model,graphics,ok]=set_io(model,graphics,list([ones(in1),ones(in1)],ones(in1)),list([ones(out),ones(out)],ones(out)),[],[],intypex,outtypex); +intypex=find(this.intype=="I"); +outtypex=find(this.outtype=="I"); +[model,graphics,ok]=set_io(model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); } if (ok) { Tparam_lab=evstr(Tparam); Tparam_sz=size(Tparam_lab,"*"); -if (Tparam_sz>lstsize[lab_2-1]) { -for (i=1;i<=(Tparam_sz-lstsize[lab_2-1]);i+=1) { +if (Tparam_sz>lstsize(lab_2)) { +for (i=1;i<=(Tparam_sz-lstsize(lab_2));i+=1) { lab_2[$+1-1]="0"; } -} else if (Tparam_sz<lstsize[lab_2-1]) { +} else if (Tparam_sz<lstsize(lab_2)) { lab_2_tmp=list(); if (Tparam_sz!=0) { -for (i=1;i<=(lstsize[lab_2-1]-Tparam_sz);i+=1) { +for (i=1;i<=(lstsize(lab_2)-Tparam_sz);i+=1) { lab_2_tmp[i-1]=lab_2[i-1]; } } @@ -210,8 +210,8 @@ execstr("paramv("+string(i)+")=%v"+string(i)); } } if (ok) { -if (extF==".mo"&&fileinfo(funam)!=[]) { -tt=mgetl(funam); +if (extF==".mo"&&fileinfo(this.funam)!=[]) { +tt=mgetl(this.funam); } else { tt=exprs.funtxt; mo=model.equations; @@ -219,7 +219,7 @@ if (mo.model!=nameF) { tt=[]; } } -[ok,tt]=MODCOM(funam,tt,in1,out,param,paramv,pprop); +[ok,tt]=MODCOM(this.funam,tt,this.in1,this.out,param,paramv,pprop); if (!ok) { break; } @@ -227,8 +227,8 @@ break; if (ok) { mo=modelica(); mo.model=nameF; -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; if (max(pprop)>0) { mo.parameters=list(transpose(param),paramv,transpose(pprop)); } else { @@ -236,10 +236,10 @@ mo.parameters=list(transpose(param),paramv); } model.equations=mo; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { +for (i=1;i<=lstsize(paramv);i+=1) { model.rpar=[[model.rpar],[paramv[i-1].slice()]]; } -model.sim[1-1]=funam; +model.sim[1-1]=this.funam; exprs.in1=lab_1[1-1]; exprs.intype=lab_1[2-1]; exprs.out=lab_1[3-1]; @@ -247,8 +247,8 @@ exprs.outtype=lab_1[4-1]; exprs.param=lab_1[5-1]; exprs.paramv=list(); if (Tparam_sz!=0) { -if (type[lab_2-1]==15) { -for (i=1;i<=lstsize[lab_2-1];i+=1) { +if (this.type[lab_2-1]==15) { +for (i=1;i<=lstsize(lab_2);i+=1) { exprs.paramv[i-1]=lab_2[i-1]; } } else { @@ -262,8 +262,8 @@ exprs.nameF=lab_1[7-1]; exprs.funtxt=tt; x.model=model; graphics.gr_i[1-1][1-1]="txt=[\'Modelica\';\' "+nameF+" \'];"; -graphics.in_implicit=intype; -graphics.out_implicit=outtype; +graphics.in_implicit=this.intype; +graphics.out_implicit=this.outtype; graphics.exprs=exprs; x.graphics=graphics; break; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle new file mode 100644 index 00000000..6ed6ac8b --- /dev/null +++ b/js/Misc/MBLOCK.pickle @@ -0,0 +1,19 @@ +c__builtin__ +set +p0 +((lp1 +S'intype' +p2 +aS'in1' +p3 +aS'outtype' +p4 +aS'funam' +p5 +aS'type' +p6 +aS'out' +p7 +atp8 +Rp9 +.
\ No newline at end of file diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/MEMORY_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 83ed4ff3..2342fd37 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -1,35 +1,35 @@ /* autogenerated from "macros/Misc/MPBLOCK.sci" */ function MPBLOCK() { MPBLOCK.prototype.define = function MPBLOCK() { -in1=["u"]; -intype=["I"]; -out=[["y1"],["y2"]]; -outtype=[["I"],["I"]]; +this.in1=["u"]; +this.intype=["I"]; +this.out=[["y1"],["y2"]]; +this.outtype=[["I"],["I"]]; param=[]; paramv=list(); pprop=[]; nameF="myModel"; -exprs=tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(in1.slice()),sci2exp(intype.slice()),sci2exp(out.slice()),sci2exp(outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); +exprs=tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); model=scicos_model(); model.blocktype="c"; model.dep_ut=[true,true]; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { +for (i=1;i<=lstsize(paramv);i+=1) { model.rpar=[[model.rpar],[paramv[i-1].slice()]]; } mo=modelica(); mo.model=nameF; mo.parameters=list(param,paramv); model.sim=list(mo.model,10004); -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; model.in1=ones(size(mo.inputs,"r"),1); model.out=ones(size(mo.outputs,"r"),1); model.equations=mo; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); -x.graphics.in_implicit=intype; -x.graphics.out_implicit=outtype; +x.graphics.in_implicit=this.intype; +x.graphics.out_implicit=this.outtype; } MPBLOCK.prototype.details = function MPBLOCK() { } @@ -40,7 +40,7 @@ x=arg1; model=arg1.model; graphics=arg1.graphics; exprs=graphics.exprs; -if (type[exprs-1]==15) { +if (this.type[exprs-1]==15) { paramv=list(); pprop=[]; for (i=1;i<=size(model.rpar,"*");i+=1) { @@ -62,7 +62,7 @@ x_message("Error in evaluation of variables."); ok=false; } if (ok) { -for (i=1;i<=size(in1,"*");i+=1) { +for (i=1;i<=size(this.in1,"*");i+=1) { r=false; ierr=execstr("r=validvar(in(i))","errcatch"); if (!r) { @@ -71,11 +71,11 @@ break; } } if (!ok) { -x_message([["Invalid variable name for the input "+string(i)+"."],["\""+in1[i-1]+"\""],["Please choose another variable name."]]); +x_message([["Invalid variable name for the input "+string(i)+"."],["\""+this.in1[i-1]+"\""],["Please choose another variable name."]]); } } if (ok) { -for (i=1;i<=size(out,"*");i+=1) { +for (i=1;i<=size(this.out,"*");i+=1) { r=false; ierr=execstr("r=validvar(out(i))","errcatch"); if (!r) { @@ -84,7 +84,7 @@ break; } } if (!ok) { -x_message([["Invalid variable name for the output "+string(i)+"."],["\""+out[i-1]+"\""],["Please choose another variable name."]]); +x_message([["Invalid variable name for the output "+string(i)+"."],["\""+this.out[i-1]+"\""],["Please choose another variable name."]]); } } if (ok) { @@ -102,8 +102,8 @@ x_message([["Invalid variable name for the parameter "+string(i)+"."],["\""+para } } if (ok) { -for (i=1;i<=size(intype,"*");i+=1) { -if (intype[i-1]!="E"&&intype[i-1]!="I") { +for (i=1;i<=size(this.intype,"*");i+=1) { +if (this.intype[i-1]!="E"&&this.intype[i-1]!="I") { x_message("Input type should be \'E\' or \'I\'!"); ok=false; break; @@ -111,8 +111,8 @@ break; } } if (ok) { -for (i=1;i<=size(outtype,"*");i+=1) { -if (outtype[i-1]!="E"&&outtype[i-1]!="I") { +for (i=1;i<=size(this.outtype,"*");i+=1) { +if (this.outtype[i-1]!="E"&&this.outtype[i-1]!="I") { x_message("Output type should be \'E\' or \'I\'!"); ok=false; break; @@ -120,13 +120,13 @@ break; } } if (ok) { -if (or(size(intype)!=size(in1))) { +if (or(size(this.intype)!=size(this.in1))) { x_message("Input variables are not well defined!"); ok=false; } } if (ok) { -if (or(size(outtype)!=size(out))) { +if (or(size(this.outtype)!=size(this.out))) { x_message("Output variables are not well defined!"); ok=false; } @@ -145,31 +145,31 @@ ok=false; } } if (ok) { -if (funam=="") { +if (this.funam=="") { x_message("The model name is not defined!"); ok=false; } } if (ok) { -[dirF,nameF,extF]=fileparts(funam); +[dirF,nameF,extF]=fileparts(this.funam); if ((extF!="")||(dirF!="")) { x_message("Invalid model name!"); ok=false; } } if (ok) { -intypex=find(intype=="I"); -outtypex=find(outtype=="I"); -[model,graphics,ok]=set_io(model,graphics,list([ones(in1),ones(in1)],ones(in1)),list([ones(out),ones(out)],ones(out)),[],[],intypex,outtypex); +intypex=find(this.intype=="I"); +outtypex=find(this.outtype=="I"); +[model,graphics,ok]=set_io(model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); } if (ok) { Tparam_lab=evstr(Tparam); Tparam_sz=size(Tparam_lab,"*"); -if (Tparam_sz>lstsize[lab_2-1]) { -for (i=1;i<=(Tparam_sz-lstsize[lab_2-1]);i+=1) { +if (Tparam_sz>lstsize(lab_2)) { +for (i=1;i<=(Tparam_sz-lstsize(lab_2));i+=1) { lab_2[$+1-1]="0"; } -} else if (Tparam_sz<lstsize[lab_2-1]) { +} else if (Tparam_sz<lstsize(lab_2)) { lab_2_tmp=list(); if (Tparam_sz!=0) { for (i=1;i<=Tparam_sz;i+=1) { @@ -217,8 +217,8 @@ execstr("paramv("+string(i)+")=%v"+string(i)); if (ok) { mo=modelica(); mo.model=nameF; -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; if (pprop!=[]) { if (max(pprop)>0) { mo.parameters=list(transpose(param),paramv,transpose(pprop)); @@ -228,10 +228,10 @@ mo.parameters=list(transpose(param),paramv); } model.equations=mo; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { -model.rpar=[[model.rpar],[double[paramv[i-1].slice()-1]]]; +for (i=1;i<=lstsize(paramv);i+=1) { +model.rpar=[[model.rpar],[double(paramv[i-1].slice())]]; } -model.sim[1-1]=funam; +model.sim[1-1]=this.funam; exprs.in1=lab_1[1-1]; exprs.intype=lab_1[2-1]; exprs.out=lab_1[3-1]; @@ -239,8 +239,8 @@ exprs.outtype=lab_1[4-1]; exprs.param=lab_1[5-1]; exprs.paramv=list(); if (Tparam_sz!=0) { -if (type[lab_2-1]==15) { -for (i=1;i<=lstsize[lab_2-1];i+=1) { +if (this.type[lab_2-1]==15) { +for (i=1;i<=lstsize(lab_2);i+=1) { exprs.paramv[i-1]=lab_2[i-1]; } } else { @@ -254,8 +254,8 @@ exprs.nameF=lab_1[7-1]; exprs.funtxt=""; x.model=model; graphics.gr_i[1-1][1-1]="txt=[\' "+nameF+" \'];"; -graphics.in_implicit=intype; -graphics.out_implicit=outtype; +graphics.in_implicit=this.intype; +graphics.out_implicit=this.outtype; graphics.exprs=exprs; x.graphics=graphics; break; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle new file mode 100644 index 00000000..6ed6ac8b --- /dev/null +++ b/js/Misc/MPBLOCK.pickle @@ -0,0 +1,19 @@ +c__builtin__ +set +p0 +((lp1 +S'intype' +p2 +aS'in1' +p3 +aS'outtype' +p4 +aS'funam' +p5 +aS'type' +p6 +aS'out' +p7 +atp8 +Rp9 +.
\ No newline at end of file diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/PAL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/RATELIMITER.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/RELATIONALOP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/SPLIT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/SUPER_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/TEXT_f.pickle b/js/Misc/TEXT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/TEXT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/c_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/fortran_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index d7e4b6f0..1d1f2889 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -21,7 +21,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; x=arg1; model=x.model; -[ok,mac,exprs]=genfunc[exprs-1]; +[ok,mac,exprs]=this.genfunc[exprs-1]; if (ok) { model.sim=mac; graphics.exprs=exprs; diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle new file mode 100644 index 00000000..492b549b --- /dev/null +++ b/js/Misc/func_block.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'genfunc' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/generic_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/generic_block2.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 54eee1ef..ec554743 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -52,11 +52,11 @@ message("vector event links not supported"); ok=false; } } -if (type[opar-1]!=15) { +if (this.type[opar-1]!=15) { message("object parameter must be a list"); ok=false; } -if (type[oz-1]!=15) { +if (this.type[oz-1]!=15) { message("discrete object state must be a list"); ok=false; } diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle new file mode 100644 index 00000000..0ac03d7f --- /dev/null +++ b/js/Misc/generic_block3.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'type' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 4938c66f..12da9da6 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -50,7 +50,7 @@ exprs[1-1]=lab; xx=xx.slice(); z=z.slice(); rpar=rpar.slice(); -nrp=prod[size(rpar)-1]; +nrp=prod(size(rpar)); i=int(i.slice()); ni=size(i,1); o=int(o.slice()); diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/scifunc_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index aaf8724f..e9d6bd44 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -54,7 +54,7 @@ z=z.slice(); rpar=rpar.slice(); it=ones(1,size(i,1)); ot=ones(1,size(o,1)); -nrp=prod[size(rpar)-1]; +nrp=prod(size(rpar)); ni=size(i,1); no=size(o,1); ci=int(ci.slice()); diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/scifunc_block_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file |