diff options
| author | Sunil Shetye | 2018-07-13 15:37:42 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-07-15 07:11:58 +0530 |
| commit | 6ee02952c836bb31e9b51783e6a16724fba64637 (patch) | |
| tree | bde996b5477f57f4faca4ba3a173bed2fdf0c359 | |
| parent | 214ade87a6cef2bf55f9b9f2848ffafc02f37f18 (diff) | |
| download | sci2js-6ee02952c836bb31e9b51783e6a16724fba64637.tar.gz sci2js-6ee02952c836bb31e9b51783e6a16724fba64637.tar.bz2 sci2js-6ee02952c836bb31e9b51783e6a16724fba64637.zip | |
change in1 to in
501 files changed, 4645 insertions, 6383 deletions
@@ -26,7 +26,7 @@ js/%.pickle: macros/%.sci sci2jsyacc.py parsetab.py sci2jslex.py ./sci2jsyacc.py $< $@ 1 > js/$*.js.old 2> /dev/null && $(RM) js/$*.js.old js/%.js: macros/%.sci js/%.pickle sci2jsyacc.py parsetab.py sci2jslex.py - ./sci2jsyacc.py $< js/$*.pickle 2 > $@ 2> js/$*.yacc + ./sci2jsyacc.py $< js/$*.pickle 2 2> js/$*.yacc | fgrep -vw arg1 > $@ parsetab.py: macros/Misc/DEBUG_SCICOS.sci sci2jsyacc.py sci2jslex.py @rm -f $@* parser.out diff --git a/combined.js b/combined.js index 083b5444..fecb0e11 100644 --- a/combined.js +++ b/combined.js @@ -24,9 +24,6 @@ function CLKFROM() { CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),this.exprs); @@ -79,9 +76,6 @@ function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),this.exprs); @@ -117,7 +111,7 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() { this.model = scicos_model(); this.model.sim = new ScilabString(["clkgototagvisibility"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.out2 = new ScilabDouble([]); @@ -145,10 +139,7 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { @@ -176,7 +167,7 @@ function DEMUX() { this.out = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([0]); + this.model.in = new ScilabDouble([0]); this.model.out = new ScilabDouble(-transpose([1:this.out])); this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); @@ -199,10 +190,7 @@ function DEMUX() { DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),this.exprs); if (!ok) { @@ -254,7 +242,7 @@ function DEMUX_f() { this.out = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["demux"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([0]); + this.model.in = new ScilabDouble([0]); this.model.out = new ScilabDouble(-transpose([1:this.out])); this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); @@ -277,10 +265,7 @@ function DEMUX_f() { DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),this.exprs); if (!ok) { @@ -332,7 +317,7 @@ function ESELECT_f() { this.out = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["eselect"]), new ScilabDouble([-2])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); @@ -363,8 +348,6 @@ function ESELECT_f() { this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==1) { this.exprs[2-1] = string(1); @@ -372,7 +355,6 @@ function ESELECT_f() { if (size(this.exprs,"*")==2) { this.exprs[3-1] = string(0); } - this.model = arg1.model; while (true) { [ok,this.out,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -415,7 +397,7 @@ function EXTRACTOR() { this.ind = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["extractor"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -437,10 +419,7 @@ function EXTRACTOR() { EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.ind,this.exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),this.exprs); if (!ok) { @@ -468,7 +447,7 @@ function FROM() { FROM.prototype.define = function FROM() { this.model = scicos_model(); this.model.sim = new ScilabString(["from"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -496,10 +475,7 @@ function FROM() { FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { @@ -526,7 +502,7 @@ function FROMMO() { FROMMO.prototype.define = function FROMMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["frommo"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -557,10 +533,7 @@ function FROMMO() { FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { @@ -587,7 +560,7 @@ function GOTO() { GOTO.prototype.define = function GOTO() { this.model = scicos_model(); this.model.sim = new ScilabString(["goto"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([]); @@ -617,10 +590,7 @@ function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { @@ -641,7 +611,6 @@ function GOTO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; this.x.graphics = this.graphics; - var arg1 = this.x; break; } } @@ -654,7 +623,7 @@ function GOTOMO() { GOTOMO.prototype.define = function GOTOMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["gotomo"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([]); this.model.out = new ScilabDouble([]); @@ -687,10 +656,7 @@ function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { @@ -711,7 +677,6 @@ function GOTOMO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; this.x.graphics = this.graphics; - var arg1 = this.x; break; } } @@ -724,7 +689,7 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.define = function GotoTagVisibility() { this.model = scicos_model(); this.model.sim = new ScilabString(["gototagvisibility"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.out2 = new ScilabDouble([]); @@ -752,10 +717,7 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { @@ -782,7 +744,7 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["gototagvisibilitymo"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.out2 = new ScilabDouble([]); @@ -810,10 +772,7 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { @@ -843,7 +802,7 @@ function ISELECT_f() { this.nout = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble(out); this.model.evtin = new ScilabDouble([ones(out)]); this.model.dstate = new ScilabDouble([this.z0]); @@ -868,10 +827,7 @@ function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -906,7 +862,7 @@ function ISELECT_m() { this.model.out = new ScilabDouble([-1],[-1]); this.model.out2 = new ScilabDouble([-2],[-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([]); @@ -939,10 +895,7 @@ function ISELECT_m() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -982,7 +935,7 @@ function MUX() { this.in1 = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(-transpose([1:this.in1])); + this.model.in = new ScilabDouble(-transpose([1:this.in1])); this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); @@ -1003,10 +956,7 @@ function MUX() { MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),this.exprs); if (!ok) { @@ -1058,7 +1008,7 @@ function MUX_f() { this.in1 = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mux"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble(-transpose([1:this.in1])); + this.model.in = new ScilabDouble(-transpose([1:this.in1])); this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); @@ -1079,10 +1029,7 @@ function MUX_f() { MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),this.exprs); if (!ok) { @@ -1136,7 +1083,7 @@ function M_SWITCH() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mswitch"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -1162,10 +1109,7 @@ function M_SWITCH() { this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nin,this.base,this.rule,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -1214,7 +1158,7 @@ function NRMSOM_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["junk"]); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -1235,10 +1179,7 @@ function NRMSOM_f() { NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nin,this.exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),this.exprs); if (!ok) { @@ -1266,7 +1207,7 @@ function RELAY_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relay"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([i0]); @@ -1292,10 +1233,7 @@ function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; while (true) { [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); @@ -1328,7 +1266,7 @@ function SCALAR2VECTOR() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["scalar2vector"]), new ScilabDouble([4])); this.model.out = new ScilabDouble([this.nout]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string([this.nout])]; @@ -1348,10 +1286,7 @@ function SCALAR2VECTOR() { SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nout,this.exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),this.exprs); if (!ok) { @@ -1386,7 +1321,7 @@ function SELECT_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); @@ -1411,10 +1346,7 @@ function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -1446,7 +1378,7 @@ function SELECT_m() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -1482,10 +1414,7 @@ function SELECT_m() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -1530,7 +1459,7 @@ function SELF_SWITCH() { this.x.graphics.pin = 0; this.x.graphics.pout = 0; this.x.model.sim = "csuper"; - this.x.model.in1 = 1; + this.x.model.in = 1; this.x.model.out = 1; this.x.model.blocktype = "h"; this.x.model.dep_ut = [false,false]; @@ -1552,7 +1481,6 @@ function SELF_SWITCH() { return options; } SELF_SWITCH.prototype.set = function SELF_SWITCH() { - this.x = arg1; this.stateOpen = this.x.model.opar[1-1]; this.x.model.rpar = genSwitchInnerDiagram(!this.stateOpen); this.x.model.opar = list(!this.stateOpen); @@ -1575,7 +1503,7 @@ function SWITCH2() { var rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); @@ -1604,10 +1532,7 @@ function SWITCH2() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -1645,7 +1570,7 @@ function SWITCH2_m() { var rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[1],[-1]); + this.model.in = new ScilabDouble([-1],[1],[-1]); this.model.in2 = new ScilabDouble([-2],[1],[-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -1680,10 +1605,7 @@ function SWITCH2_m() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.ot,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -1714,7 +1636,7 @@ function SWITCH2_m() { it[1-1] = this.ot; it[2-1] = 1; it[3-1] = this.ot; - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,this.ot),[],[]); this.model = tmpvar0[0]; @@ -1738,7 +1660,7 @@ function SWITCH_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switchn"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); @@ -1763,10 +1685,7 @@ function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; while (true) { [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),this.exprs); @@ -1836,7 +1755,7 @@ function CCS() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -1852,11 +1771,7 @@ function CCS() { return options; } CCS.prototype.set = function CCS() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; return new BasicBlock(this.x); } } @@ -1904,7 +1819,7 @@ function CVS() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -1920,11 +1835,7 @@ function CVS() { return options; } CVS.prototype.set = function CVS() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; return new BasicBlock(this.x); } } @@ -1944,7 +1855,7 @@ function Capacitor() { mo.outputs = "n"; mo.parameters = list(["C","v"],list(this.C,this.v),[0,1]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); @@ -1967,10 +1878,7 @@ function Capacitor() { this.C = parseFloat(arguments[0]["C"]) this.v = parseFloat(arguments[0]["v"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.v,this.exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -1992,7 +1900,7 @@ function ConstantVoltage() { this.V = 0.01; this.model = scicos_model(); this.model.rpar = new ScilabDouble([this.V]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); @@ -2021,10 +1929,7 @@ function ConstantVoltage() { ConstantVoltage.prototype.set = function ConstantVoltage() { this.V = parseFloat(arguments[0]["V"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.V,this.exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),this.exprs); if (!ok) { @@ -2044,7 +1949,7 @@ function ConstantVoltage() { function CurrentSensor() { CurrentSensor.prototype.define = function CurrentSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); this.model.blocktype = new ScilabString(["c"]); @@ -2070,7 +1975,6 @@ function CurrentSensor() { return options; } CurrentSensor.prototype.set = function CurrentSensor() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -2083,7 +1987,7 @@ function Diode() { this.R = 1.e8; this.model = scicos_model(); this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); this.model.blocktype = new ScilabString(["c"]); @@ -2119,10 +2023,7 @@ function Diode() { this.Maxexp = parseFloat(arguments[0]["Maxexp"]) this.R = parseFloat(arguments[0]["R"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Ids,this.Vt,this.Maxexp,this.R,this.exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -2142,7 +2043,7 @@ function Diode() { function Ground() { Ground.prototype.define = function Ground() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); this.model.blocktype = new ScilabString(["c"]); @@ -2167,7 +2068,6 @@ function Ground() { return options; } Ground.prototype.set = function Ground() { - this.x = arg1; return new GroundBlock(this.x); } } @@ -2215,7 +2115,7 @@ function Gyrator() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -2236,11 +2136,7 @@ function Gyrator() { this.G1 = arguments[0]["G1"] this.G2 = arguments[0]["G2"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.G1,this.G2,this.exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),this.exprs); @@ -2298,7 +2194,7 @@ function IdealTransformer() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -2317,11 +2213,7 @@ function IdealTransformer() { IdealTransformer.prototype.set = function IdealTransformer() { this.N = arguments[0]["N"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.N,this.exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),this.exprs); @@ -2339,7 +2231,7 @@ function IdealTransformer() { function Inductor() { Inductor.prototype.define = function Inductor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.L = 1.e-5; this.model.rpar = new ScilabDouble([this.L]); @@ -2370,10 +2262,7 @@ function Inductor() { Inductor.prototype.set = function Inductor() { this.L = parseFloat(arguments[0]["L"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.L,this.exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),this.exprs); if (!ok) { @@ -2394,7 +2283,7 @@ function MOTOR() { MOTOR.prototype.define = function MOTOR() { this.model = scicos_model(); this.model.out = new ScilabDouble([1],[1]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -2414,7 +2303,6 @@ function MOTOR() { return options; } MOTOR.prototype.set = function MOTOR() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -2440,7 +2328,7 @@ function NMOS() { mo.inputs = "G"; mo.parameters = list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[this.W],[this.L],[this.Beta],[this.Vt],[this.K2],[this.K5],[this.dW],[this.dL],[this.RDS]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); @@ -2477,10 +2365,7 @@ function NMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -2539,7 +2424,7 @@ function NPN() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -2590,11 +2475,7 @@ function NPN() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,this.exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); @@ -2623,7 +2504,7 @@ function OpAmp() { mo.outputs = ["out"]; mo.parameters = list(S,Z); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); @@ -2649,10 +2530,7 @@ function OpAmp() { this.SatH = arguments[0]["SatH"] this.SatL = arguments[0]["SatL"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (false) { [ok,this.OLGain,this.SatH,this.SatL,this.exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -2689,7 +2567,7 @@ function PMOS() { mo.inputs = "G"; mo.parameters = list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[this.W],[this.L],[this.Beta],[this.Vt],[this.K2],[this.K5],[this.dW],[this.dL],[this.RDS]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); @@ -2726,10 +2604,7 @@ function PMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -2788,7 +2663,7 @@ function PNP() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -2839,11 +2714,7 @@ function PNP() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,this.exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); @@ -2861,7 +2732,7 @@ function PNP() { function PotentialSensor() { PotentialSensor.prototype.define = function PotentialSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); @@ -2887,7 +2758,6 @@ function PotentialSensor() { return options; } PotentialSensor.prototype.set = function PotentialSensor() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -2906,7 +2776,7 @@ function Resistor() { mo.outputs = "n"; mo.parameters = list("R",list(this.R)); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); @@ -2926,10 +2796,7 @@ function Resistor() { Resistor.prototype.set = function Resistor() { this.R = parseFloat(arguments[0]["R"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.R,this.exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),this.exprs); if (!ok) { @@ -2949,7 +2816,7 @@ function Resistor() { function SineVoltage() { SineVoltage.prototype.define = function SineVoltage() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.V = 1; this.ph = 0; @@ -2993,10 +2860,7 @@ function SineVoltage() { this.offset = parseFloat(arguments[0]["offset"]) this.start = parseFloat(arguments[0]["start"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.V,this.ph,this.frq,this.offset,this.start,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -3029,7 +2893,7 @@ function Switch() { mo.outputs = "n"; mo.parameters = list(S,Z); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); @@ -3053,10 +2917,7 @@ function Switch() { this.Ron = parseFloat(arguments[0]["Ron"]) this.Roff = parseFloat(arguments[0]["Roff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Ron,this.Roff,this.exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -3075,7 +2936,7 @@ function Switch() { function VVsourceAC() { VVsourceAC.prototype.define = function VVsourceAC() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); var VA = 220; this.FR = 50; @@ -3108,10 +2969,7 @@ function VVsourceAC() { VVsourceAC.prototype.set = function VVsourceAC() { this.FR = parseFloat(arguments[0]["FR"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),this.exprs); if (!ok) { @@ -3139,7 +2997,7 @@ function VariableResistor() { mo.inputs = ["p","R"]; mo.outputs = "n"; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); @@ -3157,7 +3015,6 @@ function VariableResistor() { return options; } VariableResistor.prototype.set = function VariableResistor() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -3165,7 +3022,7 @@ function VariableResistor() { function VoltageSensor() { VoltageSensor.prototype.define = function VoltageSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); this.model.blocktype = new ScilabString(["c"]); @@ -3191,7 +3048,6 @@ function VoltageSensor() { return options; } VoltageSensor.prototype.set = function VoltageSensor() { - this.x = arg1; return new VoltageSensorBlock(this.x); } } @@ -3199,7 +3055,7 @@ function VoltageSensor() { function VsourceAC() { VsourceAC.prototype.define = function VsourceAC() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.VA = 220; this.FR = 50; @@ -3234,10 +3090,7 @@ function VsourceAC() { this.VA = parseFloat(arguments[0]["VA"]) this.FR = parseFloat(arguments[0]["FR"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.VA,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -3331,7 +3184,6 @@ function ANDBLK() { return options; } ANDBLK.prototype.set = function ANDBLK() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -3358,7 +3210,6 @@ function ANDLOG_f() { return options; } ANDLOG_f.prototype.set = function ANDLOG_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -3385,7 +3236,6 @@ function CLKSOMV_f() { return options; } CLKSOMV_f.prototype.set = function CLKSOMV_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -3412,7 +3262,6 @@ function CLKSOM_f() { return options; } CLKSOM_f.prototype.set = function CLKSOM_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -3438,7 +3287,6 @@ function CLKSPLIT_f() { return options; } CLKSPLIT_f.prototype.set = function CLKSPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -3470,10 +3318,7 @@ function END_c() { END_c.prototype.set = function END_c() { this.tf = parseFloat(arguments[0]["tf"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tf,this.exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),this.exprs); if (!ok) { @@ -3522,10 +3367,7 @@ function EVTDLY_c() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -3579,10 +3421,7 @@ function EVTDLY_f() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -3631,10 +3470,7 @@ function EVTGEN_f() { EVTGEN_f.prototype.set = function EVTGEN_f() { this.tt = parseFloat(arguments[0]["tt"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tt,this.exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),this.exprs); if (!ok) { @@ -3656,7 +3492,7 @@ function EVTVARDLY() { EVTVARDLY.prototype.define = function EVTVARDLY() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["evtvardly"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -3679,10 +3515,7 @@ function EVTVARDLY() { EVTVARDLY.prototype.set = function EVTVARDLY() { this.fir = arguments[0]["fir"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.fir,this.exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),this.exprs); if (!ok) { @@ -3725,10 +3558,7 @@ function HALT_f() { HALT_f.prototype.set = function HALT_f() { this.n = parseFloat(arguments[0]["n"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.n,this.exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),this.exprs); if (!ok) { @@ -3750,7 +3580,7 @@ function IFTHEL_f() { IFTHEL_f.prototype.define = function IFTHEL_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["ifthel"]), new ScilabDouble([-1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); @@ -3761,7 +3591,7 @@ function IFTHEL_f() { this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; + this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } @@ -3779,10 +3609,7 @@ function IFTHEL_f() { this.inh = inverse(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (this.exprs==[]) { this.exprs = string(1); } @@ -3899,8 +3726,6 @@ function MCLOCK_f() { return options; } MCLOCK_f.prototype.set = function MCLOCK_f() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") { var path = i; break; @@ -3908,13 +3733,10 @@ function MCLOCK_f() { } var newpar = list(); var spath = list("model","rpar","objs",path); - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (or(this.xxn!=xx)) { - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; } - this.x = arg1; var y = 0; var typ = newpar; return new BasicBlock(this.x); @@ -3954,10 +3776,7 @@ function MFCLCK_f() { this.dt = parseFloat(arguments[0]["dt"]) this.nn = parseFloat(arguments[0]["nn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; [ok,this.dt,this.nn,this.exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),this.exprs); if (ok) { this.model.ipar = new ScilabDouble([this.nn]); @@ -4003,9 +3822,6 @@ function M_freq() { this.frequ = inverse(arguments[0]["frequ"]) this.offset = inverse(arguments[0]["offset"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),this.exprs); @@ -4082,7 +3898,6 @@ function VirtualCLK0() { return options; } VirtualCLK0.prototype.set = function VirtualCLK0() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -4209,8 +4024,6 @@ function freq_div() { %ph = parseFloat(arguments[0]["%ph"]) %df = parseFloat(arguments[0]["%df"]) this.exprs = inverse(arguments[0]["exprs"]) - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="Modulo_Count") { var path = i; break; @@ -4223,7 +4036,6 @@ function freq_div() { spath[$+1-1] = "rpar"; spath[$+1-1] = "objs"; spath[$+1-1] = path; - var xx = arg1[spath-1]; var xxn = xx; this.graphics = xx.graphics; this.exprs = this.graphics.exprs; @@ -4254,7 +4066,7 @@ function freq_div() { var model_n = xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { @@ -4286,11 +4098,9 @@ function freq_div() { var needcompile = 4; } } - arg1[spath-1] = xxn; newpar[size(newpar)+1-1] = 1; var y = max(y,needcompile); } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } @@ -4301,7 +4111,7 @@ function Bache() { var in1 = 2; var out = 3; this.model = scicos_model(); - this.model.in1 = new ScilabDouble([-transpose([1:in1])]); + this.model.in = new ScilabDouble([-transpose([1:in1])]); this.model.out = new ScilabDouble([-transpose([1:out])]); this.Patm = 1.013e5; this.A = 1; @@ -4322,7 +4132,7 @@ function Bache() { mo.outputs = ["Cs1","Cs2","yNiveau"]; mo.parameters = list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); @@ -4359,10 +4169,7 @@ function Bache() { this.T0 = parseFloat(arguments[0]["T0"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -4422,7 +4229,7 @@ function Flowmeter() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -4440,11 +4247,7 @@ function Flowmeter() { Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (false) { [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs); @@ -4462,7 +4265,7 @@ function Flowmeter() { function PerteDP() { PerteDP.prototype.define = function PerteDP() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.L = 10; this.D = 0.2; @@ -4480,7 +4283,7 @@ function PerteDP() { mo.outputs = "C2"; mo.parameters = list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); @@ -4511,10 +4314,7 @@ function PerteDP() { this.z2 = parseFloat(arguments[0]["z2"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -4547,7 +4347,7 @@ function PuitsP() { mo.inputs = ["C"]; mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); @@ -4572,10 +4372,7 @@ function PuitsP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -4609,7 +4406,7 @@ function SourceP() { mo.outputs = ["C"]; mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); @@ -4635,10 +4432,7 @@ function SourceP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -4658,7 +4452,7 @@ function SourceP() { function VanneReglante() { VanneReglante.prototype.define = function VanneReglante() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.Cvmax = 8005.42; this.p_rho = 0; @@ -4672,7 +4466,7 @@ function VanneReglante() { mo.outputs = "C2"; mo.parameters = list([["Cvmax"],["p_rho"]],[[this.Cvmax],[this.p_rho]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); @@ -4695,10 +4489,7 @@ function VanneReglante() { this.Cvmax = parseFloat(arguments[0]["Cvmax"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -4719,7 +4510,7 @@ function BITCLEAR() { BITCLEAR.prototype.define = function BITCLEAR() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["bit_clear_32"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -4747,16 +4538,13 @@ function BITCLEAR() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; if (floor(this.bit)!=this.bit) { block_parameter_error(msprintf("Wrong type for \'%s\' parameter: %5.1f.","Index of Bit",this.bit),"Must be integer."); var ok = false; @@ -4819,7 +4607,7 @@ function BITSET() { BITSET.prototype.define = function BITSET() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["bit_set_32"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -4847,16 +4635,13 @@ function BITSET() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; if (floor(this.bit)!=this.bit) { block_parameter_error(msprintf("Wrong type for \'%s\' parameter: %5.1f.","Index of Bit",this.bit),"Must be integer."); var ok = false; @@ -4918,7 +4703,7 @@ function CONVERT() { var sgn = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["convert"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-2]); @@ -4949,9 +4734,6 @@ function CONVERT() { this.ot = parseFloat(arguments[0]["ot"]) this.np = arguments[0]["np"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.it,this.ot,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),this.exprs); @@ -5280,7 +5062,7 @@ function CONVERT() { } } } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(out,this.ot),[],[]); @@ -5378,7 +5160,7 @@ function DFLIPFLOP() { scs_m.objs[44-1] = scicos_link(xx=[[279.98293],[279.98293],[325.53038],[325.53038]],yy=[[372.50232],[315.89455],[315.89455],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -5401,7 +5183,6 @@ function DFLIPFLOP() { return options; } DFLIPFLOP.prototype.set = function DFLIPFLOP() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -5430,7 +5211,7 @@ function DLATCH() { scs_m.objs[19-1] = scicos_link(xx=[[305.09603],[325.09603]],yy=[[280.83282],[280.83282]],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -5453,7 +5234,6 @@ function DLATCH() { return options; } DLATCH.prototype.set = function DLATCH() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -5463,7 +5243,7 @@ function EXTRACTBITS() { var numb = []; this.model = scicos_model(); this.model.sim = list(new ScilabString(["extract_bit_32_UH0"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -5495,10 +5275,7 @@ function EXTRACTBITS() { this.bit = parseFloat(arguments[0]["bit"]) this.scal = arguments[0]["scal"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Datatype,this.rule,this.bit,this.scal,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { @@ -5512,7 +5289,7 @@ function EXTRACTBITS() { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Treat Bit Field as an Integer",this.scal),msprintf("Must be in the interval %s.","[0, 1]")); var ok = false; } else { - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; this.bit = int(this.bit); this.rule = int(this.rule); if ((this.rule==3)||(this.rule==4)) { @@ -5710,7 +5487,7 @@ function INTMUL() { var sgn = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_i32"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out2 = new ScilabDouble([-3]); @@ -5739,9 +5516,6 @@ function INTMUL() { this.Datatype = arguments[0]["Datatype"] this.np = arguments[0]["np"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.Datatype,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),this.exprs); @@ -5805,7 +5579,7 @@ function INTMUL() { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",ot),msprintf("Must be in the interval %s.","[3, 8]")); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); @@ -5860,7 +5634,7 @@ function JKFLIPFLOP() { scs_m.objs[22-1] = scicos_link(xx=[[446.2036],[466.2036]],yy=[[179.25363],[179.25363]],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -5885,15 +5659,12 @@ function JKFLIPFLOP() { JKFLIPFLOP.prototype.set = function JKFLIPFLOP() { this.init = parseFloat(arguments[0]["init"]) this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; @@ -5911,7 +5682,6 @@ function JKFLIPFLOP() { xx.graphics.exprs[1-1] = this.exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -5920,7 +5690,6 @@ function JKFLIPFLOP() { newpar[size(newpar)+1-1] = 1; var needcompile = 2; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); @@ -5932,7 +5701,7 @@ function LOGIC() { this.mat = [[0],[0],[0],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logic"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -5962,10 +5731,7 @@ function LOGIC() { this.mat = inverse(arguments[0]["mat"]) this.herit = arguments[0]["herit"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.mat,this.herit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),this.exprs); if (!ok) { @@ -6013,7 +5779,7 @@ function SHIFT() { var OPER = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["shift_32_LA"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-2]); @@ -6044,9 +5810,6 @@ function SHIFT() { this.nb = arguments[0]["nb"] this.np = arguments[0]["np"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.Datatype,this.nb,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),this.exprs); @@ -6163,7 +5926,7 @@ function SRFLIPFLOP() { scs_m.objs[14-1] = scicos_link(xx=[[363.03733],[383.03733]],yy=[[248.584],[248.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -6188,15 +5951,12 @@ function SRFLIPFLOP() { SRFLIPFLOP.prototype.set = function SRFLIPFLOP() { this.init = parseFloat(arguments[0]["init"]) this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; @@ -6214,7 +5974,6 @@ function SRFLIPFLOP() { xx.graphics.exprs[1-1] = this.exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -6223,7 +5982,6 @@ function SRFLIPFLOP() { newpar[size(newpar)+1-1] = path; var needcompile = 2; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); @@ -6235,7 +5993,7 @@ function BIGSOM_f() { this.sgn = [[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); @@ -6256,9 +6014,6 @@ function BIGSOM_f() { BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.sgn,this.exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),this.exprs); @@ -6304,7 +6059,6 @@ function CLINDUMMY_f() { return options; } CLINDUMMY_f.prototype.set = function CLINDUMMY_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -6319,7 +6073,7 @@ function CLR() { this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); @@ -6343,10 +6097,7 @@ function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -6409,7 +6160,7 @@ function CLR_f() { this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); @@ -6433,10 +6184,7 @@ function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -6500,7 +6248,7 @@ function CLSS() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); @@ -6531,13 +6279,10 @@ function CLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { @@ -6609,7 +6354,7 @@ function CLSS_f() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); @@ -6640,13 +6385,10 @@ function CLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { @@ -6705,7 +6447,7 @@ function DELAYV_f() { this.T = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["delayv"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([this.nin],[1]); + this.model.in = new ScilabDouble([this.nin],[1]); this.model.out = new ScilabDouble([this.nin]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); @@ -6735,11 +6477,8 @@ function DELAYV_f() { this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.nin = this.model.in1[1-1]; + this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); var told = z0[$-1]; @@ -6830,7 +6569,7 @@ function DELAY_f() { this.x.graphics.pin = 0; this.x.graphics.pout = 0; this.x.model.sim = "csuper"; - this.x.model.in1 = 1; + this.x.model.in = 1; this.x.model.out = 1; this.x.model.blocktype = "h"; this.x.model.dep_ut = [false,false]; @@ -6856,8 +6595,6 @@ function DELAY_f() { this.z0 = arguments[0]["z0"] this.exprs = inverse(arguments[0]["exprs"]) var ppath = list(0,0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="REGISTER_f") { ppath[1-1] = i; } @@ -6868,7 +6605,6 @@ function DELAY_f() { break; } } - this.x = arg1; var newpar = list(); var register = this.x.model.rpar.objs[ppath[1-1]-1]; var evtdly = this.x.model.rpar.objs[ppath[2-1]-1]; @@ -6918,7 +6654,7 @@ function DERIV() { DERIV.prototype.define = function DERIV() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["deriv"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -6936,7 +6672,6 @@ function DERIV() { return options; } DERIV.prototype.set = function DERIV() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -6946,7 +6681,7 @@ function DIFF_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["diffblk_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); @@ -6970,10 +6705,7 @@ function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { var ask_again = false; [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),this.exprs); @@ -6996,7 +6728,7 @@ function DIFF_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7017,7 +6749,7 @@ function DLR() { this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(x0.slice()); @@ -7042,10 +6774,7 @@ function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -7106,7 +6835,7 @@ function DLR_f() { this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(x0.slice()); @@ -7131,10 +6860,7 @@ function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -7194,7 +6920,7 @@ function DLSS() { this.D = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(this.x0.slice()); @@ -7226,13 +6952,10 @@ function DLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { @@ -7302,7 +7025,7 @@ function DLSS_f() { this.D = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(this.x0.slice()); @@ -7334,13 +7057,10 @@ function DLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { @@ -7399,7 +7119,7 @@ function DOLLAR() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -7423,10 +7143,7 @@ function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } @@ -7503,7 +7220,7 @@ function DOLLAR_f() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -7527,10 +7244,7 @@ function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } @@ -7553,7 +7267,7 @@ function DOLLAR_f() { if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.a]); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.x.graphics = this.graphics; this.x.model = this.model; @@ -7572,7 +7286,7 @@ function DOLLAR_m() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -7596,10 +7310,7 @@ function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } @@ -7677,7 +7388,7 @@ function GAINBLK() { var out2 = -2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["gainblk"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.in2 = new ScilabDouble([in2]); this.model.out2 = new ScilabDouble([out2]); @@ -7703,10 +7414,7 @@ function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],[sci2exp(0)]]; } @@ -7841,7 +7549,7 @@ function GAINBLK_f() { var out = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["gain"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); @@ -7863,10 +7571,7 @@ function GAINBLK_f() { GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { @@ -7902,7 +7607,7 @@ function GAIN_f() { var out = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["gain"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); @@ -7924,10 +7629,7 @@ function GAIN_f() { GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { @@ -7964,7 +7666,7 @@ function INTEGRAL() { this.model = scicos_model(); this.model.state = new ScilabDouble([0]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -7995,10 +7697,7 @@ function INTEGRAL() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -8061,7 +7760,7 @@ function INTEGRAL_f() { this.x0 = 0; this.model = scicos_model(); this.model.sim = new ScilabString(["integr"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); @@ -8082,10 +7781,7 @@ function INTEGRAL_f() { INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),this.exprs); if (!ok) { @@ -8110,7 +7806,7 @@ function INTEGRAL_m() { this.model = scicos_model(); this.model.state = new ScilabDouble([0]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -8142,10 +7838,7 @@ function INTEGRAL_m() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),this.exprs); if (!ok) { @@ -8271,7 +7964,7 @@ function PID() { scs_m.objs[21-1] = scicos_link(xx=[[213.97067],[233.97067]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); @@ -8302,11 +7995,7 @@ function PID() { this.d = arguments[0]["d"] this.exprs0 = arguments[0]["exprs0"] var ppath = list(0,0,0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[this.i-1]; if (typeof(o)=="Link") { - var from = arg1.model.rpar.objs[o.from[1-1]-1]; - var to = arg1.model.rpar.objs[o.to[1-1]-1]; if (from.gui=="GAINBLK") { switch (to.gui) { case "SUMMATION": @@ -8332,13 +8021,10 @@ function PID() { } } var newpar = list(); - var xx1 = arg1.model.rpar.objs[ppath[1-1]-1]; this.exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; - var xx2 = arg1.model.rpar.objs[ppath[2-1]-1]; this.exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; - var xx3 = arg1.model.rpar.objs[ppath[3-1]-1]; this.exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; @@ -8354,9 +8040,6 @@ function PID() { xx2.model.rpar = this.i; xx3.graphics.exprs = this.exprs0[3-1]; xx3.model.rpar = this.d; - arg1.model.rpar.objs[ppath[1-1]-1] = xx1; - arg1.model.rpar.objs[ppath[2-1]-1] = xx2; - arg1.model.rpar.objs[ppath[3-1]-1] = xx3; break; } } @@ -8367,7 +8050,6 @@ function PID() { newpar[size(newpar)+1-1] = ppath[3-1]; var needcompile = 2; } - this.x = arg1; var y = max(y,needcompile); var typ = newpar; return new BasicBlock(this.x); @@ -8379,7 +8061,7 @@ function REGISTER() { this.z0 = zeros(10,1); this.model = scicos_model(); this.model.sim = list(new ScilabString(["delay4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); @@ -8404,10 +8086,7 @@ function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==1) { this.exprs = [[this.exprs],[sci2exp(1)]]; } @@ -8474,7 +8153,7 @@ function REGISTER_f() { this.z0 = zeros(10,1); this.model = scicos_model(); this.model.sim = new ScilabString(["delay"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); @@ -8496,10 +8175,7 @@ function REGISTER_f() { REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.z0,this.exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),this.exprs); if (!ok) { @@ -8526,7 +8202,7 @@ function SAMPHOLD() { var in1 = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["samphold4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -8544,7 +8220,6 @@ function SAMPHOLD() { return options; } SAMPHOLD.prototype.set = function SAMPHOLD() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } @@ -8554,7 +8229,7 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.define = function SAMPHOLD_m() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["samphold4_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -8580,11 +8255,8 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.set = function SAMPHOLD_m() { this.it = arguments[0]["it"] this.exprs = arguments[0]["exprs"] - this.x = arg1; this.x.model.firing = []; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.it,this.exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); if (!ok) { @@ -8595,16 +8267,13 @@ function SAMPHOLD_m() { var ok = false; } if (ok) { - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -8618,7 +8287,7 @@ function SAMPLEHOLD_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["samphold"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -8636,7 +8305,6 @@ function SAMPLEHOLD_f() { return options; } SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } @@ -8647,7 +8315,7 @@ function SOM_f() { var sgn = [[1],[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); @@ -8666,9 +8334,6 @@ function SOM_f() { return options; } SOM_f.prototype.set = function SOM_f() { - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; @@ -8693,7 +8358,7 @@ function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.out2 = new ScilabDouble([-2]); @@ -8721,9 +8386,6 @@ function SUMMATION() { this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,1)==1) { this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; @@ -8845,7 +8507,7 @@ function SUM_f() { SUM_f.prototype.define = function SUM_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["plusblk"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -8863,7 +8525,6 @@ function SUM_f() { return options; } SUM_f.prototype.set = function SUM_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -8880,7 +8541,7 @@ function TCLSS() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1],[nx]); + this.model.in = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); @@ -8912,10 +8573,7 @@ function TCLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } @@ -8986,7 +8644,7 @@ function TCLSS_f() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1],[nx]); + this.model.in = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); @@ -9018,10 +8676,7 @@ function TCLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } @@ -9088,7 +8743,7 @@ function TIME_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["time_delay"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.out = new ScilabDouble([nin]); this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); @@ -9115,11 +8770,8 @@ function TIME_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - var nin = this.model.in1[1-1]; + var nin = this.model.in[1-1]; while (true) { [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -9161,7 +8813,7 @@ function VARIABLE_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["variable_delay"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nin],[1]); + this.model.in = new ScilabDouble([nin],[1]); this.model.out = new ScilabDouble([nin]); this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); @@ -9188,11 +8840,8 @@ function VARIABLE_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - var nin = this.model.in1[1-1]; + var nin = this.model.in[1-1]; while (true) { [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -9231,7 +8880,7 @@ function CUMSUM() { var function_name = "cumsum_m"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -9265,9 +8914,6 @@ function CUMSUM() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -9311,7 +8957,7 @@ function CUMSUM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -9322,10 +8968,7 @@ function CUMSUM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -9339,7 +8982,7 @@ function EXTRACT() { var function_name = "extract"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -9375,10 +9018,7 @@ function EXTRACT() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -9420,7 +9060,7 @@ function EXTRACT() { } } this.model.ipar = new ScilabDouble([this.a],[this.b],[ma],[mb]); - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [ma,mb]; var funtyp = 4; if (ok) { @@ -9431,9 +9071,6 @@ function EXTRACT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -9447,7 +9084,7 @@ function EXTTRI() { var function_name = "extrilz"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -9481,9 +9118,6 @@ function EXTTRI() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -9524,7 +9158,7 @@ function EXTTRI() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -9535,10 +9169,7 @@ function EXTTRI() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -9552,7 +9183,7 @@ function MATBKSL() { var function_name = "mat_bksl"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-2]); @@ -9584,10 +9215,7 @@ function MATBKSL() { MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -9608,7 +9236,7 @@ function MATBKSL() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -9619,9 +9247,6 @@ function MATBKSL() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -9635,7 +9260,7 @@ function MATCATH() { var function_name = "mat_cath"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); @@ -9667,9 +9292,6 @@ function MATCATH() { MATCATH.prototype.set = function MATCATH() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; @@ -9692,9 +9314,6 @@ function MATCATH() { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -9710,7 +9329,7 @@ function MATCATV() { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in2 = new ScilabDouble([-1],[-1]); - this.model.in1 = new ScilabDouble([-2],[-3]); + this.model.in = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([-1,-1]); this.model.out = new ScilabDouble([0]); this.model.out2 = new ScilabDouble([-1]); @@ -9741,9 +9360,6 @@ function MATCATV() { MATCATV.prototype.set = function MATCATV() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; @@ -9766,9 +9382,6 @@ function MATCATV() { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -9782,7 +9395,7 @@ function MATDET() { var function_name = "mat_det"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -9814,10 +9427,7 @@ function MATDET() { MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -9838,7 +9448,7 @@ function MATDET() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -9849,9 +9459,6 @@ function MATDET() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -9865,7 +9472,7 @@ function MATDIAG() { var function_name = "mat_diag"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -9897,10 +9504,7 @@ function MATDIAG() { MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -9921,7 +9525,7 @@ function MATDIAG() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -9932,9 +9536,6 @@ function MATDIAG() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -9948,7 +9549,7 @@ function MATDIV() { var function_name = "mat_div"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-3],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); @@ -9980,10 +9581,7 @@ function MATDIV() { MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -10004,7 +9602,7 @@ function MATDIV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -10015,9 +9613,6 @@ function MATDIV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -10031,7 +9626,7 @@ function MATEIG() { var function_name = "mat_vps"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -10065,9 +9660,6 @@ function MATEIG() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -10120,10 +9712,7 @@ function MATEIG() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -10137,7 +9726,7 @@ function MATEXPM() { var function_name = "mat_expm"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -10169,10 +9758,7 @@ function MATEXPM() { MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -10193,7 +9779,7 @@ function MATEXPM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -10204,9 +9790,6 @@ function MATEXPM() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -10220,7 +9803,7 @@ function MATINV() { var function_name = "mat_inv"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -10252,10 +9835,7 @@ function MATINV() { MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -10276,7 +9856,7 @@ function MATINV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -10287,9 +9867,6 @@ function MATINV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -10303,7 +9880,7 @@ function MATLU() { var function_name = "mat_lu"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1],[-1]); @@ -10335,9 +9912,6 @@ function MATLU() { MATLU.prototype.set = function MATLU() { this.typ = inverse(arguments[0]["typ"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -10360,7 +9934,7 @@ function MATLU() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; @@ -10384,7 +9958,7 @@ function MATMAGPHI() { var function_name = "matz_abs"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); @@ -10416,9 +9990,6 @@ function MATMAGPHI() { MATMAGPHI.prototype.set = function MATMAGPHI() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -10454,10 +10025,7 @@ function MATMAGPHI() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -10469,7 +10037,7 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); @@ -10496,7 +10064,6 @@ function MATMUL() { this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; this.graphics = this.x.graphics; var label = this.graphics.exprs; this.model = this.x.model; @@ -10624,7 +10191,6 @@ function MATMUL() { this.graphics.exprs = new ScilabDouble([label]); this.x.graphics = this.graphics; this.x.model = this.model; - var arg1 = this.x; break; } } @@ -10638,7 +10204,7 @@ function MATPINV() { var function_name = "mat_pinv"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-2]); @@ -10670,10 +10236,7 @@ function MATPINV() { MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -10694,7 +10257,7 @@ function MATPINV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -10705,9 +10268,6 @@ function MATPINV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -10721,7 +10281,7 @@ function MATRESH() { var function_name = "mat_reshape"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -10757,9 +10317,6 @@ function MATRESH() { this.l1 = arguments[0]["l1"] this.out = arguments[0]["out"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -10816,9 +10373,6 @@ function MATRESH() { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -10833,7 +10387,7 @@ function MATSING() { var function_name = "mat_sing"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -10867,9 +10421,6 @@ function MATSING() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -10925,10 +10476,7 @@ function MATSING() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -10942,7 +10490,7 @@ function MATSUM() { var function_name = "mat_sum"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -10976,9 +10524,6 @@ function MATSUM() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -11025,7 +10570,7 @@ function MATSUM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var funtyp = 4; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); @@ -11035,10 +10580,7 @@ function MATSUM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -11050,7 +10592,7 @@ function MATTRAN() { MATTRAN.prototype.define = function MATTRAN() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["mattran_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); @@ -11074,10 +10616,7 @@ function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==1) { label[2-1] = sci2exp(1); } @@ -11102,7 +10641,7 @@ function MATTRAN() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -11113,9 +10652,6 @@ function MATTRAN() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -11129,7 +10665,7 @@ function MATZCONJ() { var function_name = "matz_conj"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1]); @@ -11158,7 +10694,6 @@ function MATZCONJ() { return options; } MATZCONJ.prototype.set = function MATZCONJ() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -11169,7 +10704,7 @@ function MATZREIM() { var function_name = "matz_reim"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); @@ -11201,9 +10736,6 @@ function MATZREIM() { MATZREIM.prototype.set = function MATZREIM() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -11239,10 +10771,7 @@ function MATZREIM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -11256,7 +10785,7 @@ function RICC() { var function_name = "ricc_m"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.in2 = new ScilabDouble([-1],[-1],[-1]); this.model.intyp = new ScilabDouble([1,1,1]); this.model.out = new ScilabDouble([-1]); @@ -11290,10 +10819,7 @@ function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -11302,7 +10828,7 @@ function RICC() { if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; @@ -11314,9 +10840,6 @@ function RICC() { if (ok) { this.model.ipar = new ScilabDouble([this.tpe],[this.mod]); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -11330,7 +10853,7 @@ function ROOTCOEF() { var function_name = "root_coef"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-2]); @@ -11364,10 +10887,7 @@ function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -11399,9 +10919,6 @@ function ROOTCOEF() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -11413,7 +10930,7 @@ function SQRT() { SQRT.prototype.define = function SQRT() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["mat_sqrt"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -11437,10 +10954,7 @@ function SQRT() { SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { @@ -11456,7 +10970,7 @@ function SQRT() { } var it = this.typ; var ot = this.typ; - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -11467,9 +10981,6 @@ function SQRT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -11483,7 +10994,7 @@ function SUBMAT() { var function_name = "submat"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -11525,10 +11036,7 @@ function SUBMAT() { this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); } @@ -11581,9 +11089,6 @@ function SUBMAT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } @@ -11605,7 +11110,7 @@ function AUTOMAT() { var rpar = [this.X0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["automat"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([2*NX+1],[2*NX+1]); + this.model.in = new ScilabDouble([2*NX+1],[2*NX+1]); this.model.out = new ScilabDouble([2],[2*NX]); this.model.state = new ScilabDouble([ones(2*NX,1)]); this.model.nzcross = new ScilabDouble([1]); @@ -11628,10 +11133,7 @@ function AUTOMAT() { return options; } AUTOMAT.prototype.set = function AUTOMAT() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var NMode = ipar[1-1]; var NX = ipar[3-1]; @@ -11741,7 +11243,7 @@ function BACKLASH() { this.exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); @@ -11767,10 +11269,7 @@ function BACKLASH() { this.gap = arguments[0]["gap"] this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; while (true) { [ok,this.ini,this.gap,this.zcr,this.exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); @@ -11822,7 +11321,7 @@ function BOUNCE() { var state = transpose(state); this.model = scicos_model(); this.model.sim = list(new ScilabString(["bounce_ball"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([n],[n]); this.model.state = new ScilabDouble(state.slice()); this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); @@ -11863,10 +11362,7 @@ function BOUNCE() { this.g = parseFloat(arguments[0]["g"]) this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<9) { this.exprs[8-1] = "9.81"; this.exprs[9-1] = "0"; @@ -11943,7 +11439,7 @@ function BOUNCEXY() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bouncexy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -11993,10 +11489,7 @@ function BOUNCEXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); @@ -12058,7 +11551,7 @@ function BPLATFORM() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bplatform2"]), new ScilabDouble([5])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); @@ -12093,10 +11586,7 @@ function BPLATFORM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); @@ -12147,7 +11637,7 @@ function CBLOCK() { this.ng = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -12202,9 +11692,6 @@ function CBLOCK() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.i,this.o,this.ci,this.co,this.xx,this.ng,this.z,this.rpar,this.ipar,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block2 block parameters",["simulation function","is block implicit? (y,n)","input ports sizes","output ports sizes","input event ports sizes","output events ports sizes","initial continuous state","number of zero crossing surfaces","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label[1-1]); @@ -12273,7 +11760,7 @@ function CBLOCK() { var ok = tmpvar1[2]; if (ok) { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([this.i]); + this.model.in = new ScilabDouble([this.i]); this.model.out = new ScilabDouble([this.o]); this.model.evtin = new ScilabDouble([this.ci]); this.model.evtout = new ScilabDouble([this.co]); @@ -12305,14 +11792,14 @@ function CBLOCK4() { var funam = "toto"; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); + var label = list([[funam],["n"],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -12365,9 +11852,6 @@ function CBLOCK4() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.in1,this.it,this.out,this.ot,this.ci,this.co,this.xx,this.z,this.oz,this.rpar,this.ipar,this.opar,this.nmode,this.nzcr,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block4 block parameters",["Simulation function","Is block implicit? (y,n)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label[1-1]); @@ -12468,7 +11952,7 @@ function CONSTRAINT2_c() { this.id = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.ipar = new ScilabDouble(this.id); @@ -12495,10 +11979,7 @@ function CONSTRAINT2_c() { this.xd0 = inverse(arguments[0]["xd0"]) this.id = inverse(arguments[0]["id"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { var ask_again = false; [ok,this.x0,this.xd0,this.id,this.exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); @@ -12535,7 +12016,7 @@ function CONSTRAINT2_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.model.ipar = new ScilabDouble(this.id); this.x.graphics = this.graphics; this.x.model = this.model; @@ -12551,7 +12032,7 @@ function CONSTRAINT_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); @@ -12573,10 +12054,7 @@ function CONSTRAINT_c() { CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { this.x0 = inverse(arguments[0]["x0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),this.exprs); if (!ok) { @@ -12595,7 +12073,7 @@ function CONSTRAINT_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.model.ipar = new ScilabDouble([-1*ones(N,1)]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -12614,7 +12092,7 @@ function DEADBAND() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["deadband"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -12642,10 +12120,7 @@ function DEADBAND() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -12692,8 +12167,6 @@ function DEBUG() { return options; } DEBUG.prototype.set = function DEBUG() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var textmp = this.exprs[2-1]; var ok = true; @@ -12742,8 +12215,6 @@ function DEBUG_SCICOS() { return options; } DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { - arg1.gui = "DEBUG"; - var tmpvar0 = DEBUG("set",arg1); this.x = tmpvar0[0]; var y = tmpvar0[1]; var typ = tmpvar0[2]; @@ -12756,7 +12227,7 @@ function DIFF_f() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["diffblk"]), new ScilabDouble([10001])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); @@ -12780,10 +12251,7 @@ function DIFF_f() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = arguments[0]["xd0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -12815,10 +12283,7 @@ function DSUPER() { DSUPER.prototype.set = function DSUPER() { var y = this.needcompile; var typ = list(); - this.graphics = arg1.graphics; if ((length(this.graphics.exprs)==0)) { - warnBlockByUID(arg1.model.label,"Invalid masked block."); - this.x = arg1; return; } this.exprs = this.graphics.exprs[1-1]; @@ -12826,15 +12291,12 @@ function DSUPER() { var btitre = this.graphics.exprs[2-1][2-1][1-1]; var bitems = this.graphics.exprs[2-1][2-1].slice(2-1,$); if (exprs0==[]) { - this.x = arg1; return; } - var context = [arg1.model.rpar.props.context]; var tmpvar0 = script2var(context,PREVAR_scicos_context); var PREVAR_scicos_context = tmpvar0[0]; var ierr = tmpvar0[1]; if (ierr!=0) { - this.x = arg1; return; } var tt = "scicos_context."+exprs0[1-1]; @@ -12845,7 +12307,6 @@ function DSUPER() { var scicos_context = PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); if (this.ok) { - this.x = arg1; var PREVAR_scicos_context = scicos_context; var sblock = this.x.model.rpar; var tmpvar1 = do_eval(sblock,list(),scicos_context); @@ -12857,7 +12318,6 @@ function DSUPER() { this.x.graphics.exprs[1-1] = this.exprs; this.x.model.rpar = sblock; } else { - this.x = arg1; } return new BasicBlock(this.x); } @@ -12868,7 +12328,7 @@ function EDGETRIGGER() { this.edge = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["edgetrig"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([1]); @@ -12892,10 +12352,7 @@ function EDGETRIGGER() { EDGETRIGGER.prototype.set = function EDGETRIGGER() { this.edge = parseFloat(arguments[0]["edge"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.edge,this.exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),this.exprs); if (!ok) { @@ -12986,7 +12443,7 @@ function EDGE_TRIGGER() { lnk={}; this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); @@ -13002,8 +12459,6 @@ function EDGE_TRIGGER() { return options; } EDGE_TRIGGER.prototype.set = function EDGE_TRIGGER() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EDGETRIGGER") { var ppath = list(i); break; @@ -13020,20 +12475,19 @@ function EDGE_TRIGGER() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -13062,12 +12516,10 @@ function EDGE_TRIGGER() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } @@ -13092,8 +12544,6 @@ function ENDBLK() { return options; } ENDBLK.prototype.set = function ENDBLK() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="END_c") { var ppath = list(i); break; @@ -13110,20 +12560,19 @@ function ENDBLK() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (!isequalbitwise(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -13152,12 +12601,10 @@ function ENDBLK() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } @@ -13243,7 +12690,7 @@ function Extract_Activation() { lnk={}; this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); @@ -13259,7 +12706,6 @@ function Extract_Activation() { return options; } Extract_Activation.prototype.set = function Extract_Activation() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -13272,7 +12718,7 @@ function HYSTHERESIS() { var rpar = [[1],[0],[1],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["hystheresis"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.nzcross = new ScilabDouble([this.nzz]); @@ -13304,10 +12750,7 @@ function HYSTHERESIS() { this.out_low = arguments[0]["out_low"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -13340,7 +12783,7 @@ function IMPSPLIT_f() { mo.inputs = "n"; mo.outputs = [["n"],["n"]]; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.x = standard_define([1,1]/3,this.model,[],[]); this.x.graphics.in_implicit = ["I"]; @@ -13356,7 +12799,6 @@ function IMPSPLIT_f() { return options; } IMPSPLIT_f.prototype.set = function IMPSPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -13368,7 +12810,7 @@ function LOGICAL_OP() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -13396,10 +12838,7 @@ function LOGICAL_OP() { this.Datatype = arguments[0]["Datatype"] this.tp = parseFloat(arguments[0]["tp"]) this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==2) { this.exprs = [[this.exprs],[sci2exp(1)],[sci2exp(0)]]; } @@ -13518,7 +12957,7 @@ function MBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([30004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); @@ -13551,9 +12990,6 @@ function MBLOCK() { this.pprop = inverse(arguments[0]["pprop"]) this.Tfunam = arguments[0]["Tfunam"] this.lab_1 = arguments[0]["lab_1"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -13564,7 +13000,7 @@ function MBLOCK() { } this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - this.lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + this.lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { [ok,this.Tin,this.Tintype,this.Tout,this.Touttype,this.Tparam,this.pprop,this.Tfunam,this.lab_1] = scicos_getvalue("Set Modelica generic block parameters",["Input variables: ","Input variables types: ","Output variables: ","Output variables types:","Parameters in Modelica:","Parameters properties: ","Function name: "],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),this.lab_1); @@ -13763,7 +13199,7 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = this.lab_1[1-1]; + this.exprs.in = this.lab_1[1-1]; this.exprs.intype = this.lab_1[2-1]; this.exprs.out = this.lab_1[3-1]; this.exprs.outtype = this.lab_1[4-1]; @@ -13803,7 +13239,7 @@ function MEMORY_f() { this.exprs = [[string(z)],[string(1)]]; this.model = scicos_model(); this.model.sim = new ScilabString(["memo"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); @@ -13828,10 +13264,7 @@ function MEMORY_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { @@ -13855,7 +13288,7 @@ function MEMORY_f() { if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -13890,7 +13323,7 @@ function MPBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([10004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); @@ -13908,9 +13341,6 @@ function MPBLOCK() { return options; } MPBLOCK.prototype.set = function MPBLOCK() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -13921,7 +13351,7 @@ function MPBLOCK() { } this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - var lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1); @@ -14119,7 +13549,7 @@ function MPBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = lab_1[1-1]; + this.exprs.in = lab_1[1-1]; this.exprs.intype = lab_1[2-1]; this.exprs.out = lab_1[3-1]; this.exprs.outtype = lab_1[4-1]; @@ -14158,7 +13588,7 @@ function PAL_f() { scs.props.title = "Palette"; this.model = scicos_model(); this.model.sim = new ScilabString(["palette"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); @@ -14177,14 +13607,10 @@ function PAL_f() { return options; } PAL_f.prototype.set = function PAL_f() { - var tmpvar0 = scicos(arg1.model.rpar); this.x = tmpvar0[0]; var newparameters = tmpvar0[1]; var needcompile = tmpvar0[2]; var edited = tmpvar0[3]; - arg1.graphics.id = this.x.props.title[1-1]; - arg1.model.rpar = this.x; - this.x = arg1; var y = []; var typ = []; %exit = resume(false) @@ -14203,7 +13629,7 @@ function PENDULUM_ANIM() { this.ymax = 5; this.model = scicos_model(); this.model.sim = list(new ScilabString(["anim_pen"]), new ScilabDouble([5])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); @@ -14238,10 +13664,7 @@ function PENDULUM_ANIM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); @@ -14283,7 +13706,7 @@ function RATELIMITER() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ratelimiter"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -14307,10 +13730,7 @@ function RATELIMITER() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -14337,7 +13757,7 @@ function RELATIONALOP() { var label = "<"; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relationalop"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -14364,10 +13784,7 @@ function RELATIONALOP() { this.zcr = parseFloat(arguments[0]["zcr"]) this.Datatype = arguments[0]["Datatype"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==2) { this.exprs = [[this.exprs],[sci2exp(1)]]; } @@ -14444,7 +13861,7 @@ function SPLIT_f() { SPLIT_f.prototype.define = function SPLIT_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["lsplit"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -14460,7 +13877,6 @@ function SPLIT_f() { return options; } SPLIT_f.prototype.set = function SPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -14479,7 +13895,7 @@ function SUPER_f() { scs.objs[2-1] = out; this.model = scicos_model(); this.model.sim = new ScilabString(["super"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); @@ -14497,7 +13913,6 @@ function SUPER_f() { return options; } SUPER_f.prototype.set = function SUPER_f() { - xcos(arg1.model.rpar); return new SuperBlock(this.x); } } @@ -14534,11 +13949,8 @@ function TEXT_f() { this.font = parseFloat(arguments[0]["font"]) this.siz = parseFloat(arguments[0]["siz"]) this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; var orig = this.graphics.orig; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],["3"],["1"]]; } @@ -14595,7 +14007,7 @@ function c_block() { this.funam = "toto"; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2001])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -14629,9 +14041,6 @@ function c_block() { this.rpar = inverse(arguments[0]["rpar"]) this.funam = arguments[0]["funam"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set C_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); @@ -14648,7 +14057,7 @@ function c_block() { this.o = int(this.o.slice()); var no = size(this.o,1); var tt = label[2-1]; - if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { + if (this.model.sim[1-1]!=this.funam||size(this.model.in,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } var tmpvar0 = CFORTR(this.funam,tt,this.i,this.o); @@ -14679,7 +14088,7 @@ function fortran_block() { fortran_block.prototype.define = function fortran_block() { this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([1001])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -14691,7 +14100,7 @@ function fortran_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; - var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); + var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -14714,9 +14123,6 @@ function fortran_block() { this.rpar = inverse(arguments[0]["rpar"]) this.funam = arguments[0]["funam"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set fortran_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); @@ -14733,7 +14139,7 @@ function fortran_block() { this.o = int(this.o.slice()); var no = size(this.o,1); var tt = label[2-1]; - if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { + if (this.model.sim[1-1]!=this.funam||size(this.model.in,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } var tmpvar0 = FORTR(this.funam,tt,this.i,this.o); @@ -14764,7 +14170,7 @@ function func_block() { func_block.prototype.define = function func_block() { this.model = scicos_model(); this.model.sim = new ScilabString([" "]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -14782,10 +14188,7 @@ function func_block() { return options; } func_block.prototype.set = function func_block() { - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.x = arg1; this.model = this.x.model; var tmpvar0 = genfunc(this.exprs); var ok = tmpvar0[0]; @@ -14807,7 +14210,7 @@ function generic_block() { this.function_name = "sinblk"; this.funtyp = 1; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -14818,7 +14221,7 @@ function generic_block() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -14859,9 +14262,6 @@ function generic_block() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -14922,10 +14322,7 @@ function generic_block() { this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -14940,7 +14337,7 @@ function generic_block2() { this.function_name = "sinblk"; this.funtyp = 1; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -14951,7 +14348,7 @@ function generic_block2() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -14996,9 +14393,6 @@ function generic_block2() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -15061,10 +14455,7 @@ function generic_block2() { this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -15079,14 +14470,14 @@ function generic_block3() { this.function_name = "sinblk"; this.funtyp = 4; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -15139,9 +14530,6 @@ function generic_block3() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -15212,10 +14600,7 @@ function generic_block3() { this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } @@ -15237,7 +14622,7 @@ function scifunc_block() { this.rpar = []; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -15283,9 +14668,6 @@ function scifunc_block() { this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] var needcompile = 0; - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs[1-1],"*")==8) { this.exprs[1-1][9-1] = "0"; @@ -15361,7 +14743,7 @@ function scifunc_block_m() { var it = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.in2 = new ScilabDouble([in1]); this.model.intyp = new ScilabDouble([it]); this.model.out = new ScilabDouble([out]); @@ -15411,9 +14793,6 @@ function scifunc_block_m() { this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] var needcompile = 0; - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs[1-1]); @@ -15476,7 +14855,7 @@ function ABSBLK_f() { ABSBLK_f.prototype.define = function ABSBLK_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["absblk"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -15493,7 +14872,6 @@ function ABSBLK_f() { return options; } ABSBLK_f.prototype.set = function ABSBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -15503,7 +14881,7 @@ function ABS_VALUE() { var nu = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["absolute_value"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.out = new ScilabDouble([nu]); this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); @@ -15526,10 +14904,7 @@ function ABS_VALUE() { ABS_VALUE.prototype.set = function ABS_VALUE() { this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { @@ -15558,7 +14933,7 @@ function COSBLK_f() { var in1 = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["cosblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -15575,7 +14950,6 @@ function COSBLK_f() { return options; } COSBLK_f.prototype.set = function COSBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -15590,7 +14964,7 @@ function DLRADAPT_f() { this.last_y = [[0],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dlradp"]); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.last_u],[this.last_y]); @@ -15626,10 +15000,7 @@ function DLRADAPT_f() { this.last_u = inverse(arguments[0]["last_u"]) this.last_y = inverse(arguments[0]["last_y"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,this.exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),this.exprs); if (!ok) { @@ -15665,7 +15036,7 @@ function EXPBLK_f() { this.a = math.E; this.model = scicos_model(); this.model.sim = new ScilabString(["expblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); @@ -15686,10 +15057,7 @@ function EXPBLK_f() { EXPBLK_f.prototype.set = function EXPBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } @@ -15718,7 +15086,7 @@ function EXPBLK_m() { this.a = math.E; this.model = scicos_model(); this.model.sim = list(new ScilabString(["expblk_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); @@ -15743,10 +15111,7 @@ function EXPBLK_m() { EXPBLK_m.prototype.set = function EXPBLK_m() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } @@ -15774,7 +15139,7 @@ function FSV_f() { var in1 = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["fsv"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -15792,7 +15157,6 @@ function FSV_f() { return options; } FSV_f.prototype.set = function FSV_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -15804,7 +15168,7 @@ function INTRP2BLK_f() { this.c = [[0,1],[1,2]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["intrp2"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); @@ -15831,10 +15195,7 @@ function INTRP2BLK_f() { this.b = inverse(arguments[0]["b"]) this.c = inverse(arguments[0]["c"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.b,this.c,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),this.exprs); if (!ok) { @@ -15865,7 +15226,7 @@ function INTRPLBLK_f() { this.b = [[0],[1]]; this.model = scicos_model(); this.model.sim = new ScilabString(["intrpl"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); @@ -15889,10 +15250,7 @@ function INTRPLBLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.b,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -15921,7 +15279,7 @@ function INVBLK() { var in1 = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["invblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -15939,7 +15297,6 @@ function INVBLK() { return options; } INVBLK.prototype.set = function INVBLK() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -15949,7 +15306,7 @@ function INVBLK_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["invblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -15967,7 +15324,6 @@ function INVBLK_f() { return options; } INVBLK_f.prototype.set = function INVBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -15978,7 +15334,7 @@ function LOGBLK_f() { this.a = math.E; this.model = scicos_model(); this.model.sim = new ScilabString(["logblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); @@ -15999,10 +15355,7 @@ function LOGBLK_f() { LOGBLK_f.prototype.set = function LOGBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } @@ -16038,7 +15391,7 @@ function LOOKUP2D() { var Nx = length(this.xx); var Ny = length(this.yy); this.model.sim = list(new ScilabString(["lookup2d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); @@ -16069,9 +15422,6 @@ function LOOKUP2D() { this.Method = parseFloat(arguments[0]["Method"]) this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; @@ -16159,7 +15509,7 @@ function LOOKUP_c() { this.Method = 1; var Graf = "n"; this.model.sim = list(new ScilabString(["lookup_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); @@ -16197,9 +15547,6 @@ function LOOKUP_c() { this.extrapo = parseFloat(arguments[0]["extrapo"]) this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; @@ -16336,7 +15683,7 @@ function LOOKUP_f() { LOOKUP_f.prototype.define = function LOOKUP_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["lookup"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); @@ -16354,10 +15701,7 @@ function LOOKUP_f() { return options; } LOOKUP_f.prototype.set = function LOOKUP_f() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; var n = size(rpar,"*")/2; var xx = rpar.slice(1-1,n); @@ -16397,7 +15741,7 @@ function MAXMIN() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["minmax"]), new ScilabDouble([4])); this.model.out = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); @@ -16423,10 +15767,7 @@ function MAXMIN() { this.nin = arguments[0]["nin"] this.zcr = parseFloat(arguments[0]["zcr"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.mm,this.nin,this.zcr,this.exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -16484,7 +15825,7 @@ function MAX_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["maxblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); @@ -16503,7 +15844,6 @@ function MAX_f() { return options; } MAX_f.prototype.set = function MAX_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -16513,7 +15853,7 @@ function MIN_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["minblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); @@ -16532,7 +15872,6 @@ function MIN_f() { return options; } MIN_f.prototype.set = function MIN_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -16543,7 +15882,7 @@ function POWBLK_f() { this.a = 1.5; this.model = scicos_model(); this.model.sim = new ScilabString(["powblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); @@ -16564,10 +15903,7 @@ function POWBLK_f() { POWBLK_f.prototype.set = function POWBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } @@ -16598,7 +15934,7 @@ function PRODUCT() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["product"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); @@ -16619,9 +15955,6 @@ function PRODUCT() { PRODUCT.prototype.set = function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.sgn,this.exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),this.exprs); @@ -16673,7 +16006,7 @@ function PROD_f() { PROD_f.prototype.define = function PROD_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["prod"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -16689,7 +16022,6 @@ function PROD_f() { return options; } PROD_f.prototype.set = function PROD_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -16700,7 +16032,7 @@ function QUANT_f() { this.meth = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["qzrnd"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.pas]); this.model.ipar = new ScilabDouble([this.meth]); @@ -16725,10 +16057,7 @@ function QUANT_f() { this.pas = parseFloat(arguments[0]["pas"]) this.meth = parseFloat(arguments[0]["meth"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.pas,this.meth,this.exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),this.exprs); if (!ok) { @@ -16767,7 +16096,7 @@ function SATURATION() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["satur"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -16795,10 +16124,7 @@ function SATURATION() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -16834,7 +16160,7 @@ function SAT_f() { var rpar = [[this.minp],[this.maxp],[slope]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["lusat"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); @@ -16861,10 +16187,7 @@ function SAT_f() { this.maxp = parseFloat(arguments[0]["maxp"]) this.pente = arguments[0]["pente"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.minp,this.maxp,this.pente,this.exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -16893,7 +16216,7 @@ function SIGNUM() { var nu = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["signum"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.out = new ScilabDouble([nu]); this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); @@ -16916,10 +16239,7 @@ function SIGNUM() { SIGNUM.prototype.set = function SIGNUM() { this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { @@ -16947,7 +16267,7 @@ function SINBLK_f() { SINBLK_f.prototype.define = function SINBLK_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["sinblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -16965,7 +16285,6 @@ function SINBLK_f() { return options; } SINBLK_f.prototype.set = function SINBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -16975,7 +16294,7 @@ function TANBLK_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["tanblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -16993,7 +16312,6 @@ function TANBLK_f() { return options; } TANBLK_f.prototype.set = function TANBLK_f() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } @@ -17003,7 +16321,7 @@ function TrigFun() { TrigFun.prototype.define = function TrigFun() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["sin_blk"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -17023,10 +16341,7 @@ function TrigFun() { TrigFun.prototype.set = function TrigFun() { this.fun = arguments[0]["fun"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]]; var PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]]; while (true) { @@ -17053,7 +16368,7 @@ function PDE() { this.model = scicos_model(); this.model.state = new ScilabDouble([zeros(10,1)]); this.model.sim = list(new ScilabString(["PDE"]), new ScilabDouble([0])); - this.model.in1 = new ScilabDouble([1],[1],[1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1],[1],[1]); this.model.out = new ScilabDouble([10],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); @@ -17075,10 +16390,7 @@ function PDE() { this.okk = parseBoolean(arguments[0]["okk"]) this.rdnom = arguments[0]["rdnom"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; var params_pde = label[1-1]; while (true) { [ln,fun]=where() @@ -17273,7 +16585,7 @@ function AFFICH_m() { this.in1 = [1,1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["affich2"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([this.in1[1-1][1-1]]); + this.model.in = new ScilabDouble([this.in1[1-1][1-1]]); this.model.in2 = new ScilabDouble([this.in1[1-1][2-1]]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); @@ -17282,7 +16594,7 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); - this.exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; + this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new AfficheBlock(this.x); @@ -17311,10 +16623,7 @@ function AFFICH_m() { this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,this.exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -17377,7 +16686,7 @@ function BARXY() { this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5])); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); this.model.evtin = new ScilabDouble([1]); @@ -17409,10 +16718,7 @@ function BARXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.thickness = arguments[0]["thickness"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,this.exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -17461,7 +16767,7 @@ function CANIMXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -17507,10 +16813,7 @@ function CANIMXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -17593,7 +16896,7 @@ function CANIMXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); @@ -17639,10 +16942,7 @@ function CANIMXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs); if (!ok) { @@ -17769,10 +17069,7 @@ function CEVENTSCOPE() { this.wdim = inverse(arguments[0]["wdim"]) this.per = parseFloat(arguments[0]["per"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),this.exprs); this.nclock = int(this.nclock); @@ -17885,10 +17182,7 @@ function CFSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.wu = arguments[0]["wu"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),this.exprs); if (!ok) { @@ -17980,9 +17274,6 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.set = function CLKOUTV_f() { this.prt = arguments[0]["prt"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),this.exprs); @@ -18004,14 +17295,11 @@ function CLKOUTV_f() { return new EventOutBlock(this.x); } CLKOUTV_f.prototype.getinputs = function CLKOUTV_f() { - var orig = arg1.graphics.orig; - var sz = arg1.graphics.sz; this.x = orig[1-1]+sz[1-1]/2; var y = orig[2-1]+sz[2-1]; var typ = -ones(this.x); } CLKOUTV_f.prototype.getorigin = function CLKOUTV_f() { - var tmpvar0 = standard_origin(arg1); this.x = tmpvar0[0]; var y = tmpvar0[1]; } @@ -18023,10 +17311,6 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.plot = function CLKOUTV_f() { var xf = 60; var yf = 40; - var orig = arg1.graphics.orig; - var sz = arg1.graphics.sz; - var orient = arg1.graphics.flip; - this.prt = arg1.model.ipar; var pat = xget("pattern"); xset("pattern",this.default_color[-1-1]); var thick = xget("thickness"); @@ -18035,7 +17319,6 @@ function CLKOUTV_f() { var y = orig[2-1]+sz[2-1]*[[0],[1/3],[1],[1],[1/3]]; var xo = orig[1-1]; var yo = orig[2-1]+sz[2-1]/3; - this.gr_i = arg1.graphics.gr_i; if (this.type[this.gr_i-1]==15) { var coli = this.gr_i[2-1]; var pcoli = xget("pattern"); @@ -18052,7 +17335,6 @@ function CLKOUTV_f() { xfpoly(in1.slice()[1-1]+ones(4,1)*(orig[1-1]+sz[1-1]/2),in1.slice()[2-1]+ones(4,1)*(orig[2-1]+sz[2-1]),1); xset("thickness",thick); xset("pattern",pat); - var ident = arg1.graphics.id; if (ident!=[]&&ident!="") { var font = xget("font"); xset("font",this.options.ID[1-1][1-1],this.options.ID[1-1][2-1]); @@ -18092,9 +17374,6 @@ function CLKOUT_f() { CLKOUT_f.prototype.set = function CLKOUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { @@ -18131,7 +17410,7 @@ function CMAT3D() { var size_y = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmat3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); @@ -18164,10 +17443,7 @@ function CMAT3D() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -18212,7 +17488,7 @@ function CMATVIEW() { var beta_c = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmatview"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); @@ -18241,10 +17517,7 @@ function CMATVIEW() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -18292,7 +17565,7 @@ function CMSCOPE() { var period = transpose(this.per.slice()); this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(this.in1); + this.model.in = new ScilabDouble(this.in1); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -18337,10 +17610,7 @@ function CMSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),this.exprs); if (!ok) { @@ -18447,7 +17717,7 @@ function CSCOPE() { this.per = 30; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscope"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); @@ -18489,10 +17759,7 @@ function CSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),this.exprs); if (!ok) { @@ -18575,7 +17842,7 @@ function CSCOPXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -18620,10 +17887,7 @@ function CSCOPXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -18706,7 +17970,7 @@ function CSCOPXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -18751,10 +18015,7 @@ function CSCOPXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),this.exprs); if (!ok) { @@ -18838,7 +18099,7 @@ function CSCOPXY3D() { function OUTIMPL_f() { OUTIMPL_f.prototype.define = function OUTIMPL_f() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.prt = 1; this.model.sim = new ScilabString(["outimpl"]); @@ -18866,10 +18127,7 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.set = function OUTIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; } @@ -18903,7 +18161,7 @@ function OUT_f() { this.prt = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["output"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([this.prt]); @@ -18925,9 +18183,6 @@ function OUT_f() { OUT_f.prototype.set = function OUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; @@ -18960,7 +18215,7 @@ function TOWS_c() { this.herit = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tows_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([]); @@ -18992,9 +18247,6 @@ function TOWS_c() { this.varnam = arguments[0]["varnam"] this.herit = parseFloat(arguments[0]["herit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.nz,this.varnam,this.herit,this.exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),this.exprs); @@ -19038,7 +18290,7 @@ function TRASH_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["trash"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); @@ -19056,7 +18308,6 @@ function TRASH_f() { return options; } TRASH_f.prototype.set = function TRASH_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -19071,7 +18322,7 @@ function WFILE_f() { this.N = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["writef"]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); @@ -19104,11 +18355,7 @@ function WFILE_f() { var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); - warnBlockByUID(arg1.model.label,warnXcosMessage); - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; var lunit = dstate[2-1]; var fname = this.exprs[2-1]; @@ -19155,7 +18402,7 @@ function WFILE_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabDouble([true,false]); @@ -19180,7 +18427,7 @@ function WRITEAU_f() { this.N = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["writeau"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); @@ -19205,10 +18452,7 @@ function WRITEAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -19236,7 +18480,7 @@ function WRITEAU_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.graphics.exprs = new ScilabDouble([this.exprs]); @@ -19260,7 +18504,7 @@ function WRITEC_f() { this.N = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["writec"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); @@ -19291,10 +18535,7 @@ function WRITEC_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -19346,7 +18587,7 @@ function WRITEC_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.graphics.exprs = new ScilabDouble([this.exprs]); @@ -19385,9 +18626,6 @@ function CLKINV_f() { CLKINV_f.prototype.set = function CLKINV_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { @@ -19437,9 +18675,6 @@ function CLKIN_f() { CLKIN_f.prototype.set = function CLKIN_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { @@ -19521,15 +18756,12 @@ function CLOCK_c() { this.dt = arguments[0]["dt"] this.t0 = arguments[0]["t0"] this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; @@ -19549,7 +18781,6 @@ function CLOCK_c() { this.model.rpar = new ScilabDouble([this.dt],[this.t0]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -19561,7 +18792,6 @@ function CLOCK_c() { } else { var needcompile = 0; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); @@ -19625,15 +18855,12 @@ function CLOCK_f() { this.dt = arguments[0]["dt"] this.t0 = arguments[0]["t0"] this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; @@ -19653,7 +18880,6 @@ function CLOCK_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -19665,7 +18891,6 @@ function CLOCK_f() { } else { var needcompile = 0; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); @@ -19677,7 +18902,7 @@ function CONST() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); @@ -19698,10 +18923,7 @@ function CONST() { CONST.prototype.set = function CONST() { this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { @@ -19731,7 +18953,7 @@ function CONST_f() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); @@ -19752,10 +18974,7 @@ function CONST_f() { CONST_f.prototype.set = function CONST_f() { this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { @@ -19782,7 +19001,7 @@ function CONST_m() { this.C = [1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([size(this.C,1)]); this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([size(this.C,2)]); @@ -19806,10 +19025,7 @@ function CONST_m() { CONST_m.prototype.set = function CONST_m() { this.C = inverse(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs); if (!ok) { @@ -19870,7 +19086,7 @@ function CURVE_c() { this.PeriodicOption = "y"; var Graf = "n"; this.model.sim = list(new ScilabString(["curve_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[1]); @@ -19904,9 +19120,6 @@ function CURVE_c() { this.PeriodicOption = arguments[0]["PeriodicOption"] this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; @@ -20040,7 +19253,7 @@ function CURV_f() { var rpar = [[xx],[yy],[rect.slice()]]; this.model = scicos_model(); this.model.sim = new ScilabString(["intplt"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([xx],[yy],[rect.slice()]); this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); @@ -20059,9 +19272,6 @@ function CURV_f() { return options; } CURV_f.prototype.set = function CURV_f() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var rpar = this.model.rpar; var ipar = this.model.ipar; var n = ipar[1-1]; @@ -20138,10 +19348,7 @@ function Counter() { this.maxim = parseFloat(arguments[0]["maxim"]) this.rule = parseFloat(arguments[0]["rule"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -20187,8 +19394,6 @@ function FROMWSB() { return options; } FROMWSB.prototype.set = function FROMWSB() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="FROMWS_c") { var ppath = list(i); break; @@ -20205,20 +19410,19 @@ function FROMWSB() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (!isequalbitwise(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -20247,12 +19451,10 @@ function FROMWSB() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } @@ -20298,10 +19500,7 @@ function FROMWS_c() { this.ZC = parseFloat(arguments[0]["ZC"]) this.OutEnd = parseFloat(arguments[0]["OutEnd"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -20348,7 +19547,7 @@ function GENSIN_f() { var rpar = [[1],[1],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["gensin"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -20376,10 +19575,7 @@ function GENSIN_f() { this.F = arguments[0]["F"] this.P = arguments[0]["P"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -20436,10 +19632,7 @@ function GENSQR_f() { GENSQR_f.prototype.set = function GENSQR_f() { this.Amplitude = parseFloat(arguments[0]["Amplitude"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } @@ -20481,7 +19674,7 @@ function GEN_SQR() { scs_m_1.objs[16-1] = scicos_link(xx=[[48.313686],[48.229901]],yy=[[403.57431],[385.21998]],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[1,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -20526,16 +19719,13 @@ function GEN_SQR() { scicos_context.F = arguments[0]["scicos_context.F"] this.exprs = arguments[0]["exprs"] var y = this.needcompile; - arg1.model.ipar = 1; var typ = list(); - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; var Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; var Ss = list("mat",[-1,-1],"mat",[-1,-1],"pol",-1,"pol",-1); var scicos_context = struct(); - this.x = arg1; var ok = false; while (!ok) { [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); @@ -20573,7 +19763,7 @@ function Ground_g() { var C = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([1]); @@ -20596,7 +19786,6 @@ function Ground_g() { return options; } Ground_g.prototype.set = function Ground_g() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -20632,10 +19821,7 @@ function INIMPL_f() { INIMPL_f.prototype.set = function INIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; } @@ -20688,9 +19874,6 @@ function IN_f() { return options; } IN_f.prototype.set = function IN_f() { - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; @@ -20766,10 +19949,7 @@ function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); this.ini_c = int(this.ini_c); @@ -20810,7 +19990,7 @@ function PULSE_SC() { scs_m_1.objs[11-1] = scicos_link(xx=[[154.57795],[174.57795]],yy=[[206.09381],[206.09381]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -20855,16 +20035,13 @@ function PULSE_SC() { scicos_context.A = arguments[0]["scicos_context.A"] this.exprs = arguments[0]["exprs"] var y = this.needcompile; - arg1.model.ipar = 1; var typ = list(); - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; var Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; var Ss = list("pol",-1,"pol",-1,"pol",-1,"mat",[-1,-1]); var scicos_context = struct(); - this.x = arg1; var ok = false; while (!ok) { [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); @@ -20907,7 +20084,7 @@ function RAMP() { var rpar = [[this.slope],[this.stt],[this.iout]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ramp"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -20935,10 +20112,7 @@ function RAMP() { this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -20997,10 +20171,7 @@ function RAND_f() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==5) { this.exprs = this.exprs.slice(1-1,3); } @@ -21040,7 +20211,7 @@ function RAND_m() { var funtyp = 4; this.model = scicos_model(); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); @@ -21080,10 +20251,7 @@ function RAND_m() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==14) { this.exprs[9-1] = []; } @@ -21172,10 +20340,7 @@ function READAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; @@ -21285,9 +20450,7 @@ function READC_f() { this.offset = parseFloat(arguments[0]["offset"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; this.model = this.x.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; @@ -21418,10 +20581,7 @@ function RFILE_f() { this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; var ipar = this.model.ipar; var ievt = ipar[3-1]; @@ -21521,7 +20681,6 @@ function SAWTOOTH_f() { return options; } SAWTOOTH_f.prototype.set = function SAWTOOTH_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -21561,10 +20720,7 @@ function STEP() { this.in1 = arguments[0]["in1"] this.fi = arguments[0]["fi"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { @@ -21669,8 +20825,6 @@ function STEP_FUNCTION() { return options; } STEP_FUNCTION.prototype.set = function STEP_FUNCTION() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="STEP") { var ppath = list(i); break; @@ -21686,14 +20840,13 @@ function STEP_FUNCTION() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { @@ -21725,11 +20878,9 @@ function STEP_FUNCTION() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; } } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); @@ -21763,9 +20914,6 @@ function SampleCLK() { this.frequ = arguments[0]["frequ"] this.offset = arguments[0]["offset"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs); @@ -21825,8 +20973,6 @@ function Sigbuilder() { } Sigbuilder.prototype.set = function Sigbuilder() { var ppath = list(0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="CURVE_c") { ppath[1-1] = i; break; @@ -21843,20 +20989,19 @@ function Sigbuilder() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -21885,12 +21030,10 @@ function Sigbuilder() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; this.y = max(this.y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } @@ -21916,7 +21059,6 @@ function TIME_f() { return options; } TIME_f.prototype.set = function TIME_f() { - this.x = arg1; return new BasicBlock(this.x); } } @@ -21954,10 +21096,7 @@ function TKSCALE() { this.b = parseFloat(arguments[0]["b"]) this.f = parseFloat(arguments[0]["f"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs); if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); @@ -21977,7 +21116,7 @@ function GENERAL_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); this.model.nzcross = new ScilabDouble([this.in1]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.rpar = new ScilabDouble([0],[0],[0],[0]); this.model.blocktype = new ScilabString(["z"]); @@ -22002,12 +21141,9 @@ function GENERAL_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.out = parseFloat(arguments[0]["out"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; - this.in1 = this.model.in1; + this.in1 = this.model.in; this.out = this.model.evtout; var nin = sum(this.in1); var nout = sum(this.out); @@ -22047,7 +21183,7 @@ function NEGTOPOS_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); this.model.nzcross = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]); this.model.blocktype = new ScilabString(["z"]); @@ -22066,7 +21202,6 @@ function NEGTOPOS_f() { return options; } NEGTOPOS_f.prototype.set = function NEGTOPOS_f() { - this.x = arg1; this.x.model.firing = -1; return new BasicBlock(this.x); } @@ -22078,7 +21213,7 @@ function POSTONEG_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); this.model.nzcross = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]); this.model.blocktype = new ScilabString(["z"]); @@ -22097,7 +21232,6 @@ function POSTONEG_f() { return options; } POSTONEG_f.prototype.set = function POSTONEG_f() { - this.x = arg1; this.x.model.firing = [-1]; return new BasicBlock(this.x); } @@ -22109,7 +21243,7 @@ function ZCROSS_f() { this.in1 = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]); @@ -22132,10 +21266,7 @@ function ZCROSS_f() { ZCROSS_f.prototype.set = function ZCROSS_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),this.exprs); if (!ok) { @@ -22151,7 +21282,7 @@ function ZCROSS_f() { } this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]); this.graphics.exprs = new ScilabDouble([this.exprs]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.firing = new ScilabDouble([-1]); this.x.graphics = this.graphics; diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index a43ecbc0..eee27067 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -24,9 +24,6 @@ function CLKFROM() { CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),this.exprs); diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index cc21a9a0..d6305f03 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -28,9 +28,6 @@ function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),this.exprs); diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 4ab4da7c..cc46d52d 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -3,7 +3,7 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() { this.model = scicos_model(); this.model.sim = new ScilabString(["clkgototagvisibility"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.out2 = new ScilabDouble([]); @@ -31,10 +31,7 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index 918f1bf7..e383d22b 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -34,33 +34,33 @@ p6 sS'model.in2' p7 g6 -sS'model.in1' +sS'model.intyp' p8 -g6 -sS'x.graphics' +S'double' p9 +sS'x.graphics' +p10 g2 sS'model.evtin' -p10 +p11 g6 sS'model.firing' -p11 -S'boolean' p12 -sS'model.sim' +S'boolean' p13 -S'string' +sS'model.sim' p14 -sS'model.out2' +S'string' p15 -g6 -sS'model.intyp' +sS'model.out2' p16 -S'double' -p17 +g6 sS'y' +p17 +g9 +sS'model.in' p18 -g17 +g6 sS'graphics.exprs' p19 NsS'typ' @@ -72,25 +72,25 @@ S'list' p22 sS'needcompile' p23 -g17 +g9 sS'model.blocktype' p24 -g14 +g15 sS'model.dep_ut' p25 g6 sS'exprs' p26 -g14 +g15 sS'gr_i' p27 g6 sS'model.outtyp' p28 -g17 +g9 sS'x' p29 -g17 +g9 sS'model' p30 g2 diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index ed544002..c4866c99 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -4,7 +4,7 @@ function DEMUX() { this.out = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([0]); + this.model.in = new ScilabDouble([0]); this.model.out = new ScilabDouble(-transpose([1:this.out])); this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); @@ -27,10 +27,7 @@ function DEMUX() { DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),this.exprs); if (!ok) { diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index a3fa5b85..c684bb7b 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -21,9 +21,9 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'double' +S'vector' p4 sS'ok' p5 @@ -44,11 +44,11 @@ sS'graphics.exprs' p12 NsS'nin' p13 -g4 -sS'model.out' +S'double' p14 -S'vector' +sS'model.dep_ut' p15 +g4 sS'exprs' p16 g8 @@ -56,32 +56,32 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'model.dep_ut' +g4 +sS'model.in' p19 -g15 +g14 sS'graphics' p20 g10 sS'y' p21 -g15 +g4 sS'x' p22 -g4 +g14 sS'model' p23 g10 sS'model.ipar' p24 -g4 +g14 sS'typ' p25 -g15 +g4 sS'model.firing' p26 -g15 +g4 sS'out' p27 -g4 +g14 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 94182b06..d25f36d4 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -4,7 +4,7 @@ function DEMUX_f() { this.out = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["demux"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([0]); + this.model.in = new ScilabDouble([0]); this.model.out = new ScilabDouble(-transpose([1:this.out])); this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); @@ -27,10 +27,7 @@ function DEMUX_f() { DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index a3fa5b85..c684bb7b 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -21,9 +21,9 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'double' +S'vector' p4 sS'ok' p5 @@ -44,11 +44,11 @@ sS'graphics.exprs' p12 NsS'nin' p13 -g4 -sS'model.out' +S'double' p14 -S'vector' +sS'model.dep_ut' p15 +g4 sS'exprs' p16 g8 @@ -56,32 +56,32 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'model.dep_ut' +g4 +sS'model.in' p19 -g15 +g14 sS'graphics' p20 g10 sS'y' p21 -g15 +g4 sS'x' p22 -g4 +g14 sS'model' p23 g10 sS'model.ipar' p24 -g4 +g14 sS'typ' p25 -g15 +g4 sS'model.firing' p26 -g15 +g4 sS'out' p27 -g4 +g14 s.
\ No newline at end of file diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 7c45d10a..60d88fe9 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -4,7 +4,7 @@ function ESELECT_f() { this.out = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["eselect"]), new ScilabDouble([-2])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); @@ -35,8 +35,6 @@ function ESELECT_f() { this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==1) { this.exprs[2-1] = string(1); @@ -44,7 +42,6 @@ function ESELECT_f() { if (size(this.exprs,"*")==2) { this.exprs[3-1] = string(0); } - this.model = arg1.model; while (true) { [ok,this.out,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 9e105914..2e30dbad 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -30,55 +30,55 @@ p3 g2 sS'x.model' p4 -NsS'model.intyp' +NsS'inh' p5 S'double' p6 -sS'inh' -p7 -g6 sS'model.dep_ut' -p8 +p7 S'vector' -p9 +p8 sS'out' -p10 +p9 g6 sS'model.in2' -p11 +p10 g6 -sS'model.in1' -p12 +sS'model.intyp' +p11 g6 sS'x.graphics' -p13 +p12 g2 sS'typ' -p14 -g9 +p13 +g8 sS'model.evtin' -p15 +p14 g6 sS'exprs[2-1]' -p16 +p15 S'string' -p17 +p16 sS'model.firing' -p18 +p17 g6 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g6 sS'model.nmode' -p22 +p21 g6 sS'exprs[3-1]' +p22 +g16 +sS'model.in' p23 -g17 +g6 sS'graphics.exprs' p24 NsS'model.nzcross' @@ -86,7 +86,7 @@ p25 g6 sS'model.blocktype' p26 -g17 +g16 sS'nmod' p27 g6 @@ -96,10 +96,10 @@ S'matrix' p29 sS'gr_i' p30 -g9 +g8 sS'y' p31 -g9 +g8 sS'x' p32 g6 diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 8134914a..7dcc7136 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -4,7 +4,7 @@ function EXTRACTOR() { this.ind = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["extractor"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -26,10 +26,7 @@ function EXTRACTOR() { EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.ind,this.exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index 8e0402fe..3e7ca0b1 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -40,28 +40,28 @@ sS'graphics.exprs' p10 NsS'x.model' p11 -NsS'model.out' +NsS'model.dep_ut' p12 -g4 -sS'exprs' -p13 S'vector' +p13 +sS'exprs' p14 +g13 sS'ind' p15 g4 sS'gr_i' p16 -g14 -sS'model.dep_ut' +g13 +sS'model.in' p17 -g14 +g4 sS'graphics' p18 g8 sS'y' p19 -g14 +g13 sS'x' p20 g4 @@ -73,5 +73,5 @@ p22 g4 sS'typ' p23 -g14 +g13 s.
\ No newline at end of file diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 9c13d8c9..01d9188f 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -3,7 +3,7 @@ function FROM() { FROM.prototype.define = function FROM() { this.model = scicos_model(); this.model.sim = new ScilabString(["from"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -31,10 +31,7 @@ function FROM() { FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index b1d966d0..9ddcfaaf 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -35,9 +35,9 @@ sS'model.in2' p7 S'vector' p8 -sS'model.in1' +sS'model.intyp' p9 -g8 +g6 sS'x.graphics' p10 g2 @@ -48,12 +48,12 @@ p12 sS'model.out2' p13 g6 -sS'model.intyp' +sS'y' p14 g6 -sS'y' +sS'model.in' p15 -g6 +g8 sS'graphics.exprs' p16 NsS'model.ipar' diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 207c71da..b46464b5 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -3,7 +3,7 @@ function FROMMO() { FROMMO.prototype.define = function FROMMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["frommo"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -34,10 +34,7 @@ function FROMMO() { FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 7b6b2992..87838f88 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -39,9 +39,9 @@ sS'model.in2' p9 S'vector' p10 -sS'model.in1' +sS'model.intyp' p11 -g10 +g8 sS'x.graphics' p12 g2 @@ -57,12 +57,12 @@ g8 sS'x.graphics.out_implicit' p16 g10 -sS'model.intyp' +sS'y' p17 g8 -sS'y' +sS'model.in' p18 -g8 +g10 sS'graphics.exprs' p19 NsS'model.ipar' diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 690af30a..e3ed8c22 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -3,7 +3,7 @@ function GOTO() { GOTO.prototype.define = function GOTO() { this.model = scicos_model(); this.model.sim = new ScilabString(["goto"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([]); @@ -33,10 +33,7 @@ function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { @@ -57,7 +54,6 @@ function GOTO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; this.x.graphics = this.graphics; - var arg1 = this.x; break; } } diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 3de9759d..3b5c4c09 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -39,7 +39,7 @@ p8 sS'model.in2' p9 g2 -sS'model.in1' +sS'model.intyp' p10 g2 sS'x.graphics' @@ -52,10 +52,10 @@ p13 sS'model.out2' p14 g8 -sS'model.intyp' +sS'y' p15 g2 -sS'y' +sS'model.in' p16 g2 sS'graphics.exprs' diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index bb2f2c05..81c8ec38 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -3,7 +3,7 @@ function GOTOMO() { GOTOMO.prototype.define = function GOTOMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["gotomo"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([]); this.model.out = new ScilabDouble([]); @@ -36,10 +36,7 @@ function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { @@ -60,7 +57,6 @@ function GOTOMO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; this.x.graphics = this.graphics; - var arg1 = this.x; break; } } diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index bf20ace2..6d754d8b 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -43,9 +43,9 @@ p10 sS'model.in2' p11 g2 -sS'model.in1' +sS'model.intyp' p12 -g2 +g10 sS'x.graphics' p13 g5 @@ -61,10 +61,10 @@ g7 sS'model.out2' p17 g10 -sS'model.intyp' -p18 -g10 sS'y' +p18 +g2 +sS'model.in' p19 g2 sS'graphics.exprs' diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 1d4f0f29..f92bd228 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -3,7 +3,7 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.define = function GotoTagVisibility() { this.model = scicos_model(); this.model.sim = new ScilabString(["gototagvisibility"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.out2 = new ScilabDouble([]); @@ -31,10 +31,7 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index 918f1bf7..e383d22b 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -34,33 +34,33 @@ p6 sS'model.in2' p7 g6 -sS'model.in1' +sS'model.intyp' p8 -g6 -sS'x.graphics' +S'double' p9 +sS'x.graphics' +p10 g2 sS'model.evtin' -p10 +p11 g6 sS'model.firing' -p11 -S'boolean' p12 -sS'model.sim' +S'boolean' p13 -S'string' +sS'model.sim' p14 -sS'model.out2' +S'string' p15 -g6 -sS'model.intyp' +sS'model.out2' p16 -S'double' -p17 +g6 sS'y' +p17 +g9 +sS'model.in' p18 -g17 +g6 sS'graphics.exprs' p19 NsS'typ' @@ -72,25 +72,25 @@ S'list' p22 sS'needcompile' p23 -g17 +g9 sS'model.blocktype' p24 -g14 +g15 sS'model.dep_ut' p25 g6 sS'exprs' p26 -g14 +g15 sS'gr_i' p27 g6 sS'model.outtyp' p28 -g17 +g9 sS'x' p29 -g17 +g9 sS'model' p30 g2 diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 91c817fd..6fff7ad2 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -3,7 +3,7 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["gototagvisibilitymo"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.out2 = new ScilabDouble([]); @@ -31,10 +31,7 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index 918f1bf7..e383d22b 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -34,33 +34,33 @@ p6 sS'model.in2' p7 g6 -sS'model.in1' +sS'model.intyp' p8 -g6 -sS'x.graphics' +S'double' p9 +sS'x.graphics' +p10 g2 sS'model.evtin' -p10 +p11 g6 sS'model.firing' -p11 -S'boolean' p12 -sS'model.sim' +S'boolean' p13 -S'string' +sS'model.sim' p14 -sS'model.out2' +S'string' p15 -g6 -sS'model.intyp' +sS'model.out2' p16 -S'double' -p17 +g6 sS'y' +p17 +g9 +sS'model.in' p18 -g17 +g6 sS'graphics.exprs' p19 NsS'typ' @@ -72,25 +72,25 @@ S'list' p22 sS'needcompile' p23 -g17 +g9 sS'model.blocktype' p24 -g14 +g15 sS'model.dep_ut' p25 g6 sS'exprs' p26 -g14 +g15 sS'gr_i' p27 g6 sS'model.outtyp' p28 -g17 +g9 sS'x' p29 -g17 +g9 sS'model' p30 g2 diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 7c3992fc..89fe6233 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -6,7 +6,7 @@ function ISELECT_f() { this.nout = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble(out); this.model.evtin = new ScilabDouble([ones(out)]); this.model.dstate = new ScilabDouble([this.z0]); @@ -31,10 +31,7 @@ function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index cf5ae1e1..88aca371 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -23,67 +23,67 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'double' +S'matrix' p4 sS'model.dstate' p5 -g4 -sS'model.evtin' +S'double' p6 -g4 -sS'x.graphics' +sS'model.evtin' p7 -S'object' +g6 +sS'x.graphics' p8 -sS'arg1' +S'object' p9 -g8 -sS'graphics.exprs' +sS'arg1' p10 -NsS'model.out' +g9 +sS'graphics.exprs' p11 -S'matrix' +NsS'model.dep_ut' p12 -sS'model.blocktype' +S'vector' p13 -S'string' +sS'model.blocktype' p14 -sS'exprs' +S'string' p15 -g12 -sS'x.model' +sS'exprs' p16 -NsS'gr_i' +g4 +sS'x.model' p17 -S'vector' +NsS'gr_i' p18 +g13 sS'z0' p19 -g4 -sS'model.dep_ut' +g6 +sS'model.in' p20 -g18 +g6 sS'graphics' p21 -g8 +g9 sS'y' p22 -g18 +g13 sS'x' p23 -g4 +g6 sS'model' p24 -g8 +g9 sS'typ' p25 -g18 +g13 sS'nout' p26 -g4 +g6 sS'out' p27 -g12 +g4 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index dc34ae2f..a396c439 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -8,7 +8,7 @@ function ISELECT_m() { this.model.out = new ScilabDouble([-1],[-1]); this.model.out2 = new ScilabDouble([-2],[-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([]); @@ -41,10 +41,7 @@ function ISELECT_m() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index afc20fa3..2dd402c1 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -38,56 +38,56 @@ S'vector' p7 sS'x.model' p8 -NsS'model.intyp' +NsS'model.out' p9 -g2 -sS'model.out' -p10 S'matrix' -p11 +p10 sS'out' -p12 +p11 g7 sS'model.in2' -p13 +p12 g2 -sS'model.in1' -p14 +sS'model.intyp' +p13 g2 sS'x.graphics' -p15 +p14 g4 sS'typ' -p16 +p15 g7 sS'model.evtin' -p17 +p16 g2 sS'model.firing' -p18 +p17 g7 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g7 sS'model.out2' -p22 -g11 +p21 +g10 sS'in1' -p23 +p22 g7 sS'model.rpar' -p24 +p23 g7 sS'model.outtyp' -p25 +p24 g2 sS'model.state' -p26 +p25 g7 +sS'model.in' +p26 +g2 sS'graphics.exprs' p27 NsS'model.ipar' @@ -109,7 +109,7 @@ p34 g7 sS'exprs' p35 -g11 +g10 sS'gr_i' p36 g7 diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 710b3825..96a34c93 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -4,7 +4,7 @@ function MUX() { this.in1 = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(-transpose([1:this.in1])); + this.model.in = new ScilabDouble(-transpose([1:this.in1])); this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); @@ -25,10 +25,7 @@ function MUX() { MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),this.exprs); if (!ok) { diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index 68f561c9..5a8f8e63 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -21,9 +21,9 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'vector' +S'double' p4 sS'ok' p5 @@ -44,11 +44,11 @@ sS'graphics.exprs' p12 NsS'in1' p13 -S'double' +g4 +sS'model.dep_ut' p14 -sS'model.out' +S'vector' p15 -g14 sS'exprs' p16 g8 @@ -56,29 +56,29 @@ sS'x.model' p17 NsS'gr_i' p18 -g4 -sS'model.dep_ut' +g15 +sS'model.in' p19 -g4 +g15 sS'graphics' p20 g10 sS'y' p21 -g4 +g15 sS'x' p22 -g14 +g4 sS'model' p23 g10 sS'model.ipar' p24 -g14 +g4 sS'typ' p25 -g4 +g15 sS'nout' p26 -g14 +g4 s.
\ No newline at end of file diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 094c051e..838956f7 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -4,7 +4,7 @@ function MUX_f() { this.in1 = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mux"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble(-transpose([1:this.in1])); + this.model.in = new ScilabDouble(-transpose([1:this.in1])); this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); @@ -25,10 +25,7 @@ function MUX_f() { MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index 68f561c9..5a8f8e63 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -21,9 +21,9 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'vector' +S'double' p4 sS'ok' p5 @@ -44,11 +44,11 @@ sS'graphics.exprs' p12 NsS'in1' p13 -S'double' +g4 +sS'model.dep_ut' p14 -sS'model.out' +S'vector' p15 -g14 sS'exprs' p16 g8 @@ -56,29 +56,29 @@ sS'x.model' p17 NsS'gr_i' p18 -g4 -sS'model.dep_ut' +g15 +sS'model.in' p19 -g4 +g15 sS'graphics' p20 g10 sS'y' p21 -g4 +g15 sS'x' p22 -g14 +g4 sS'model' p23 g10 sS'model.ipar' p24 -g14 +g4 sS'typ' p25 -g4 +g15 sS'nout' p26 -g14 +g4 s.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index cf144eff..3859b45f 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -6,7 +6,7 @@ function M_SWITCH() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mswitch"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -32,10 +32,7 @@ function M_SWITCH() { this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nin,this.base,this.rule,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 6a8b359c..7abc48ad 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -42,28 +42,28 @@ sS'out' p9 S'vector' p10 -sS'model.in1' -p11 -g5 sS'x.graphics' -p12 +p11 g2 sS'model.sim' -p13 +p12 S'list' -p14 +p13 sS'nin' -p15 +p14 g8 sS'in1' -p16 +p15 g5 sS'in2' -p17 +p16 g5 sS'base' -p18 +p17 g8 +sS'model.in' +p18 +g5 sS'graphics.exprs' p19 NsS'model.ipar' diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index ea15f6b7..0f4cb761 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -5,7 +5,7 @@ function NRMSOM_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["junk"]); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -26,10 +26,7 @@ function NRMSOM_f() { NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nin,this.exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 27340c37..0c0604b9 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -21,57 +21,57 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 sS'nin' p5 -S'double' -p6 +g4 sS'model.blocktype' -p7 +p6 g2 sS'x.graphics' -p8 +p7 S'object' -p9 +p8 sS'arg1' -p10 -g9 +p9 +g8 sS'graphics.exprs' -p11 +p10 NsS'in1' +p11 +S'matrix' p12 -g4 -sS'model.out' +sS'model.dep_ut' p13 -g6 -sS'exprs' -p14 S'vector' +p14 +sS'exprs' p15 +g14 sS'x.model' p16 NsS'gr_i' p17 -g15 -sS'model.dep_ut' +g14 +sS'model.in' p18 -g15 +g12 sS'graphics' p19 -g9 +g8 sS'y' p20 -g15 +g14 sS'x' p21 -g6 +g4 sS'model' p22 -g9 +g8 sS'typ' p23 -g15 +g14 s.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 1745376c..8ddda3f3 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -6,7 +6,7 @@ function RELAY_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relay"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([i0]); @@ -32,10 +32,7 @@ function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; while (true) { [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 9700e89e..72cd5255 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -36,56 +36,56 @@ g4 sS'model.out' p7 g2 -sS'model.in1' -p8 -S'matrix' -p9 sS'x.graphics' -p10 +p8 g4 sS'model.evtin' -p11 +p9 g2 sS'model.firing' -p12 +p10 S'vector' -p13 +p11 sS'model.sim' -p14 +p12 S'list' -p15 +p13 sS'nin' -p16 +p14 g2 sS'i0' -p17 +p15 g2 sS'in1' +p16 +S'matrix' +p17 +sS'model.in' p18 -g9 +g17 sS'graphics.exprs' p19 NsS'typ' p20 -g13 +g11 sS'model.blocktype' p21 S'string' p22 sS'model.dep_ut' p23 -g13 +g11 sS'exprs' p24 -g9 +g17 sS'gr_i' p25 -g13 +g11 sS'ipar' p26 NsS'y' p27 -g13 +g11 sS'x' p28 g2 diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 18895dd4..90de2156 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -5,7 +5,7 @@ function SCALAR2VECTOR() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["scalar2vector"]), new ScilabDouble([4])); this.model.out = new ScilabDouble([this.nout]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string([this.nout])]; @@ -25,10 +25,7 @@ function SCALAR2VECTOR() { SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nout,this.exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index ed60d5ef..79885755 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -42,27 +42,27 @@ p11 g10 sS'graphics.exprs' p12 -NsS'model.in1' +NsS'model.dep_ut' p13 -g4 -sS'model.dep_ut' -p14 S'vector' -p15 +p14 sS'exprs' -p16 -g15 +p15 +g14 sS'x.model' -p17 +p16 NsS'gr_i' +p17 +g14 +sS'model.in' p18 -g15 +g4 sS'graphics' p19 g10 sS'y' p20 -g15 +g14 sS'x' p21 g4 @@ -71,7 +71,7 @@ p22 g10 sS'typ' p23 -g15 +g14 sS'nout' p24 g4 diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 3f5ca888..09e4a5ce 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -6,7 +6,7 @@ function SELECT_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); @@ -31,10 +31,7 @@ function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 79e3c230..1de760dd 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -23,65 +23,65 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 sS'model.dstate' p5 -S'double' -p6 +g4 sS'model.evtin' -p7 -g6 +p6 +g4 sS'x.graphics' -p8 +p7 S'object' -p9 +p8 sS'arg1' -p10 -g9 +p9 +g8 sS'graphics.exprs' -p11 +p10 NsS'nin' -p12 -g6 +p11 +g4 sS'in1' +p12 +S'matrix' p13 -g4 -sS'model.out' +sS'model.dep_ut' p14 -g6 -sS'exprs' +S'vector' p15 -g4 -sS'x.model' +sS'exprs' p16 -NsS'gr_i' +g13 +sS'x.model' p17 -S'vector' +NsS'gr_i' p18 +g15 sS'z0' p19 -g6 -sS'model.dep_ut' +g4 +sS'model.in' p20 -g18 +g13 sS'graphics' p21 -g9 +g8 sS'y' p22 -g18 +g15 sS'x' p23 -g6 +g4 sS'model' p24 -g9 +g8 sS'typ' p25 -g18 +g15 sS'model.blocktype' p26 S'string' diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index b8a5bd74..6d89c729 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -5,7 +5,7 @@ function SELECT_m() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -41,10 +41,7 @@ function SELECT_m() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index c8879d34..eb420b3f 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -38,65 +38,65 @@ S'string' p7 sS'x.model' p8 -NsS'model.intyp' +NsS'model.out' p9 g2 -sS'model.out' -p10 -g2 sS'out' -p11 +p10 S'vector' -p12 +p11 sS'model.in2' -p13 +p12 S'matrix' +p13 +sS'model.intyp' p14 -sS'model.in1' -p15 -g14 +g2 sS'x.graphics' -p16 +p15 g4 sS'typ' -p17 -g12 +p16 +g11 sS'model.evtin' -p18 +p17 g2 sS'model.firing' -p19 -g12 +p18 +g11 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 -g12 +p21 +g11 sS'nin' -p23 +p22 g2 sS'model.out2' -p24 +p23 g2 sS'in1' -p25 -g12 +p24 +g11 sS'model.rpar' -p26 -g12 +p25 +g11 sS'model.outtyp' -p27 +p26 g2 sS'model.state' +p27 +g11 +sS'model.in' p28 -g12 +g13 sS'graphics.exprs' p29 NsS'model.ipar' p30 -g12 +g11 sS'z0' p31 g2 @@ -109,16 +109,16 @@ p34 g7 sS'model.dep_ut' p35 -g12 +g11 sS'exprs' p36 -g14 +g13 sS'gr_i' p37 -g12 +g11 sS'y' p38 -g12 +g11 sS'x' p39 g2 @@ -127,5 +127,5 @@ p40 g4 sS'ot' p41 -g12 +g11 s.
\ No newline at end of file diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js index eca2147d..ff749abe 100644 --- a/js/Branching/SELF_SWITCH.js +++ b/js/Branching/SELF_SWITCH.js @@ -9,7 +9,7 @@ function SELF_SWITCH() { this.x.graphics.pin = 0; this.x.graphics.pout = 0; this.x.model.sim = "csuper"; - this.x.model.in1 = 1; + this.x.model.in = 1; this.x.model.out = 1; this.x.model.blocktype = "h"; this.x.model.dep_ut = [false,false]; @@ -31,7 +31,6 @@ function SELF_SWITCH() { return options; } SELF_SWITCH.prototype.set = function SELF_SWITCH() { - this.x = arg1; this.stateOpen = this.x.model.opar[1-1]; this.x.model.rpar = genSwitchInnerDiagram(!this.stateOpen); this.x.model.opar = list(!this.stateOpen); diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index f7d79ec6..55184003 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -42,89 +42,89 @@ g2 sS'x.model.rpar' p11 g4 -sS'x.model.in1' -p12 -g4 sS'x.model.out' -p13 +p12 g4 sS'diagram.objs[3-1]' -p14 +p13 g2 sS'diagram.objs[2-1]' -p15 +p14 g2 sS'x.graphics.gr_i' -p16 +p15 g6 sS'x.graphics.pout' -p17 +p16 g4 sS'diagram.objs[3-1].graphics.pout' -p18 +p17 g4 sS'x.model.blocktype' -p19 +p18 g9 sS'diagram.objs[2-1].graphics.pin' -p20 +p19 g4 sS'diagram.objs[7-1]' -p21 +p20 g4 sS'diagram.objs[6-1]' -p22 +p21 g4 sS'diagram.objs[5-1]' -p23 +p22 g4 sS'x.graphics.in_implicit' -p24 +p23 g6 sS'diagram.objs[3-1].model.rpar' -p25 +p24 g4 sS'diagram.objs[4-1]' -p26 +p25 g2 sS'x.graphics.in_style' -p27 +p26 g9 sS'stateOpen' -p28 +p27 S'boolean' -p29 +p28 sS'x.graphics.out_implicit' -p30 +p29 g6 sS'diagram.objs[4-1].graphics.pout' -p31 +p30 g4 sS'diagram' -p32 +p31 g4 sS'x.graphics.pin' -p33 +p32 g4 sS'x.model.opar' -p34 +p33 S'list' -p35 +p34 sS'typ' -p36 -g35 +p35 +g34 sS'x.model.sim' -p37 +p36 g9 sS'diagram.objs[4-1].graphics.pin' -p38 +p37 g6 sS'x.graphics.style' -p39 +p38 g9 sS'diagram.objs[3-1].graphics.exprs' -p40 +p39 g9 +sS'x.model.in' +p40 +g4 sS'x.gui' p41 g9 diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 88f40bb9..1660f2c7 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -7,7 +7,7 @@ function SWITCH2() { var rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); @@ -36,10 +36,7 @@ function SWITCH2() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index 3b8a12e8..cc082b2a 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -41,29 +41,29 @@ p8 sS'model.out' p9 g5 -sS'model.in1' -p10 -S'matrix' -p11 sS'x.graphics' -p12 +p10 g2 sS'typ' -p13 +p11 g8 sS'model.sim' -p14 +p12 S'list' -p15 +p13 sS'model.nmode' -p16 +p14 g5 sS'model.rpar' -p17 +p15 g5 sS'in1' +p16 +S'matrix' +p17 +sS'model.in' p18 -g11 +g17 sS'graphics.exprs' p19 NsS'model.ipar' @@ -84,7 +84,7 @@ p25 g5 sS'exprs' p26 -g11 +g17 sS'gr_i' p27 g8 diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index b7ea3784..ee598779 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -6,7 +6,7 @@ function SWITCH2_m() { var rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[1],[-1]); + this.model.in = new ScilabDouble([-1],[1],[-1]); this.model.in2 = new ScilabDouble([-2],[1],[-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -41,10 +41,7 @@ function SWITCH2_m() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.ot,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { @@ -75,7 +72,7 @@ function SWITCH2_m() { it[1-1] = this.ot; it[2-1] = 1; it[3-1] = this.ot; - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,this.ot),[],[]); this.model = tmpvar0[0]; diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 733fcd2c..3e82ebb1 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -37,61 +37,61 @@ p5 sS'x.model' p6 g2 -sS'model.intyp' -p7 -g5 sS'model.dep_ut' -p8 +p7 S'vector' -p9 +p8 sS'model.out' -p10 +p9 g5 sS'it[3-1]' -p11 +p10 NsS'out' -p12 -g9 +p11 +g8 sS'model.in2' -p13 +p12 S'matrix' +p13 +sS'model.intyp' p14 -sS'model.in1' -p15 -g14 +g5 sS'x.graphics' -p16 +p15 g2 sS'it[2-1]' -p17 +p16 g5 sS'typ' -p18 -g9 +p17 +g8 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.out2' -p21 +p20 g5 sS'model.nmode' -p22 +p21 g5 sS'model.rpar' -p23 +p22 g5 sS'in1' -p24 -g9 +p23 +g8 sS'model.outtyp' -p25 +p24 g5 +sS'model.in' +p25 +g13 sS'graphics.exprs' p26 NsS'model.ipar' p27 -g9 +g8 sS'model.nzcross' p28 g5 @@ -111,16 +111,16 @@ p34 g5 sS'exprs' p35 -g14 +g13 sS'gr_i' p36 -g9 +g8 sS'ipar' p37 -g9 +g8 sS'y' p38 -g9 +g8 sS'x' p39 g5 diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index bf9b0bd8..e427833b 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -6,7 +6,7 @@ function SWITCH_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switchn"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); @@ -31,10 +31,7 @@ function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; while (true) { [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),this.exprs); diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index 8b909059..a3d7a1eb 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -33,30 +33,30 @@ sS'model.out' p5 S'double' p6 -sS'model.in1' -p7 -S'matrix' -p8 sS'x.graphics' -p9 +p7 g2 sS'model.firing' -p10 +p8 S'vector' -p11 +p9 sS'model.sim' -p12 +p10 S'list' -p13 +p11 sS'nin' -p14 +p12 g6 sS'i0' -p15 +p13 g6 sS'in1' +p14 +S'matrix' +p15 +sS'model.in' p16 -g8 +g15 sS'graphics.exprs' p17 NsS'model.ipar' @@ -64,25 +64,25 @@ p18 g6 sS'typ' p19 -g11 +g9 sS'model.blocktype' p20 S'string' p21 sS'model.dep_ut' p22 -g11 +g9 sS'exprs' p23 -g8 +g15 sS'gr_i' p24 -g11 +g9 sS'ipar' p25 NsS'y' p26 -g11 +g9 sS'x' p27 g6 diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 61b96852..9ca93b6c 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -42,7 +42,7 @@ function CCS() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -58,11 +58,7 @@ function CCS() { return options; } CCS.prototype.set = function CCS() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index 35f6a110..fc35644a 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -34,47 +34,47 @@ p8 sS'model.out' p9 g8 -sS'model.in1' -p10 -g8 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'Typeout' -p13 -g12 +p12 +g11 sS'x.graphics.in_implicit' -p14 -g12 +p13 +g11 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g4 sS'ModelName' -p18 +p17 g4 sS'y' -p19 +p18 g6 sS'mo.outputs' -p20 -g12 +p19 +g11 sS'Typein' -p21 -g12 +p20 +g11 sS'x.graphics.out_implicit' -p22 -g12 +p21 +g11 sS'model.rpar' -p23 +p22 g6 sS'P' +p23 +g11 +sS'model.in' p24 -g12 +g8 sS'graphics' p25 g2 @@ -86,10 +86,10 @@ p27 g4 sS'MO' p28 -g12 +g11 sS'MI' p29 -g12 +g11 sS'model.dep_ut' p30 g6 @@ -101,7 +101,7 @@ p32 g6 sS'PortName' p33 -g12 +g11 sS'x' p34 g8 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 052d7100..46e24d85 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -42,7 +42,7 @@ function CVS() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -58,11 +58,7 @@ function CVS() { return options; } CVS.prototype.set = function CVS() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index 35f6a110..fc35644a 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -34,47 +34,47 @@ p8 sS'model.out' p9 g8 -sS'model.in1' -p10 -g8 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'Typeout' -p13 -g12 +p12 +g11 sS'x.graphics.in_implicit' -p14 -g12 +p13 +g11 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g4 sS'ModelName' -p18 +p17 g4 sS'y' -p19 +p18 g6 sS'mo.outputs' -p20 -g12 +p19 +g11 sS'Typein' -p21 -g12 +p20 +g11 sS'x.graphics.out_implicit' -p22 -g12 +p21 +g11 sS'model.rpar' -p23 +p22 g6 sS'P' +p23 +g11 +sS'model.in' p24 -g12 +g8 sS'graphics' p25 g2 @@ -86,10 +86,10 @@ p27 g4 sS'MO' p28 -g12 +g11 sS'MI' p29 -g12 +g11 sS'model.dep_ut' p30 g6 @@ -101,7 +101,7 @@ p32 g6 sS'PortName' p33 -g12 +g11 sS'x' p34 g8 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index d11d389c..87a25873 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -14,7 +14,7 @@ function Capacitor() { mo.outputs = "n"; mo.parameters = list(["C","v"],list(this.C,this.v),[0,1]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); @@ -37,10 +37,7 @@ function Capacitor() { this.C = parseFloat(arguments[0]["C"]) this.v = parseFloat(arguments[0]["v"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.v,this.exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index f3585d18..49807874 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -36,47 +36,47 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'C' -p17 +p16 g8 sS'model.equations' -p18 +p17 g8 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 -g13 +p19 +g12 sS'model.rpar' -p21 +p20 S'matrix' +p21 +sS'model.in' p22 +g8 sS'graphics.exprs' p23 NsS'typ' p24 -g13 +g12 sS'model.blocktype' p25 g5 @@ -85,22 +85,22 @@ p26 g2 sS'model.dep_ut' p27 -g13 +g12 sS'model.equations.parameters[2-1]' p28 -g15 +g14 sS'exprs' p29 g5 sS'gr_i' p30 -g13 +g12 sS'v' p31 g8 sS'y' p32 -g13 +g12 sS'x' p33 g8 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index dc90df63..e2968411 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -4,7 +4,7 @@ function ConstantVoltage() { this.V = 0.01; this.model = scicos_model(); this.model.rpar = new ScilabDouble([this.V]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); @@ -33,10 +33,7 @@ function ConstantVoltage() { ConstantVoltage.prototype.set = function ConstantVoltage() { this.V = parseFloat(arguments[0]["V"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.V,this.exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 92a04c12..7f12abce 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -33,9 +33,9 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' +sS'graphics' p9 -g8 +g2 sS'x.graphics' p10 g2 @@ -65,15 +65,15 @@ g13 sS'model.rpar' p20 g8 -sS'V' +sS'model.in' p21 g8 -sS'typ' +sS'V' p22 -g13 -sS'graphics' +g8 +sS'typ' p23 -g2 +g13 sS'model.blocktype' p24 g5 diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 73659ef1..752f7b9b 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -2,7 +2,7 @@ function CurrentSensor() { CurrentSensor.prototype.define = function CurrentSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); this.model.blocktype = new ScilabString(["c"]); @@ -28,7 +28,6 @@ function CurrentSensor() { return options; } CurrentSensor.prototype.set = function CurrentSensor() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 31a790d2..01611a18 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -19,48 +19,48 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'model.blocktype' -p6 +p5 g2 sS'exprs' -p7 +p6 S'vector' -p8 +p7 sS'x.graphics.out_implicit' -p9 +p8 S'matrix' -p10 +p9 sS'mo' -p11 +p10 g4 sS'mo.inputs' -p12 +p11 g2 sS'mo.model' -p13 +p12 g2 sS'model.dep_ut' -p14 -g8 +p13 +g7 sS'model.out' -p15 -g10 +p14 +g9 sS'gr_i' -p16 -g8 +p15 +g7 sS'x.graphics.in_implicit' +p16 +g7 +sS'model.in' p17 -g8 +g4 sS'y' p18 -g8 +g7 sS'x' p19 g4 @@ -70,8 +70,8 @@ S'object' p21 sS'typ' p22 -g8 +g7 sS'mo.outputs' p23 -g10 +g9 s.
\ No newline at end of file diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index d29202b3..8a7f0ebe 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -7,7 +7,7 @@ function Diode() { this.R = 1.e8; this.model = scicos_model(); this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); this.model.blocktype = new ScilabString(["c"]); @@ -43,10 +43,7 @@ function Diode() { this.Maxexp = parseFloat(arguments[0]["Maxexp"]) this.R = parseFloat(arguments[0]["R"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Ids,this.Vt,this.Maxexp,this.R,this.exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index cb1adba4..03c153b1 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -39,78 +39,78 @@ p6 NsS'model.out' p7 g5 -sS'model.in1' -p8 -g5 sS'x.graphics' -p9 +p8 g2 sS'mo.inputs' -p10 +p9 S'string' -p11 +p10 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 -g11 +p15 +g10 sS'model.equations' -p17 +p16 g5 sS'mo.outputs' -p18 -g11 +p17 +g10 sS'x.graphics.out_implicit' -p19 -g13 +p18 +g12 sS'Ids' -p20 +p19 g5 sS'model.rpar' -p21 +p20 S'matrix' -p22 +p21 sS'mo.model' -p23 -g11 +p22 +g10 sS'R' +p23 +g5 +sS'model.in' p24 g5 sS'graphics.exprs' p25 NsS'typ' p26 -g13 +g12 sS'model.equations.parameters' p27 -g15 +g14 sS'model.blocktype' p28 -g11 +g10 sS'mo' p29 g5 sS'model.dep_ut' p30 -g13 +g12 sS'exprs' p31 -g11 +g10 sS'gr_i' p32 -g13 +g12 sS'Vt' p33 g5 sS'y' p34 -g13 +g12 sS'x' p35 g5 diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index e7c04710..e9d19555 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -2,7 +2,7 @@ function Ground() { Ground.prototype.define = function Ground() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); this.model.blocktype = new ScilabString(["c"]); @@ -27,7 +27,6 @@ function Ground() { return options; } Ground.prototype.set = function Ground() { - this.x = arg1; return new GroundBlock(this.x); } } diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index bec9342e..7f41ea79 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -19,55 +19,55 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'vector' -p4 sS'model.equations' -p5 +p3 S'double' -p6 +p4 sS'model.blocktype' -p7 +p5 g2 sS'exprs' -p8 +p6 g2 sS'x.graphics.out_implicit' +p7 +S'vector' +p8 +sS'mo' p9 g4 -sS'mo' -p10 -g6 sS'mo.inputs' -p11 +p10 g2 sS'mo.model' -p12 +p11 g2 sS'model.dep_ut' -p13 -g4 +p12 +g8 sS'model.out' -p14 -g4 +p13 +g8 sS'gr_i' -p15 -g4 +p14 +g8 sS'x.graphics.in_implicit' +p15 +g8 +sS'model.in' p16 -g4 +g8 sS'y' p17 -g4 +g8 sS'x' p18 -g6 +g4 sS'model' p19 S'object' p20 sS'typ' p21 -g4 +g8 s.
\ No newline at end of file diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 00c0e951..d376d798 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -42,7 +42,7 @@ function Gyrator() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -63,11 +63,7 @@ function Gyrator() { this.G1 = arguments[0]["G1"] this.G2 = arguments[0]["G2"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.G1,this.G2,this.exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),this.exprs); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index c683f394..b86e7d42 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -42,55 +42,55 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 g8 sS'Typeout' -p15 +p14 g8 sS'x.graphics.in_implicit' -p16 +p15 g8 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 +p21 g8 sS'Typein' -p23 +p22 g8 sS'x.graphics.out_implicit' -p24 +p23 g8 sS'model.rpar' -p25 +p24 g8 sS'P' -p26 +p25 g8 +sS'model.in' +p26 +g10 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -99,13 +99,13 @@ p30 g10 sS'gr_i' p31 -g21 +g20 sS'MI' p32 g8 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g8 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index a24cdbb2..c39d4793 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -42,7 +42,7 @@ function IdealTransformer() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -61,11 +61,7 @@ function IdealTransformer() { IdealTransformer.prototype.set = function IdealTransformer() { this.N = arguments[0]["N"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.N,this.exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),this.exprs); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 19ad5954..81920d7d 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -40,49 +40,49 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 S'matrix' -p15 +p14 sS'Typeout' -p16 -g15 +p15 +g14 sS'x.graphics.in_implicit' -p17 -g15 +p16 +g14 sS'mo.parameters' -p18 +p17 g2 sS'model.sim' -p19 +p18 g6 sS'ModelName' -p20 +p19 g6 sS'y' -p21 +p20 g8 sS'mo.outputs' -p22 -g15 +p21 +g14 sS'Typein' -p23 -g15 +p22 +g14 sS'x.graphics.out_implicit' -p24 -g15 +p23 +g14 sS'model.rpar' -p25 +p24 g8 sS'P' +p25 +g14 +sS'model.in' p26 -g15 +g10 sS'graphics' p27 g4 @@ -100,7 +100,7 @@ p31 g8 sS'MI' p32 -g15 +g14 sS'model.dep_ut' p33 g8 @@ -111,7 +111,7 @@ sS'x.graphics.exprs' p35 NsS'PortName' p36 -g15 +g14 sS'x' p37 g10 @@ -123,5 +123,5 @@ p39 g8 sS'MO' p40 -g15 +g14 s.
\ No newline at end of file diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index fc028e43..3e303f91 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -2,7 +2,7 @@ function Inductor() { Inductor.prototype.define = function Inductor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.L = 1.e-5; this.model.rpar = new ScilabDouble([this.L]); @@ -33,10 +33,7 @@ function Inductor() { Inductor.prototype.set = function Inductor() { this.L = parseFloat(arguments[0]["L"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.L,this.exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index b7c3a7df..bfc112c9 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -34,41 +34,41 @@ NsS'model.out' p7 S'vector' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 g8 sS'mo.parameters' -p13 +p12 S'list' -p14 +p13 sS'model.sim' -p15 +p14 g5 sS'model.equations' -p16 +p15 S'double' -p17 +p16 sS'mo.outputs' -p18 +p17 g5 sS'x.graphics.out_implicit' -p19 +p18 g8 sS'L' -p20 -g17 +p19 +g16 sS'model.rpar' +p20 +g16 +sS'model.in' p21 -g17 +g8 sS'graphics.exprs' p22 NsS'typ' @@ -79,13 +79,13 @@ p24 g5 sS'mo' p25 -g17 +g16 sS'model.dep_ut' p26 g8 sS'model.equations.parameters[2-1]' p27 -g14 +g13 sS'exprs' p28 g5 @@ -97,7 +97,7 @@ p30 g8 sS'x' p31 -g17 +g16 sS'model' p32 g2 diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 0683c275..90f683f7 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -3,7 +3,7 @@ function MOTOR() { MOTOR.prototype.define = function MOTOR() { this.model = scicos_model(); this.model.out = new ScilabDouble([1],[1]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -23,7 +23,6 @@ function MOTOR() { return options; } MOTOR.prototype.set = function MOTOR() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index 9c6210d5..c2594170 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -19,35 +19,35 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'vector' -p4 sS'model.blocktype' -p5 +p3 g2 sS'exprs' -p6 +p4 g2 sS'x.graphics.out_implicit' -p7 +p5 S'matrix' -p8 +p6 sS'model.dep_ut' -p9 -g4 +p7 +S'vector' +p8 sS'model.out' +p9 +g6 +sS'gr_i' p10 g8 -sS'gr_i' -p11 -g4 sS'x.graphics.in_implicit' +p11 +g8 +sS'model.in' p12 -g4 +g8 sS'y' p13 -g4 +g8 sS'x' p14 S'double' @@ -58,5 +58,5 @@ S'object' p17 sS'typ' p18 -g4 +g8 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 7632989f..57be53ba 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -20,7 +20,7 @@ function NMOS() { mo.inputs = "G"; mo.parameters = list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[this.W],[this.L],[this.Beta],[this.Vt],[this.K2],[this.K5],[this.dW],[this.dL],[this.RDS]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); @@ -57,10 +57,7 @@ function NMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 2be5e1af..b98ca894 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -33,41 +33,41 @@ p15 atp16 Rp17 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'graphics' +sS'arg1' p3 -g2 -sS'mo.model' +S'object' p4 -S'string' +sS'graphics' p5 -sS'K2' +g4 +sS'mo.model' p6 -S'double' +S'string' p7 -sS'x.model' +sS'K2' p8 -NsS'K5' +g2 +sS'x.model' p9 -g7 -sS'model.out' +NsS'K5' p10 -g7 -sS'model.in1' +g2 +sS'model.out' p11 -g7 +g2 sS'x.graphics' p12 -g2 +g4 sS'mo.inputs' p13 -g5 +g7 sS'Beta' p14 -g7 +g2 sS'x.graphics.in_implicit' p15 S'vector' @@ -78,13 +78,13 @@ S'list' p18 sS'model.sim' p19 -g5 +g7 sS'model.equations' p20 -g7 +g2 sS'RDS' p21 -g7 +g2 sS'mo.outputs' p22 S'matrix' @@ -94,10 +94,10 @@ p24 g23 sS'L' p25 -g7 +g2 sS'W' p26 -g7 +g2 sS'graphics.exprs' p27 NsS'typ' @@ -105,16 +105,16 @@ p28 g16 sS'dW' p29 -g7 +g2 sS'dL' p30 -g7 +g2 sS'model.blocktype' p31 -g5 +g7 sS'mo' p32 -g2 +g4 sS'model.dep_ut' p33 g16 @@ -129,14 +129,14 @@ p36 g16 sS'Vt' p37 -g7 +g2 sS'y' p38 g16 sS'x' p39 -g7 +g2 sS'model' p40 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 5246a65a..5f0586f9 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -42,7 +42,7 @@ function NPN() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -93,11 +93,7 @@ function NPN() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,this.exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index aa977a9f..61efb5cd 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -72,55 +72,55 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 g8 sS'Typeout' -p15 +p14 g8 sS'x.graphics.in_implicit' -p16 +p15 g8 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 +p21 g8 sS'Typein' -p23 +p22 g8 sS'x.graphics.out_implicit' -p24 +p23 g8 sS'model.rpar' -p25 +p24 g8 sS'P' -p26 +p25 g8 +sS'model.in' +p26 +g10 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -129,13 +129,13 @@ p30 g10 sS'gr_i' p31 -g21 +g20 sS'MI' p32 g8 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g8 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 31437ba3..56a1e584 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -13,7 +13,7 @@ function OpAmp() { mo.outputs = ["out"]; mo.parameters = list(S,Z); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); @@ -39,10 +39,7 @@ function OpAmp() { this.SatH = arguments[0]["SatH"] this.SatL = arguments[0]["SatL"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (false) { [ok,this.OLGain,this.SatH,this.SatL,this.exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index e96d6dc2..1dc893ad 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -38,50 +38,50 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'x.graphics.in_implicit' -p13 -g12 +p12 +g11 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'mo.outputs' -p18 +p17 S'vector' -p19 +p18 sS'x.graphics.out_implicit' -p20 -g19 +p19 +g18 sS'model.rpar' -p21 -g19 +p20 +g18 sS'S' +p21 +g18 +sS'model.in' p22 -g19 +g8 sS'graphics.exprs' p23 NsS'Z' p24 -g19 +g18 sS'typ' p25 -g19 +g18 sS'model.blocktype' p26 g5 @@ -90,19 +90,19 @@ p27 g2 sS'model.dep_ut' p28 -g19 +g18 sS'model.equations.parameters[2-1]' p29 -g15 +g14 sS'exprs' p30 g5 sS'gr_i' p31 -g19 +g18 sS'y' p32 -g19 +g18 sS'x' p33 g8 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index ae570801..9c9fd1b2 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -20,7 +20,7 @@ function PMOS() { mo.inputs = "G"; mo.parameters = list([["W"],["L"],["Beta"],["Vt"],["K2"],["K5"],["dW"],["dL"],["RDS"]],[[this.W],[this.L],[this.Beta],[this.Vt],[this.K2],[this.K5],[this.dW],[this.dL],[this.RDS]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); @@ -57,10 +57,7 @@ function PMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 2be5e1af..b98ca894 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -33,41 +33,41 @@ p15 atp16 Rp17 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'graphics' +sS'arg1' p3 -g2 -sS'mo.model' +S'object' p4 -S'string' +sS'graphics' p5 -sS'K2' +g4 +sS'mo.model' p6 -S'double' +S'string' p7 -sS'x.model' +sS'K2' p8 -NsS'K5' +g2 +sS'x.model' p9 -g7 -sS'model.out' +NsS'K5' p10 -g7 -sS'model.in1' +g2 +sS'model.out' p11 -g7 +g2 sS'x.graphics' p12 -g2 +g4 sS'mo.inputs' p13 -g5 +g7 sS'Beta' p14 -g7 +g2 sS'x.graphics.in_implicit' p15 S'vector' @@ -78,13 +78,13 @@ S'list' p18 sS'model.sim' p19 -g5 +g7 sS'model.equations' p20 -g7 +g2 sS'RDS' p21 -g7 +g2 sS'mo.outputs' p22 S'matrix' @@ -94,10 +94,10 @@ p24 g23 sS'L' p25 -g7 +g2 sS'W' p26 -g7 +g2 sS'graphics.exprs' p27 NsS'typ' @@ -105,16 +105,16 @@ p28 g16 sS'dW' p29 -g7 +g2 sS'dL' p30 -g7 +g2 sS'model.blocktype' p31 -g5 +g7 sS'mo' p32 -g2 +g4 sS'model.dep_ut' p33 g16 @@ -129,14 +129,14 @@ p36 g16 sS'Vt' p37 -g7 +g2 sS'y' p38 g16 sS'x' p39 -g7 +g2 sS'model' p40 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 295f7c44..2716a49b 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -42,7 +42,7 @@ function PNP() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -93,11 +93,7 @@ function PNP() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (true) { [ok,this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax,this.exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index aa977a9f..61efb5cd 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -72,55 +72,55 @@ p10 sS'model.out' p11 g10 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'mo.inputs' -p14 +p13 g8 sS'Typeout' -p15 +p14 g8 sS'x.graphics.in_implicit' -p16 +p15 g8 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 +p21 g8 sS'Typein' -p23 +p22 g8 sS'x.graphics.out_implicit' -p24 +p23 g8 sS'model.rpar' -p25 +p24 g8 sS'P' -p26 +p25 g8 +sS'model.in' +p26 +g10 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -129,13 +129,13 @@ p30 g10 sS'gr_i' p31 -g21 +g20 sS'MI' p32 g8 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g8 diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index c6e1bab1..fd73b916 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -2,7 +2,7 @@ function PotentialSensor() { PotentialSensor.prototype.define = function PotentialSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); @@ -28,7 +28,6 @@ function PotentialSensor() { return options; } PotentialSensor.prototype.set = function PotentialSensor() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index 1677f93c..be456ea1 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -19,58 +19,58 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'vector' -p4 sS'model.equations' -p5 +p3 S'double' -p6 +p4 sS'model.blocktype' -p7 +p5 g2 sS'x.graphics.out_implicit' +p6 +S'vector' +p7 +sS'mo' p8 g4 -sS'mo' -p9 -g6 sS'mo.inputs' -p10 +p9 g2 sS'mo.model' -p11 +p10 g2 sS'model.rpar' -p12 -g4 +p11 +g7 sS'model.out' -p13 -g4 +p12 +g7 sS'gr_i' -p14 -g4 +p13 +g7 sS'x.graphics.in_implicit' -p15 -g4 +p14 +g7 sS'model.dep_ut' +p15 +g7 +sS'model.in' p16 -g4 +g7 sS'y' p17 -g4 +g7 sS'x' p18 -g6 +g4 sS'model' p19 S'object' p20 sS'typ' p21 -g4 +g7 sS'mo.outputs' p22 -g4 +g7 s.
\ No newline at end of file diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index ab3ddf84..03cefee9 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -13,7 +13,7 @@ function Resistor() { mo.outputs = "n"; mo.parameters = list("R",list(this.R)); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); @@ -33,10 +33,7 @@ function Resistor() { Resistor.prototype.set = function Resistor() { this.R = parseFloat(arguments[0]["R"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.R,this.exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index 070fe90f..e7c6f185 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -34,46 +34,46 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'mo.outputs' -p18 +p17 g5 sS'x.graphics.out_implicit' -p19 -g13 +p18 +g12 sS'model.rpar' -p20 +p19 g8 sS'R' +p20 +g8 +sS'model.in' p21 g8 sS'graphics.exprs' p22 NsS'typ' p23 -g13 +g12 sS'model.blocktype' p24 g5 @@ -82,19 +82,19 @@ p25 g2 sS'model.dep_ut' p26 -g13 +g12 sS'model.equations.parameters[2-1]' p27 -g15 +g14 sS'exprs' p28 g5 sS'gr_i' p29 -g13 +g12 sS'y' p30 -g13 +g12 sS'x' p31 g8 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 13b008b0..ffdbf7f7 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -2,7 +2,7 @@ function SineVoltage() { SineVoltage.prototype.define = function SineVoltage() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.V = 1; this.ph = 0; @@ -46,10 +46,7 @@ function SineVoltage() { this.offset = parseFloat(arguments[0]["offset"]) this.start = parseFloat(arguments[0]["start"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.V,this.ph,this.frq,this.offset,this.start,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 464dfc6e..db0b4d82 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -29,97 +29,97 @@ S'arg1' p1 S'object' p2 -sS'offset' +sS'graphics' p3 -S'double' -p4 +g2 sS'mo.model' -p5 +p4 S'string' -p6 +p5 sS'x.model' -p7 +p6 NsS'model.out' -p8 +p7 S'vector' -p9 -sS'model.in1' -p10 -g9 +p8 sS'x.graphics' -p11 +p9 g2 sS'mo.inputs' +p10 +g5 +sS'offset' +p11 +S'double' p12 -g6 sS'start' p13 -g4 +g12 sS'frq' p14 -g4 +g12 sS'x.graphics.in_implicit' p15 -g9 +g8 sS'ph' p16 -g4 +g12 sS'mo.parameters' p17 S'list' p18 sS'model.sim' p19 -g6 +g5 sS'V' p20 -g4 +g12 sS'model.equations' p21 -g4 +g12 sS'mo.outputs' p22 -g6 +g5 sS'x.graphics.out_implicit' p23 -g9 +g8 sS'model.rpar' p24 S'matrix' p25 -sS'graphics.exprs' +sS'model.in' p26 -NsS'typ' +g8 +sS'graphics.exprs' p27 -g9 -sS'model.blocktype' +NsS'typ' p28 -g6 -sS'graphics' +g8 +sS'model.blocktype' p29 -g2 -sS'model.dep_ut' +g5 +sS'mo' p30 -g9 -sS'model.equations.parameters[2-1]' +g12 +sS'model.dep_ut' p31 +g8 +sS'model.equations.parameters[2-1]' +p32 g18 sS'exprs' -p32 +p33 g25 sS'gr_i' -p33 -g9 -sS'y' p34 -g9 -sS'x' +g8 +sS'y' p35 -g4 -sS'model' +g8 +sS'x' p36 -g2 -sS'mo' +g12 +sS'model' p37 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 5fc20dd9..d91773cc 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -15,7 +15,7 @@ function Switch() { mo.outputs = "n"; mo.parameters = list(S,Z); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); @@ -39,10 +39,7 @@ function Switch() { this.Ron = parseFloat(arguments[0]["Ron"]) this.Roff = parseFloat(arguments[0]["Roff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Ron,this.Roff,this.exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index 4c2ce9dd..5f734625 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -36,42 +36,42 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 S'matrix' -p12 +p11 sS'x.graphics.in_implicit' -p13 -g12 +p12 +g11 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'mo.outputs' -p18 +p17 g5 sS'x.graphics.out_implicit' -p19 +p18 S'vector' -p20 +p19 sS'model.rpar' -p21 +p20 g8 sS'S' +p21 +g11 +sS'model.in' p22 -g12 +g8 sS'graphics.exprs' p23 NsS'Z' @@ -79,7 +79,7 @@ p24 g8 sS'typ' p25 -g20 +g19 sS'model.blocktype' p26 g5 @@ -94,19 +94,19 @@ p29 g2 sS'model.dep_ut' p30 -g20 +g19 sS'model.equations.parameters[2-1]' p31 -g15 +g14 sS'exprs' p32 g5 sS'gr_i' p33 -g20 +g19 sS'y' p34 -g20 +g19 sS'x' p35 g8 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 907daeb0..0caef248 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -2,7 +2,7 @@ function VVsourceAC() { VVsourceAC.prototype.define = function VVsourceAC() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); var VA = 220; this.FR = 50; @@ -35,10 +35,7 @@ function VVsourceAC() { VVsourceAC.prototype.set = function VVsourceAC() { this.FR = parseFloat(arguments[0]["FR"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index b1563a7d..ea61b826 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -41,38 +41,38 @@ NsS'model.out' p10 S'vector' p11 -sS'model.in1' -p12 -S'matrix' -p13 sS'x.graphics' -p14 +p12 g6 sS'mo.inputs' -p15 +p13 g11 sS'x.graphics.in_implicit' -p16 +p14 g11 sS'mo.parameters' -p17 +p15 S'list' -p18 +p16 sS'VA' -p19 +p17 g2 sS'model.equations' -p20 +p18 g2 sS'mo.outputs' -p21 +p19 g4 sS'x.graphics.out_implicit' -p22 +p20 g11 sS'model.rpar' -p23 +p21 g11 +sS'model.in' +p22 +S'matrix' +p23 sS'graphics.exprs' p24 NsS'typ' @@ -89,7 +89,7 @@ p28 g11 sS'model.equations.parameters[2-1]' p29 -g18 +g16 sS'exprs' p30 g11 diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 2efac33a..bd77b219 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -10,7 +10,7 @@ function VariableResistor() { mo.inputs = ["p","R"]; mo.outputs = "n"; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); @@ -28,7 +28,6 @@ function VariableResistor() { return options; } VariableResistor.prototype.set = function VariableResistor() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index 4e1a30e9..2aeed4ce 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -19,57 +19,57 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'model.blocktype' -p6 +p5 g2 sS'exprs' -p7 +p6 S'vector' -p8 +p7 sS'x.graphics.out_implicit' -p9 -g8 +p8 +g7 sS'mo' -p10 +p9 S'object' -p11 +p10 sS'mo.inputs' -p12 -g8 +p11 +g7 sS'mo.model' -p13 +p12 g2 sS'model.dep_ut' -p14 -g8 +p13 +g7 sS'model.out' -p15 +p14 g4 sS'gr_i' -p16 -g8 +p15 +g7 sS'x.graphics.in_implicit' +p16 +g7 +sS'model.in' p17 -g8 +g4 sS'y' p18 -g8 +g7 sS'x' p19 g4 sS'model' p20 -g11 +g10 sS'typ' p21 -g8 +g7 sS'mo.outputs' p22 g2 diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 5500324e..26f366ce 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -2,7 +2,7 @@ function VoltageSensor() { VoltageSensor.prototype.define = function VoltageSensor() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); this.model.blocktype = new ScilabString(["c"]); @@ -28,7 +28,6 @@ function VoltageSensor() { return options; } VoltageSensor.prototype.set = function VoltageSensor() { - this.x = arg1; return new VoltageSensorBlock(this.x); } } diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 31a790d2..01611a18 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -19,48 +19,48 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'model.blocktype' -p6 +p5 g2 sS'exprs' -p7 +p6 S'vector' -p8 +p7 sS'x.graphics.out_implicit' -p9 +p8 S'matrix' -p10 +p9 sS'mo' -p11 +p10 g4 sS'mo.inputs' -p12 +p11 g2 sS'mo.model' -p13 +p12 g2 sS'model.dep_ut' -p14 -g8 +p13 +g7 sS'model.out' -p15 -g10 +p14 +g9 sS'gr_i' -p16 -g8 +p15 +g7 sS'x.graphics.in_implicit' +p16 +g7 +sS'model.in' p17 -g8 +g4 sS'y' p18 -g8 +g7 sS'x' p19 g4 @@ -70,8 +70,8 @@ S'object' p21 sS'typ' p22 -g8 +g7 sS'mo.outputs' p23 -g10 +g9 s.
\ No newline at end of file diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index 60e84496..ef8644eb 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -2,7 +2,7 @@ function VsourceAC() { VsourceAC.prototype.define = function VsourceAC() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.VA = 220; this.FR = 50; @@ -37,10 +37,7 @@ function VsourceAC() { this.VA = parseFloat(arguments[0]["VA"]) this.FR = parseFloat(arguments[0]["FR"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.VA,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 01ffa4e3..a82a09d8 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -43,38 +43,38 @@ NsS'model.out' p10 S'vector' p11 -sS'model.in1' -p12 -g11 sS'x.graphics' -p13 +p12 g6 sS'mo.inputs' -p14 +p13 g4 sS'x.graphics.in_implicit' -p15 +p14 g11 sS'mo.parameters' -p16 +p15 S'list' -p17 +p16 sS'VA' -p18 +p17 g2 sS'model.equations' -p19 +p18 g2 sS'mo.outputs' -p20 +p19 g4 sS'x.graphics.out_implicit' -p21 +p20 g11 sS'model.rpar' -p22 +p21 S'matrix' +p22 +sS'model.in' p23 +g11 sS'graphics.exprs' p24 NsS'typ' @@ -91,10 +91,10 @@ p28 g11 sS'model.equations.parameters[2-1]' p29 -g17 +g16 sS'exprs' p30 -g23 +g22 sS'gr_i' p31 g11 diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js index e98bb7ec..8a270c17 100644 --- a/js/Events/ANDBLK.js +++ b/js/Events/ANDBLK.js @@ -76,7 +76,6 @@ function ANDBLK() { return options; } ANDBLK.prototype.set = function ANDBLK() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 57909073..447c5063 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -21,7 +21,6 @@ function ANDLOG_f() { return options; } ANDLOG_f.prototype.set = function ANDLOG_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 4eefd652..2535c6ff 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -21,7 +21,6 @@ function CLKSOMV_f() { return options; } CLKSOMV_f.prototype.set = function CLKSOMV_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 0c561a9d..766a2f00 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -21,7 +21,6 @@ function CLKSOM_f() { return options; } CLKSOM_f.prototype.set = function CLKSOM_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 477c849d..8611e847 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -20,7 +20,6 @@ function CLKSPLIT_f() { return options; } CLKSPLIT_f.prototype.set = function CLKSPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 107988e7..98c39318 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -26,10 +26,7 @@ function END_c() { END_c.prototype.set = function END_c() { this.tf = parseFloat(arguments[0]["tf"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tf,this.exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index f3bf27b8..871a83f4 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -30,10 +30,7 @@ function EVTDLY_c() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index b3e8f166..21dce7f6 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -30,10 +30,7 @@ function EVTDLY_f() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 297b0784..7080757c 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -25,10 +25,7 @@ function EVTGEN_f() { EVTGEN_f.prototype.set = function EVTGEN_f() { this.tt = parseFloat(arguments[0]["tt"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.tt,this.exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 8b95fda9..364b4be4 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -3,7 +3,7 @@ function EVTVARDLY() { EVTVARDLY.prototype.define = function EVTVARDLY() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["evtvardly"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -26,10 +26,7 @@ function EVTVARDLY() { EVTVARDLY.prototype.set = function EVTVARDLY() { this.fir = arguments[0]["fir"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.fir,this.exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index 06641b49..388357c2 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.evtout' p3 S'double' p4 @@ -37,28 +37,28 @@ p8 g7 sS'graphics.exprs' p9 -NsS'model.evtout' +NsS'model.dep_ut' p10 -g4 -sS'model.dep_ut' -p11 S'vector' -p12 +p11 sS'exprs' -p13 +p12 S'string' -p14 +p13 sS'x.model' -p15 +p14 NsS'gr_i' +p15 +g11 +sS'model.in' p16 -g12 +g4 sS'graphics' p17 g7 sS'y' p18 -g12 +g11 sS'x' p19 g4 @@ -67,11 +67,11 @@ p20 g7 sS'typ' p21 -g12 +g11 sS'model.firing' p22 g4 sS'model.blocktype' p23 -g14 +g13 s.
\ No newline at end of file diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index 18a45667..f1b8662b 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -26,10 +26,7 @@ function HALT_f() { HALT_f.prototype.set = function HALT_f() { this.n = parseFloat(arguments[0]["n"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.n,this.exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index e489695e..952bbe7e 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -3,7 +3,7 @@ function IFTHEL_f() { IFTHEL_f.prototype.define = function IFTHEL_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["ifthel"]), new ScilabDouble([-1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); @@ -14,7 +14,7 @@ function IFTHEL_f() { this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; + this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } @@ -32,10 +32,7 @@ function IFTHEL_f() { this.inh = inverse(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (this.exprs==[]) { this.exprs = string(1); } diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index d83faa7a..b9315ab4 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -28,77 +28,77 @@ p3 g2 sS'x.model' p4 -NsS'model.intyp' +NsS'inh' p5 -S'double' +S'vector' p6 -sS'inh' +sS'nmod' p7 -S'vector' +S'double' p8 -sS'nmod' -p9 -g6 sS'model.in2' +p9 +g8 +sS'model.intyp' p10 -g6 -sS'model.in1' -p11 -g6 +g8 sS'x.graphics' -p12 +p11 g2 sS'typ' +p12 +g6 +sS'model.evtin' p13 g8 -sS'model.evtin' -p14 -g6 sS'exprs[2-1]' -p15 +p14 S'string' -p16 +p15 sS'model.firing' -p17 -g8 +p16 +g6 sS'model.sim' -p18 +p17 S'list' -p19 +p18 sS'model.evtout' -p20 +p19 S'matrix' -p21 +p20 sS'model.nmode' +p21 +g8 +sS'model.in' p22 -g6 +g8 sS'graphics.exprs' p23 -g16 +g15 sS'model.nzcross' p24 -g6 +g8 sS'model.blocktype' p25 -g16 +g15 sS'model.sim[2-1]' p26 -g6 +g8 sS'model.dep_ut' p27 -g8 +g6 sS'exprs' p28 -g21 +g20 sS'gr_i' p29 -g8 +g6 sS'y' p30 -g8 +g6 sS'x' p31 -g6 +g8 sS'model' p32 g2 diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index 564d5370..14fed50b 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -78,8 +78,6 @@ function MCLOCK_f() { return options; } MCLOCK_f.prototype.set = function MCLOCK_f() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") { var path = i; break; @@ -87,13 +85,10 @@ function MCLOCK_f() { } var newpar = list(); var spath = list("model","rpar","objs",path); - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (or(this.xxn!=xx)) { - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; } - this.x = arg1; var y = 0; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 3836c88e..89a580df 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -32,10 +32,7 @@ function MFCLCK_f() { this.dt = parseFloat(arguments[0]["dt"]) this.nn = parseFloat(arguments[0]["nn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; [ok,this.dt,this.nn,this.exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),this.exprs); if (ok) { this.model.ipar = new ScilabDouble([this.nn]); diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 36cb2254..e3a33535 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -29,9 +29,6 @@ function M_freq() { this.frequ = inverse(arguments[0]["frequ"]) this.offset = inverse(arguments[0]["offset"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),this.exprs); diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index 50b68b16..85cc3d75 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -22,7 +22,6 @@ function VirtualCLK0() { return options; } VirtualCLK0.prototype.set = function VirtualCLK0() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index d49a8486..01cc316e 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -121,8 +121,6 @@ function freq_div() { %ph = parseFloat(arguments[0]["%ph"]) %df = parseFloat(arguments[0]["%df"]) this.exprs = inverse(arguments[0]["exprs"]) - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="Modulo_Count") { var path = i; break; @@ -135,7 +133,6 @@ function freq_div() { spath[$+1-1] = "rpar"; spath[$+1-1] = "objs"; spath[$+1-1] = path; - var xx = arg1[spath-1]; var xxn = xx; this.graphics = xx.graphics; this.exprs = this.graphics.exprs; @@ -166,7 +163,7 @@ function freq_div() { var model_n = xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { @@ -198,11 +195,9 @@ function freq_div() { var needcompile = 4; } } - arg1[spath-1] = xxn; newpar[size(newpar)+1-1] = 1; var y = max(y,needcompile); } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 210d7d51..0a38027e 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -4,7 +4,7 @@ function Bache() { var in1 = 2; var out = 3; this.model = scicos_model(); - this.model.in1 = new ScilabDouble([-transpose([1:in1])]); + this.model.in = new ScilabDouble([-transpose([1:in1])]); this.model.out = new ScilabDouble([-transpose([1:out])]); this.Patm = 1.013e5; this.A = 1; @@ -25,7 +25,7 @@ function Bache() { mo.outputs = ["Cs1","Cs2","yNiveau"]; mo.parameters = list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); @@ -62,10 +62,7 @@ function Bache() { this.T0 = parseFloat(arguments[0]["T0"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index e1dd2964..d6882307 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -53,71 +53,71 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g8 sS'zs1' -p11 +p10 g8 sS'zs2' -p12 +p11 g8 sS'x.graphics' -p13 +p12 g2 sS'z0' -p14 +p13 g8 sS'mo.inputs' -p15 +p14 S'vector' -p16 +p15 sS'x.graphics.in_implicit' -p17 +p16 S'matrix' -p18 +p17 sS'mo.parameters' -p19 +p18 S'list' -p20 +p19 sS'Patm' -p21 +p20 g8 sS'A' -p22 +p21 g8 sS'model.sim' -p23 +p22 g5 sS'model.equations' -p24 +p23 g8 sS'mo.outputs' -p25 -g16 +p24 +g15 sS'x.graphics.out_implicit' -p26 -g18 +p25 +g17 sS'in1' -p27 +p26 g8 sS'model.rpar' -p28 -g18 +p27 +g17 sS'ze2' -p29 +p28 g8 sS'ze1' -p30 +p29 g8 sS'T0' +p30 +g8 +sS'model.in' p31 g8 sS'graphics.exprs' p32 NsS'typ' p33 -g16 +g15 sS'model.blocktype' p34 g5 @@ -126,22 +126,22 @@ p35 g2 sS'model.dep_ut' p36 -g16 +g15 sS'model.equations.parameters[2-1]' p37 -g20 +g19 sS'exprs' p38 -g18 +g17 sS'gr_i' p39 -g16 +g15 sS'p_rho' p40 g8 sS'y' p41 -g16 +g15 sS'x' p42 g8 diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 6221b688..7e220e74 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -42,7 +42,7 @@ function Flowmeter() { this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; @@ -60,11 +60,7 @@ function Flowmeter() { Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.x = arg1; this.exprs = this.x.graphics.exprs; while (false) { [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs); diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 6ce9c452..253671ff 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -39,56 +39,56 @@ g8 sS'model.out' p10 g8 -sS'model.in1' -p11 -g8 sS'x.graphics' -p12 +p11 g4 sS'mo.inputs' -p13 +p12 S'matrix' -p14 +p13 sS'Typeout' -p15 -g14 +p14 +g13 sS'x.graphics.in_implicit' -p16 -g14 +p15 +g13 sS'mo.parameters' -p17 +p16 g2 sS'model.sim' -p18 +p17 g6 sS'ModelName' -p19 +p18 g6 sS'y' -p20 +p19 S'vector' -p21 +p20 sS'mo.outputs' -p22 -g14 +p21 +g13 sS'Typein' -p23 -g14 +p22 +g13 sS'x.graphics.out_implicit' -p24 -g14 +p23 +g13 sS'model.rpar' -p25 +p24 g8 sS'P' +p25 +g13 +sS'model.in' p26 -g14 +g8 sS'graphics' p27 g4 sS'typ' p28 -g21 +g20 sS'model.blocktype' p29 g6 @@ -97,13 +97,13 @@ p30 g8 sS'gr_i' p31 -g21 +g20 sS'MI' p32 -g14 +g13 sS'model.dep_ut' p33 -g21 +g20 sS'exprs' p34 g6 @@ -111,7 +111,7 @@ sS'x.graphics.exprs' p35 NsS'PortName' p36 -g14 +g13 sS'x' p37 g8 @@ -123,5 +123,5 @@ p39 g6 sS'MO' p40 -g14 +g13 s.
\ No newline at end of file diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 728d0f24..15d9712d 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -2,7 +2,7 @@ function PerteDP() { PerteDP.prototype.define = function PerteDP() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.L = 10; this.D = 0.2; @@ -20,7 +20,7 @@ function PerteDP() { mo.outputs = "C2"; mo.parameters = list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); @@ -51,10 +51,7 @@ function PerteDP() { this.z2 = parseFloat(arguments[0]["z2"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index 1470e585..4040064e 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -44,50 +44,50 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 g5 sS'x.graphics.in_implicit' -p12 +p11 S'vector' -p13 +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'model.equations' -p17 +p16 g8 sS'D' -p18 +p17 g8 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 -g13 +p19 +g12 sS'L' -p21 +p20 g8 sS'model.rpar' -p22 +p21 S'matrix' +p22 +sS'model.in' p23 +g8 sS'graphics.exprs' p24 NsS'typ' p25 -g13 +g12 sS'z1' p26 g8 @@ -102,22 +102,22 @@ p29 g2 sS'model.dep_ut' p30 -g13 +g12 sS'model.equations.parameters[2-1]' p31 -g15 +g14 sS'exprs' p32 -g23 +g22 sS'gr_i' p33 -g13 +g12 sS'p_rho' p34 g8 sS'y' p35 -g13 +g12 sS'x' p36 g8 diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index c709e833..806f8670 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -15,7 +15,7 @@ function PuitsP() { mo.inputs = ["C"]; mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); @@ -40,10 +40,7 @@ function PuitsP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index 24458909..44da3894 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -36,48 +36,48 @@ S'string' p5 sS'x.model' p6 -NsS'model.in1' +NsS'x.graphics' p7 -S'double' -p8 -sS'x.graphics' -p9 g2 sS'mo.inputs' -p10 +p8 S'vector' -p11 +p9 sS'x.graphics.in_implicit' -p12 -g11 +p10 +g9 sS'option_temperature' -p13 -g8 +p11 +S'double' +p12 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'P0' -p17 -g8 +p16 +g12 sS'model.equations' -p18 -g8 +p17 +g12 sS'model.rpar' -p19 +p18 S'matrix' -p20 +p19 sS'T0' +p20 +g12 +sS'model.in' p21 -g8 +g12 sS'graphics.exprs' p22 NsS'typ' p23 -g11 +g9 sS'model.blocktype' p24 g5 @@ -86,26 +86,26 @@ p25 g2 sS'model.dep_ut' p26 -g11 +g9 sS'model.equations.parameters[2-1]' p27 -g15 +g14 sS'exprs' p28 -g20 +g19 sS'gr_i' p29 -g11 +g9 sS'y' p30 -g11 +g9 sS'x' p31 -g8 +g12 sS'model' p32 g2 sS'H0' p33 -g8 +g12 s.
\ No newline at end of file diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index e207fede..2e87d24f 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -16,7 +16,7 @@ function SourceP() { mo.outputs = ["C"]; mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); @@ -42,10 +42,7 @@ function SourceP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index 553aeaec..ec2ddf49 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -40,50 +40,50 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'mo.inputs' -p11 +p10 S'vector' -p12 +p11 sS'option_temperature' -p13 +p12 g8 sS'mo.parameters' -p14 +p13 S'list' -p15 +p14 sS'model.sim' -p16 +p15 g5 sS'P0' -p17 +p16 g8 sS'model.equations' -p18 +p17 g8 sS'mo.outputs' -p19 -g12 +p18 +g11 sS'x.graphics.out_implicit' -p20 -g12 +p19 +g11 sS'model.rpar' -p21 +p20 S'matrix' -p22 +p21 sS'T0' +p22 +g8 +sS'model.in' p23 g8 sS'graphics.exprs' p24 NsS'typ' p25 -g12 +g11 sS'model.blocktype' p26 g5 @@ -92,19 +92,19 @@ p27 g2 sS'model.dep_ut' p28 -g12 +g11 sS'model.equations.parameters[2-1]' p29 -g15 +g14 sS'exprs' p30 -g22 +g21 sS'gr_i' p31 -g12 +g11 sS'y' p32 -g12 +g11 sS'x' p33 g8 diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index d3f2711f..044b38bc 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -2,7 +2,7 @@ function VanneReglante() { VanneReglante.prototype.define = function VanneReglante() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.Cvmax = 8005.42; this.p_rho = 0; @@ -16,7 +16,7 @@ function VanneReglante() { mo.outputs = "C2"; mo.parameters = list([["Cvmax"],["p_rho"]],[[this.Cvmax],[this.p_rho]]); this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); @@ -39,10 +39,7 @@ function VanneReglante() { this.Cvmax = parseFloat(arguments[0]["Cvmax"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index 11c5fb2b..d1fa2534 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -39,44 +39,44 @@ p8 NsS'model.out' p9 g7 -sS'model.in1' -p10 -g7 sS'x.graphics' -p11 +p10 g2 sS'mo.inputs' -p12 +p11 S'vector' -p13 +p12 sS'x.graphics.in_implicit' -p14 +p13 S'matrix' -p15 +p14 sS'mo.parameters' -p16 +p15 S'list' -p17 +p16 sS'model.sim' -p18 +p17 g5 sS'model.equations' -p19 +p18 g7 sS'mo.outputs' -p20 +p19 g5 sS'x.graphics.out_implicit' -p21 -g13 +p20 +g12 sS'model.rpar' +p21 +g14 +sS'model.in' p22 -g15 +g7 sS'graphics.exprs' p23 NsS'typ' p24 -g13 +g12 sS'model.blocktype' p25 g5 @@ -85,22 +85,22 @@ p26 g2 sS'model.dep_ut' p27 -g13 +g12 sS'model.equations.parameters[2-1]' p28 -g17 +g16 sS'exprs' p29 -g15 +g14 sS'gr_i' p30 -g13 +g12 sS'p_rho' p31 g7 sS'y' p32 -g13 +g12 sS'x' p33 g7 diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 0b74931f..0689e2f5 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -3,7 +3,7 @@ function BITCLEAR() { BITCLEAR.prototype.define = function BITCLEAR() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["bit_clear_32"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -31,16 +31,13 @@ function BITCLEAR() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; if (floor(this.bit)!=this.bit) { block_parameter_error(msprintf("Wrong type for \'%s\' parameter: %5.1f.","Index of Bit",this.bit),"Must be integer."); var ok = false; diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index c8ab7e1e..b1c2bf88 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -31,37 +31,37 @@ p4 NsS'x.model' p5 g2 -sS'model.intyp' +sS'model.out' p6 S'double' p7 -sS'model.out' -p8 -g7 sS'out' -p9 +p8 S'vector' -p10 +p9 sS'model.in2' -p11 +p10 g7 -sS'model.in1' -p12 +sS'model.intyp' +p11 g7 sS'x.graphics' -p13 +p12 g2 sS'model.sim' -p14 +p13 S'list' -p15 +p14 sS'model.out2' -p16 +p15 g7 sS'in1' -p17 -g10 +p16 +g9 sS'model.outtyp' +p17 +g7 +sS'model.in' p18 g7 sS'graphics.exprs' @@ -71,10 +71,10 @@ p20 g7 sS'typ' p21 -g10 +g9 sS'model.opar' p22 -g15 +g14 sS'ok' p23 S'boolean' @@ -85,7 +85,7 @@ S'string' p26 sS'model.dep_ut' p27 -g10 +g9 sS'n' p28 g7 @@ -95,10 +95,10 @@ S'matrix' p30 sS'gr_i' p31 -g10 +g9 sS'y' p32 -g10 +g9 sS'x' p33 g7 diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 920214d1..e6b8ea9b 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -3,7 +3,7 @@ function BITSET() { BITSET.prototype.define = function BITSET() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["bit_set_32"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -31,16 +31,13 @@ function BITSET() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; if (floor(this.bit)!=this.bit) { block_parameter_error(msprintf("Wrong type for \'%s\' parameter: %5.1f.","Index of Bit",this.bit),"Must be integer."); var ok = false; diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index c8ab7e1e..b1c2bf88 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -31,37 +31,37 @@ p4 NsS'x.model' p5 g2 -sS'model.intyp' +sS'model.out' p6 S'double' p7 -sS'model.out' -p8 -g7 sS'out' -p9 +p8 S'vector' -p10 +p9 sS'model.in2' -p11 +p10 g7 -sS'model.in1' -p12 +sS'model.intyp' +p11 g7 sS'x.graphics' -p13 +p12 g2 sS'model.sim' -p14 +p13 S'list' -p15 +p14 sS'model.out2' -p16 +p15 g7 sS'in1' -p17 -g10 +p16 +g9 sS'model.outtyp' +p17 +g7 +sS'model.in' p18 g7 sS'graphics.exprs' @@ -71,10 +71,10 @@ p20 g7 sS'typ' p21 -g10 +g9 sS'model.opar' p22 -g15 +g14 sS'ok' p23 S'boolean' @@ -85,7 +85,7 @@ S'string' p26 sS'model.dep_ut' p27 -g10 +g9 sS'n' p28 g7 @@ -95,10 +95,10 @@ S'matrix' p30 sS'gr_i' p31 -g10 +g9 sS'y' p32 -g10 +g9 sS'x' p33 g7 diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 205bf88a..70802f2e 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -4,7 +4,7 @@ function CONVERT() { var sgn = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["convert"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-2]); @@ -35,9 +35,6 @@ function CONVERT() { this.ot = parseFloat(arguments[0]["ot"]) this.np = arguments[0]["np"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.it,this.ot,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),this.exprs); @@ -366,7 +363,7 @@ function CONVERT() { } } } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(out,this.ot),[],[]); diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index aaa410ba..ad446663 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -35,42 +35,42 @@ p5 sS'x.model' p6 g2 -sS'model.intyp' -p7 -g5 sS'sgn' -p8 +p7 g5 sS'model.out' -p9 +p8 g5 sS'out' -p10 +p9 S'vector' -p11 +p10 sS'model.in2' -p12 +p11 g5 -sS'model.in1' -p13 +sS'model.intyp' +p12 g5 sS'x.graphics' -p14 +p13 g2 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'model.out2' -p17 +p16 g5 sS'in1' -p18 -g11 +p17 +g10 sS'model.rpar' -p19 -g11 +p18 +g10 sS'model.outtyp' +p19 +g5 +sS'model.in' p20 g5 sS'graphics.exprs' @@ -80,7 +80,7 @@ p22 g5 sS'typ' p23 -g11 +g10 sS'ok' p24 S'boolean' @@ -91,17 +91,17 @@ S'string' p27 sS'model.dep_ut' p28 -g11 +g10 sS'exprs' p29 S'matrix' p30 sS'gr_i' p31 -g11 +g10 sS'y' p32 -g11 +g10 sS'x' p33 g5 diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index da878654..fa98445a 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -78,7 +78,7 @@ function DFLIPFLOP() { scs_m.objs[44-1] = scicos_link(xx=[[279.98293],[279.98293],[325.53038],[325.53038]],yy=[[372.50232],[315.89455],[315.89455],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -101,7 +101,6 @@ function DFLIPFLOP() { return options; } DFLIPFLOP.prototype.set = function DFLIPFLOP() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle index 37018580..265b19d6 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -71,32 +71,32 @@ g2 sS'scs_m_1.objs[12-1]' p20 g2 -sS'model.in1' +sS'model.intyp' p21 -g14 -sS'scs_m.objs[19-1]' +S'vector' p22 +sS'scs_m.objs[19-1]' +p23 g2 sS'scs_m.objs[23-1]' -p23 +p24 g2 sS'scs_m.objs[18-1]' -p24 +p25 g2 sS'scs_m.objs[25-1]' -p25 +p26 g2 sS'scs_m' -p26 +p27 g2 sS'model.firing' -p27 -S'boolean' p28 -sS'gr_i' +S'boolean' p29 -S'vector' +sS'gr_i' p30 +g22 sS'scs_m_1' p31 g2 @@ -136,36 +136,36 @@ g2 sS'model.out2' p43 g14 -sS'model.intyp' -p44 -g30 sS'model.rpar' -p45 +p44 g2 sS'scs_m.objs[3-1]' -p46 +p45 g2 sS'scs_m_1.objs[4-1]' -p47 +p46 g2 sS'scs_m.objs[16-1]' -p48 +p47 g2 sS'scs_m.objs[11-1]' -p49 +p48 g2 sS'scs_m.objs[14-1]' -p50 +p49 g2 sS'scs_m.objs[17-1]' -p51 +p50 g2 +sS'model.in' +p51 +g14 sS'scs_m_1.objs[5-1]' p52 g2 sS'model.outtyp' p53 -g30 +g22 sS'scs_m_1.objs[7-1]' p54 g2 @@ -177,7 +177,7 @@ p56 g2 sS'typ' p57 -g30 +g22 sS'model' p58 S'object' @@ -208,7 +208,7 @@ p67 g2 sS'model.dep_ut' p68 -g30 +g22 sS'scs_m.objs[43-1]' p69 g2 @@ -233,7 +233,7 @@ p76 g72 sS'y' p77 -g30 +g22 sS'x' p78 g2 diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index e9df7061..82f671af 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -23,7 +23,7 @@ function DLATCH() { scs_m.objs[19-1] = scicos_link(xx=[[305.09603],[325.09603]],yy=[[280.83282],[280.83282]],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -46,7 +46,6 @@ function DLATCH() { return options; } DLATCH.prototype.set = function DLATCH() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle index 214e0a39..9e7002ba 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.pickle @@ -36,58 +36,58 @@ g6 sS'model.in2' p9 g4 -sS'model.in1' +sS'model.intyp' p10 -g4 -sS'scs_m.objs[19-1]' +S'vector' p11 +sS'scs_m.objs[19-1]' +p12 g6 sS'scs_m.objs[18-1]' -p12 +p13 g6 sS'scs_m' -p13 +p14 g6 sS'scs_m.objs[12-1]' -p14 +p15 g6 sS'scs_m.objs[13-1]' -p15 +p16 g6 sS'scs_m.objs[6-1]' -p16 +p17 g6 sS'scs_m.objs[9-1]' -p17 +p18 g6 sS'model.out2' -p18 -g4 -sS'model.intyp' p19 -S'vector' -p20 +g4 sS'model.rpar' -p21 +p20 g6 sS'scs_m.objs[3-1]' -p22 +p21 g6 sS'model.outtyp' -p23 -g20 +p22 +g11 sS'scs_m.objs[16-1]' -p24 +p23 g6 sS'scs_m.objs[11-1]' -p25 +p24 g6 sS'scs_m.objs[14-1]' -p26 +p25 g6 sS'scs_m.objs[17-1]' -p27 +p26 g6 +sS'model.in' +p27 +g4 sS'scs_m.objs[4-1]' p28 g6 @@ -96,7 +96,7 @@ p29 g6 sS'typ' p30 -g20 +g11 sS'model.blocktype' p31 g2 @@ -108,20 +108,20 @@ p33 g6 sS'model.dep_ut' p34 -g20 +g11 sS'scs_m.objs[1-1]' p35 g6 sS'gr_i' p36 -g20 +g11 sS'model.firing' p37 S'boolean' p38 sS'y' p39 -g20 +g11 sS'x' p40 g6 diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 20f3fd8a..0cf1fcea 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -4,7 +4,7 @@ function EXTRACTBITS() { var numb = []; this.model = scicos_model(); this.model.sim = list(new ScilabString(["extract_bit_32_UH0"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -36,10 +36,7 @@ function EXTRACTBITS() { this.bit = parseFloat(arguments[0]["bit"]) this.scal = arguments[0]["scal"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.Datatype,this.rule,this.bit,this.scal,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { @@ -53,7 +50,7 @@ function EXTRACTBITS() { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Treat Bit Field as an Integer",this.scal),msprintf("Must be in the interval %s.","[0, 1]")); var ok = false; } else { - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; this.bit = int(this.bit); this.rule = int(this.rule); if ((this.rule==3)||(this.rule==4)) { diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index e9c13a5f..94754555 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -23,71 +23,71 @@ p10 atp11 Rp12 .(dp0 -S'arg1' +S'numb' p1 -S'object' +S'vector' p2 -sS'graphics' +sS'arg1' p3 -g2 -sS'it' +S'object' p4 -NsS'x.model' +sS'graphics' p5 -g2 -sS'model.intyp' +g4 +sS'it' p6 -S'double' +NsS'x.model' p7 +g4 sS'model.dep_ut' p8 -S'vector' -p9 +g2 sS'model.out' +p9 +S'double' p10 -g7 sS'out' p11 -g9 +g2 sS'model.in2' p12 -g7 -sS'model.in1' +g10 +sS'model.intyp' p13 -g7 +g10 sS'x.graphics' p14 -g2 +g4 sS'model.sim' p15 S'list' p16 sS'model.out2' p17 -g7 +g10 sS'in1' p18 -g9 +g2 sS'model.outtyp' p19 -g7 -sS'numb' +g10 +sS'model.in' p20 -g9 +g10 sS'graphics.exprs' p21 NsS'bit' p22 -g7 +g10 sS'model.ipar' p23 -g9 +g2 sS'typ' p24 -g9 +g2 sS'bitstr' p25 -g7 +g10 sS'ok' p26 S'boolean' @@ -98,23 +98,23 @@ S'string' p29 sS'rule' p30 -g7 +g10 sS'exprs' p31 S'matrix' p32 sS'gr_i' p33 -g9 +g2 sS'y' p34 -g9 +g2 sS'x' p35 -g7 +g10 sS'model' p36 -g2 +g4 sS'ot' p37 Ns.
\ No newline at end of file diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index c0f32924..7e781cf7 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -4,7 +4,7 @@ function INTMUL() { var sgn = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_i32"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out2 = new ScilabDouble([-3]); @@ -33,9 +33,6 @@ function INTMUL() { this.Datatype = arguments[0]["Datatype"] this.np = arguments[0]["np"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.Datatype,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),this.exprs); @@ -99,7 +96,7 @@ function INTMUL() { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",ot),msprintf("Must be in the interval %s.","[3, 8]")); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index 28173e09..b83d7e98 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -33,54 +33,54 @@ p5 sS'x.model' p6 g2 -sS'model.intyp' +sS'sgn' p7 -S'vector' +S'double' p8 -sS'sgn' +sS'model.out' p9 -S'double' +g8 +sS'out' p10 -sS'model.out' +S'vector' p11 -g10 -sS'out' -p12 -g8 sS'model.in2' -p13 +p12 S'matrix' +p13 +sS'model.intyp' p14 -sS'model.in1' -p15 -g14 +g11 sS'x.graphics' -p16 +p15 g2 sS'model.sim' -p17 +p16 S'list' -p18 +p17 sS'model.out2' -p19 -g10 -sS'in1' -p20 +p18 g8 +sS'in1' +p19 +g11 sS'model.rpar' +p20 +g11 +sS'model.outtyp' p21 g8 -sS'model.outtyp' +sS'model.in' p22 -g10 +g13 sS'graphics.exprs' p23 NsS'model.ipar' p24 -g10 +g8 sS'typ' p25 -g8 +g11 sS'ok' p26 S'boolean' @@ -90,19 +90,19 @@ p28 g5 sS'model.dep_ut' p29 -g8 +g11 sS'exprs' p30 -g14 +g13 sS'gr_i' p31 -g8 +g11 sS'y' p32 -g8 +g11 sS'x' p33 -g10 +g8 sS'model' p34 g2 diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index ddd251c0..69417c73 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -34,7 +34,7 @@ function JKFLIPFLOP() { scs_m.objs[22-1] = scicos_link(xx=[[446.2036],[466.2036]],yy=[[179.25363],[179.25363]],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -59,15 +59,12 @@ function JKFLIPFLOP() { JKFLIPFLOP.prototype.set = function JKFLIPFLOP() { this.init = parseFloat(arguments[0]["init"]) this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; @@ -85,7 +82,6 @@ function JKFLIPFLOP() { xx.graphics.exprs[1-1] = this.exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -94,7 +90,6 @@ function JKFLIPFLOP() { newpar[size(newpar)+1-1] = 1; var needcompile = 2; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index f81681e8..cbfae693 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -70,22 +70,22 @@ g7 sS'scs_m' p20 g7 -sS'model.in1' +sS'model.intyp' p21 -g11 -sS'scs_m.objs[19-1]' +S'vector' p22 +sS'scs_m.objs[19-1]' +p23 g7 sS'scs_m.objs[1-1]' -p23 +p24 g7 sS'scs_m.objs[18-1]' -p24 +p25 g7 sS'model.dep_ut' -p25 -S'vector' p26 +g22 sS'newpar[size(newpar)+1-1]' p27 g7 @@ -130,30 +130,30 @@ g7 sS'model.out2' p42 g11 -sS'model.intyp' -p43 -g26 sS'model.rpar' -p44 +p43 g7 sS'scs_m.objs[3-1]' -p45 +p44 g7 sS'scs_m_1.objs[4-1]' -p46 +p45 g7 sS'scs_m.objs[16-1]' -p47 +p46 g7 sS'scs_m.objs[11-1]' -p48 +p47 g7 sS'scs_m.objs[14-1]' -p49 +p48 g7 sS'scs_m.objs[17-1]' -p50 +p49 g7 +sS'model.in' +p50 +g11 sS'scs_m_1.objs[5-1]' p51 g7 @@ -170,7 +170,7 @@ p55 g37 sS'model.outtyp' p56 -g26 +g22 sS'needcompile' p57 g7 @@ -200,7 +200,7 @@ p65 g7 sS'gr_i' p66 -g26 +g22 sS'scs_m.objs[12-1]' p67 g7 diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 7a463e3c..2f0cb139 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -4,7 +4,7 @@ function LOGIC() { this.mat = [[0],[0],[0],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logic"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -34,10 +34,7 @@ function LOGIC() { this.mat = inverse(arguments[0]["mat"]) this.herit = arguments[0]["herit"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.mat,this.herit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),this.exprs); if (!ok) { diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index a7b30e2e..d39f0580 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -32,82 +32,82 @@ S'double' p5 sS'x.model' p6 -NsS'model.intyp' +NsS'model.out' p7 -S'vector' -p8 -sS'model.out' -p9 g5 sS'out' -p10 -g8 +p8 +S'vector' +p9 sS'model.in2' -p11 +p10 S'matrix' +p11 +sS'model.intyp' p12 -sS'model.in1' -p13 -g12 +g9 sS'x.graphics' -p14 +p13 g2 sS'u1' -p15 +p14 g5 sS'model.evtin' -p16 +p15 g5 sS'model.firing' -p17 +p16 S'boolean' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'nin' -p21 +p20 g5 sS'mat' -p22 -g12 +p21 +g11 sS'model.out2' -p23 +p22 g5 sS'in1' -p24 -g8 +p23 +g9 sS'model.outtyp' -p25 +p24 g5 +sS'model.in' +p25 +g11 sS'graphics.exprs' p26 NsS'typ' p27 -g8 +g9 sS'model.opar' p28 -g20 +g19 sS'ok' p29 -g18 +g17 sS'model.blocktype' p30 S'string' p31 sS'model.dep_ut' p32 -g8 +g9 sS'exprs' p33 -g12 +g11 sS'gr_i' p34 -g8 +g9 sS'y' p35 -g8 +g9 sS'x' p36 g5 diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index d80d4c1f..19741f29 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -5,7 +5,7 @@ function SHIFT() { var OPER = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["shift_32_LA"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-2]); @@ -36,9 +36,6 @@ function SHIFT() { this.nb = arguments[0]["nb"] this.np = arguments[0]["np"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.Datatype,this.nb,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 10f24435..076ec6f3 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -46,7 +46,7 @@ g2 sS'model.in2' p11 g2 -sS'model.in1' +sS'model.intyp' p12 g2 sS'x.graphics' @@ -59,14 +59,14 @@ p15 sS'model.out2' p16 g2 -sS'model.intyp' -p17 -g2 sS'model.rpar' -p18 +p17 S'vector' -p19 +p18 sS'model.outtyp' +p19 +g2 +sS'model.in' p20 g2 sS'graphics.exprs' @@ -76,7 +76,7 @@ p22 g9 sS'typ' p23 -g19 +g18 sS'ok' p24 S'boolean' @@ -87,16 +87,16 @@ S'string' p27 sS'model.dep_ut' p28 -g19 +g18 sS'exprs' p29 g9 sS'gr_i' p30 -g19 +g18 sS'y' p31 -g19 +g18 sS'x' p32 g2 diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index fd9a0e51..14eca627 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -18,7 +18,7 @@ function SRFLIPFLOP() { scs_m.objs[14-1] = scicos_link(xx=[[363.03733],[383.03733]],yy=[[248.584],[248.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); @@ -43,15 +43,12 @@ function SRFLIPFLOP() { SRFLIPFLOP.prototype.set = function SRFLIPFLOP() { this.init = parseFloat(arguments[0]["init"]) this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; @@ -69,7 +66,6 @@ function SRFLIPFLOP() { xx.graphics.exprs[1-1] = this.exprs0; this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -78,7 +74,6 @@ function SRFLIPFLOP() { newpar[size(newpar)+1-1] = path; var needcompile = 2; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index 4a6405ff..30a56f4d 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -58,16 +58,16 @@ g13 sS'scs_m' p16 g13 -sS'model.in1' +sS'model.intyp' p17 -g8 -sS'scs_m.objs[1-1]' +S'vector' p18 +sS'scs_m.objs[1-1]' +p19 g13 sS'model.dep_ut' -p19 -S'vector' p20 +g18 sS'newpar[size(newpar)+1-1]' p21 NsS'init' @@ -101,24 +101,24 @@ g13 sS'model.out2' p32 g8 -sS'model.intyp' -p33 -g20 sS'model.rpar' -p34 +p33 g13 sS'scs_m.objs[3-1]' -p35 +p34 g13 sS'model.outtyp' -p36 -g20 +p35 +g18 sS'scs_m.objs[11-1]' -p37 +p36 g13 sS'scs_m.objs[14-1]' -p38 +p37 g13 +sS'model.in' +p38 +g8 sS'path' p39 NsS'scs_m.objs[4-1]' @@ -150,7 +150,7 @@ p48 g13 sS'gr_i' p49 -g20 +g18 sS'model.firing' p50 S'boolean' diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 2305b2bc..e2890f53 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -4,7 +4,7 @@ function BIGSOM_f() { this.sgn = [[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); @@ -25,9 +25,6 @@ function BIGSOM_f() { BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.sgn,this.exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),this.exprs); diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 8b298173..d56a56dd 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -25,32 +25,32 @@ sS'model.sim' p3 S'list' p4 -sS'model.in1' +sS'model.out' p5 -g2 -sS'model.blocktype' +S'double' p6 -S'string' +sS'model.blocktype' p7 -sS'x.graphics' +S'string' p8 -S'object' +sS'x.graphics' p9 -sS'arg1' +S'object' p10 -g9 -sS'graphics.exprs' +sS'arg1' p11 -NsS'in1' +g10 +sS'graphics.exprs' p12 -S'double' +NsS'in1' p13 +g6 sS'model.rpar' p14 g2 sS'exprs' p15 -g7 +g8 sS'x.model' p16 NsS'gr_i' @@ -60,22 +60,22 @@ p18 sS'model.dep_ut' p19 g18 -sS'graphics' +sS'model.in' p20 -g9 -sS'y' +g2 +sS'graphics' p21 +g10 +sS'y' +p22 g18 sS'x' -p22 -g13 -sS'model' p23 -g9 -sS'typ' +g6 +sS'model' p24 -g18 -sS'model.out' +g10 +sS'typ' p25 -g13 +g18 s.
\ No newline at end of file diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index ff8a9769..13a9fb3a 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -21,7 +21,6 @@ function CLINDUMMY_f() { return options; } CLINDUMMY_f.prototype.set = function CLINDUMMY_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 0ae65202..90b97f0c 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -9,7 +9,7 @@ function CLR() { this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); @@ -33,10 +33,7 @@ function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index b567f246..be2d6092 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -43,45 +43,45 @@ g8 sS'x0[ns1-1][1-1]' p10 g8 -sS'model.in1' -p11 -g8 sS'x.graphics' -p12 +p11 g2 sS'ns' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'PREVAR_scicos_context.s' -p18 +p17 g8 sS'nin' -p19 +p18 g8 sS'D' -p20 +p19 g8 sS'H' -p21 +p20 g8 sS'model.rpar' -p22 +p21 g5 sS'mmm' -p23 +p22 S'vector' -p24 +p23 sS'model.state' +p24 +g8 +sS'model.in' p25 g8 sS'graphics.exprs' @@ -91,7 +91,7 @@ p27 g8 sS'typ' p28 -g24 +g23 sS'ok' p29 S'boolean' @@ -102,18 +102,18 @@ S'string' p32 sS'model.dep_ut' p33 -g24 +g23 sS'exprs' p34 g5 sS'gr_i' p35 -g24 +g23 sS'PREVAR_scicos_context' p36 NsS'y' p37 -g24 +g23 sS'x' p38 g8 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index b18af850..c534851c 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -9,7 +9,7 @@ function CLR_f() { this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); @@ -33,10 +33,7 @@ function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index b567f246..be2d6092 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -43,45 +43,45 @@ g8 sS'x0[ns1-1][1-1]' p10 g8 -sS'model.in1' -p11 -g8 sS'x.graphics' -p12 +p11 g2 sS'ns' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'PREVAR_scicos_context.s' -p18 +p17 g8 sS'nin' -p19 +p18 g8 sS'D' -p20 +p19 g8 sS'H' -p21 +p20 g8 sS'model.rpar' -p22 +p21 g5 sS'mmm' -p23 +p22 S'vector' -p24 +p23 sS'model.state' +p24 +g8 +sS'model.in' p25 g8 sS'graphics.exprs' @@ -91,7 +91,7 @@ p27 g8 sS'typ' p28 -g24 +g23 sS'ok' p29 S'boolean' @@ -102,18 +102,18 @@ S'string' p32 sS'model.dep_ut' p33 -g24 +g23 sS'exprs' p34 g5 sS'gr_i' p35 -g24 +g23 sS'PREVAR_scicos_context' p36 NsS'y' p37 -g24 +g23 sS'x' p38 g8 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index c3aa0444..1d4e5cef 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -10,7 +10,7 @@ function CLSS() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); @@ -41,13 +41,10 @@ function CLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 67df1cc8..ed38f3cd 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -46,39 +46,39 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g8 sS'x.graphics' -p11 +p10 g2 sS'A' -p12 +p11 g8 sS'model.sim' -p13 +p12 S'list' -p14 +p13 sS'C' -p15 +p14 g8 sS'B' -p16 +p15 g8 sS'D' -p17 +p16 g8 sS'in1' -p18 +p17 g8 sS'model.rpar' -p19 +p18 g5 sS'mmm' -p20 +p19 S'vector' -p21 +p20 sS'model.state' +p21 +g8 +sS'model.in' p22 g8 sS'graphics.exprs' @@ -89,27 +89,27 @@ p24 g8 sS'typ' p25 -g21 +g20 sS'model.blocktype' p26 S'string' p27 sS'model.dep_ut' p28 -g21 +g20 sS'exprs' p29 g5 sS'gr_i' p30 -g21 +g20 sS'okD' p31 S'boolean' p32 sS'y' p33 -g21 +g20 sS'x' p34 g8 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index f1fd411b..3780d2b7 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -10,7 +10,7 @@ function CLSS_f() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); @@ -41,13 +41,10 @@ function CLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 5888cbdb..b01fd687 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -46,39 +46,39 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g8 sS'x.graphics' -p11 +p10 g2 sS'A' -p12 +p11 g8 sS'model.sim' -p13 +p12 S'list' -p14 +p13 sS'C' -p15 +p14 g8 sS'B' -p16 +p15 g8 sS'D' -p17 +p16 g8 sS'in1' -p18 +p17 g8 sS'model.rpar' -p19 +p18 g5 sS'mmm' -p20 +p19 S'vector' -p21 +p20 sS'model.state' +p21 +g8 +sS'model.in' p22 g8 sS'graphics.exprs' @@ -89,23 +89,23 @@ p24 g8 sS'typ' p25 -g21 +g20 sS'model.blocktype' p26 S'string' p27 sS'model.dep_ut' p28 -g21 +g20 sS'exprs' p29 g5 sS'gr_i' p30 -g21 +g20 sS'y' p31 -g21 +g20 sS'x' p32 g8 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 4aaadbfd..84764dd7 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -7,7 +7,7 @@ function DELAYV_f() { this.T = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["delayv"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([this.nin],[1]); + this.model.in = new ScilabDouble([this.nin],[1]); this.model.out = new ScilabDouble([this.nin]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); @@ -37,11 +37,8 @@ function DELAYV_f() { this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.nin = this.model.in1[1-1]; + this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); var told = z0[$-1]; diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index ab2cd3e7..9230a94e 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -42,41 +42,41 @@ g4 sS'model.out' p9 g2 -sS'model.in1' -p10 -S'matrix' -p11 sS'x.graphics' -p12 +p10 g4 sS'typ' -p13 +p11 g7 sS'model.evtin' -p14 +p12 g2 sS'model.firing' -p15 +p13 g7 sS'told' -p16 +p14 g2 sS'model.sim' -p17 +p15 S'list' -p18 +p16 sS'model.evtout' -p19 -g11 +p17 +S'matrix' +p18 sS'nin' -p20 +p19 g2 sS'model.rpar' -p21 +p20 g2 sS'T' -p22 +p21 g2 +sS'model.in' +p22 +g18 sS'graphics.exprs' p23 NsS'z0' @@ -95,7 +95,7 @@ p29 g7 sS'exprs' p30 -g11 +g18 sS'gr_i' p31 g7 diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index c80050dc..32549d82 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -54,7 +54,7 @@ function DELAY_f() { this.x.graphics.pin = 0; this.x.graphics.pout = 0; this.x.model.sim = "csuper"; - this.x.model.in1 = 1; + this.x.model.in = 1; this.x.model.out = 1; this.x.model.blocktype = "h"; this.x.model.dep_ut = [false,false]; @@ -80,8 +80,6 @@ function DELAY_f() { this.z0 = arguments[0]["z0"] this.exprs = inverse(arguments[0]["exprs"]) var ppath = list(0,0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="REGISTER_f") { ppath[1-1] = i; } @@ -92,7 +90,6 @@ function DELAY_f() { break; } } - this.x = arg1; var newpar = list(); var register = this.x.model.rpar.objs[ppath[1-1]-1]; var evtdly = this.x.model.rpar.objs[ppath[2-1]-1]; diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index ecc140bb..4eebe89b 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -115,44 +115,44 @@ g2 sS'arg1' p37 g2 -sS'x.model.in1' -p38 -g4 sS'evtdly.graphics.sz' -p39 +p38 g15 sS'register.graphics.sz' -p40 +p39 g15 sS'x.graphics.in_style' -p41 +p40 g6 sS'output_port.model.ipar' -p42 +p41 g4 sS'evtdly_exprs' -p43 +p42 NsS'input_port.graphics.sz' -p44 +p43 g15 sS'register.model' -p45 +p44 g2 sS'diagram.objs[2-1]' -p46 +p45 g2 sS'diagram.objs[4-1]' -p47 +p46 g2 sS'diagram.objs[10-1]' -p48 +p47 g4 sS'evtdly.graphics.exprs' -p49 +p48 g8 sS'ok' -p50 +p49 g19 +sS'x.model.in' +p50 +g4 sS'input_port' p51 g2 diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index afac05d0..0f028358 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -3,7 +3,7 @@ function DERIV() { DERIV.prototype.define = function DERIV() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["deriv"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,7 +21,6 @@ function DERIV() { return options; } DERIV.prototype.set = function DERIV() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index 53cb8de0..b0d27eb1 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -19,38 +19,38 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'exprs' p5 -S'string' +S'vector' p6 -sS'exprs' +sS'model.dep_ut' p7 -S'vector' +g6 +sS'model.out' p8 -sS'model.dep_ut' +S'double' p9 -g8 -sS'model.out' -p10 -g4 sS'gr_i' +p10 +g6 +sS'model.in' p11 -g8 +g9 sS'y' p12 -g8 +g6 sS'x' p13 -g4 +g9 sS'model' p14 S'object' p15 sS'typ' p16 -g8 +g6 s.
\ No newline at end of file diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 10147a4d..9ac329a7 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -4,7 +4,7 @@ function DIFF_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["diffblk_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { var ask_again = false; [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),this.exprs); @@ -54,7 +51,7 @@ function DIFF_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 74c91b8e..1fa364cb 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -36,34 +36,34 @@ sS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.model.firing' -p10 +p9 g6 sS'x.graphics' -p11 +p10 g2 sS'model.sim' -p12 +p11 S'list' -p13 +p12 sS'N' -p14 +p13 g8 sS'Nxd' -p15 +p14 g8 sS'model.state' -p16 +p15 S'matrix' +p16 +sS'model.in' p17 +g8 sS'graphics.exprs' p18 NsS'x0' p19 -g17 +g16 sS'typ' p20 g6 @@ -76,7 +76,7 @@ p23 g6 sS'exprs' p24 -g17 +g16 sS'gr_i' p25 g6 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index cc77c067..f2dc4ece 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -9,7 +9,7 @@ function DLR() { this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(x0.slice()); @@ -34,10 +34,7 @@ function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index 486f8c81..bbf917d6 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -44,49 +44,49 @@ p10 sS'x0[ns1-1][1-1]' p11 g10 -sS'model.in1' -p12 -g10 sS'x.model.firing' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g10 sS'ns' -p16 +p15 g10 sS'A' -p17 +p16 g10 sS'model.sim' -p18 +p17 S'list' -p19 +p18 sS'C' -p20 +p19 g10 sS'B' -p21 +p20 g10 sS'D' -p22 +p21 g10 sS'H' -p23 +p22 g10 sS'PREVAR_scicos_context.z' -p24 +p23 g10 sS'model.rpar' -p25 +p24 g7 sS'mmm' -p26 +p25 g2 +sS'model.in' +p26 +g10 sS'graphics.exprs' p27 NsS'x0' diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 6cfe981b..4cb0a9b1 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -9,7 +9,7 @@ function DLR_f() { this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(x0.slice()); @@ -34,10 +34,7 @@ function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 77ebf7e1..e3dc7d2e 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -44,49 +44,49 @@ p10 sS'x0[ns1-1][1-1]' p11 g10 -sS'model.in1' -p12 -g10 sS'x.model.firing' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g10 sS'ns' -p16 +p15 g10 sS'A' -p17 +p16 g10 sS'model.sim' -p18 +p17 S'string' -p19 +p18 sS'C' -p20 +p19 g10 sS'B' -p21 +p20 g10 sS'D' -p22 +p21 g10 sS'H' -p23 +p22 g10 sS'PREVAR_scicos_context.z' -p24 +p23 g10 sS'model.rpar' -p25 +p24 g7 sS'mmm' -p26 +p25 g2 +sS'model.in' +p26 +g10 sS'graphics.exprs' p27 NsS'x0' @@ -101,7 +101,7 @@ S'boolean' p31 sS'model.blocktype' p32 -g19 +g18 sS'model.dep_ut' p33 g2 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index da2bcd88..3a0f5694 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -8,7 +8,7 @@ function DLSS() { this.D = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(this.x0.slice()); @@ -40,13 +40,10 @@ function DLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index eb7fb836..3ec224c7 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -50,40 +50,40 @@ p10 sS'out' p11 g2 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'model.evtin' -p14 +p13 g10 sS'A' -p15 +p14 g10 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'C' -p18 +p17 g10 sS'B' -p19 +p18 g10 sS'D' -p20 +p19 g10 sS'in1' -p21 +p20 g2 sS'model.rpar' -p22 +p21 g7 sS'mmm' -p23 +p22 g2 +sS'model.in' +p23 +g10 sS'graphics.exprs' p24 g10 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 1d9f045e..6d89f7ad 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -8,7 +8,7 @@ function DLSS_f() { this.D = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(this.x0.slice()); @@ -40,13 +40,10 @@ function DLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index d909374f..48238692 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -50,40 +50,40 @@ p10 sS'out' p11 g2 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'model.evtin' -p14 +p13 g10 sS'A' -p15 +p14 g10 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'C' -p18 +p17 g10 sS'B' -p19 +p18 g10 sS'D' -p20 +p19 g10 sS'in1' -p21 +p20 g2 sS'model.rpar' -p22 +p21 g7 sS'mmm' -p23 +p22 g2 +sS'model.in' +p23 +g10 sS'graphics.exprs' p24 g10 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index a67e959d..af9b793c 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -7,7 +7,7 @@ function DOLLAR() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -31,10 +31,7 @@ function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 70bb77cf..711e00ae 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -51,23 +51,23 @@ sS'out' p12 S'vector' p13 -sS'model.in1' -p14 -g4 sS'x.graphics' -p15 +p14 g6 sS'model.evtin' -p16 +p15 g4 sS'exprs[2-1]' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 g2 sS'in1' +p19 +g4 +sS'model.in' p20 g4 sS'graphics.exprs' @@ -84,13 +84,13 @@ S'boolean' p25 sS'model.blocktype' p26 -g18 +g17 sS'model.dep_ut' p27 g13 sS'exprs' p28 -g18 +g17 sS'gr_i' p29 g13 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index ec558ae4..8ebdf0ae 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -7,7 +7,7 @@ function DOLLAR_f() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -31,10 +31,7 @@ function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } @@ -57,7 +54,7 @@ function DOLLAR_f() { if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.a]); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index ab8ea4a7..08fd26e2 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -42,23 +42,23 @@ sS'out' p9 S'vector' p10 -sS'model.in1' -p11 -g2 sS'x.graphics' -p12 +p11 g4 sS'model.evtin' -p13 +p12 g2 sS'exprs[2-1]' -p14 +p13 S'string' -p15 +p14 sS'model.sim' -p16 -g15 +p15 +g14 sS'in1' +p16 +g2 +sS'model.in' p17 g2 sS'graphics.exprs' @@ -68,13 +68,13 @@ p19 g10 sS'model.blocktype' p20 -g15 +g14 sS'model.dep_ut' p21 g10 sS'exprs' p22 -g15 +g14 sS'gr_i' p23 g10 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 2c0c4398..e3926dd6 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -7,7 +7,7 @@ function DOLLAR_m() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -31,10 +31,7 @@ function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 70bb77cf..711e00ae 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -51,23 +51,23 @@ sS'out' p12 S'vector' p13 -sS'model.in1' -p14 -g4 sS'x.graphics' -p15 +p14 g6 sS'model.evtin' -p16 +p15 g4 sS'exprs[2-1]' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 g2 sS'in1' +p19 +g4 +sS'model.in' p20 g4 sS'graphics.exprs' @@ -84,13 +84,13 @@ S'boolean' p25 sS'model.blocktype' p26 -g18 +g17 sS'model.dep_ut' p27 g13 sS'exprs' p28 -g18 +g17 sS'gr_i' p29 g13 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index a74d673f..d5b40e1e 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -8,7 +8,7 @@ function GAINBLK() { var out2 = -2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["gainblk"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.in2 = new ScilabDouble([in2]); this.model.out2 = new ScilabDouble([out2]); @@ -34,10 +34,7 @@ function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],[sci2exp(0)]]; } diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index b7258a6b..605c804c 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -41,26 +41,26 @@ g5 sS'model.in2' p9 g5 -sS'model.in1' -p10 -g5 sS'x.graphics' -p11 +p10 g2 sS'model.sim' -p12 +p11 S'list' -p13 +p12 sS'model.out2' -p14 +p13 g5 sS'in1' -p15 +p14 g5 sS'in2' -p16 +p15 g5 sS'model.rpar' +p16 +g5 +sS'model.in' p17 g5 sS'graphics.exprs' @@ -73,7 +73,7 @@ S'vector' p21 sS'model.opar' p22 -g13 +g12 sS'out2' p23 g5 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index bf0f3b7e..20248e22 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -6,7 +6,7 @@ function GAINBLK_f() { var out = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["gain"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function GAINBLK_f() { GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 9be62223..189e881e 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -58,21 +58,21 @@ g9 sS'gain' p17 g4 -sS'graphics' +sS'model.in' p18 +g4 +sS'graphics' +p19 g7 sS'y' -p19 +p20 g9 sS'x' -p20 +p21 g4 sS'model' -p21 -g7 -sS'model.out' p22 -g4 +g7 sS'typ' p23 g9 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 73dcfdba..0a58b8ee 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -6,7 +6,7 @@ function GAIN_f() { var out = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["gain"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function GAIN_f() { GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index b56e466c..3ad06e12 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -59,21 +59,21 @@ g9 sS'gain' p18 g4 -sS'graphics' +sS'model.in' p19 +g4 +sS'graphics' +p20 g7 sS'y' -p20 +p21 g9 sS'x' -p21 +p22 g4 sS'model' -p22 -g7 -sS'model.out' p23 -g4 +g7 sS'typ' p24 g9 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 7128c3bb..b3adbece 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -7,7 +7,7 @@ function INTEGRAL() { this.model = scicos_model(); this.model.state = new ScilabDouble([0]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -38,10 +38,7 @@ function INTEGRAL() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 2c6a4954..3fa2cfa6 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -25,57 +25,57 @@ p11 atp12 Rp13 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'reinit' +sS'arg1' p3 -S'double' +S'object' p4 -sS'rpar' +sS'reinit' p5 -S'vector' +g2 +sS'rpar' p6 -sS'model.out' +S'vector' p7 -g4 -sS'x.model' +sS'model.out' p8 -NsS'minp' +g2 +sS'x.model' p9 -g4 -sS'graphics' +NsS'minp' p10 g2 -sS'x.graphics' +sS'graphics' p11 -g2 -sS'typ' +g4 +sS'x.graphics' p12 -g6 -sS'maxp' -p13 g4 -sS'model.sim' +sS'typ' +p13 +g7 +sS'maxp' p14 -S'list' +g2 +sS'model.sim' p15 -sS'model.nmode' +S'list' p16 -g4 -sS'model.rpar' +sS'model.nmode' p17 -g6 -sS'model.in1' +g2 +sS'model.rpar' p18 -g4 +g7 sS'satur' p19 -g4 +g2 sS'model.state' p20 -g4 +g2 sS'lowp' p21 S'string' @@ -84,10 +84,10 @@ sS'graphics.exprs' p23 NsS'x0' p24 -g6 +g7 sS'model.nzcross' p25 -g4 +g2 sS'x.graphics.id' p26 g22 @@ -100,20 +100,20 @@ p29 g22 sS'model.dep_ut' p30 -g6 +g7 sS'exprs' p31 g22 sS'gr_i' p32 -g6 +g7 sS'y' p33 -g6 +g7 sS'x' p34 -g4 +g2 sS'model' p35 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 36995956..7b027f9d 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -4,7 +4,7 @@ function INTEGRAL_f() { this.x0 = 0; this.model = scicos_model(); this.model.sim = new ScilabString(["integr"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); @@ -25,10 +25,7 @@ function INTEGRAL_f() { INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 0fd0a5a0..30ddf90c 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -44,18 +44,18 @@ p11 NsS'model.dep_ut' p12 g7 -sS'model.out' -p13 -g4 sS'exprs' -p14 +p13 g4 sS'x.model' -p15 +p14 NsS'gr_i' -p16 +p15 g7 sS'model.state' +p16 +g4 +sS'model.in' p17 g4 sS'graphics' diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 07d5480e..e202045f 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -7,7 +7,7 @@ function INTEGRAL_m() { this.model = scicos_model(); this.model.state = new ScilabDouble([0]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -39,10 +39,7 @@ function INTEGRAL_m() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),this.exprs); if (!ok) { diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 21951779..972d2db9 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -25,82 +25,82 @@ p11 atp12 Rp13 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'reinit' +sS'arg1' p3 -S'double' +S'object' p4 -sS'it' +sS'reinit' p5 -S'matrix' +g2 +sS'it' p6 -sS'rpar' +S'matrix' p7 -S'vector' +sS'rpar' p8 -sS'model.out' +S'vector' p9 -g4 -sS'x.model' +sS'model.out' p10 -NsS'minp' +g2 +sS'x.model' p11 -g4 -sS'out' +NsS'minp' p12 -g4 -sS'model.in2' +g2 +sS'out' p13 -g4 -sS'model.in1' +g2 +sS'model.in2' p14 -g4 +g2 sS'x.graphics' p15 -g2 +g4 sS'typ' p16 -g8 +g9 sS'maxp' p17 -g4 +g2 sS'model.sim' p18 S'list' p19 sS'Datatype' p20 -g4 +g2 sS'model.out2' p21 -g4 +g2 sS'in1' p22 -g8 +g9 sS'model.rpar' p23 -g8 +g9 sS'model.nmode' p24 -g4 +g2 sS'satur' p25 -g4 +g2 sS'model.state' p26 -g4 +g2 sS'lowp' p27 -g4 +g2 sS'graphics' p28 -g2 +g4 sS'model.nzcross' p29 -g4 +g2 sS'ok' p30 S'boolean' @@ -111,25 +111,25 @@ S'string' p33 sS'model.dep_ut' p34 -g8 +g9 sS'exprs' p35 g33 sS'gr_i' p36 -g8 +g9 sS'graphics.exprs' p37 NsS'y' p38 -g8 +g9 sS'x' p39 -g4 +g2 sS'model' p40 -g2 +g4 sS'ot' p41 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 439f4907..bca0affb 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -25,7 +25,7 @@ function PID() { scs_m.objs[21-1] = scicos_link(xx=[[213.97067],[233.97067]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); @@ -56,11 +56,7 @@ function PID() { this.d = arguments[0]["d"] this.exprs0 = arguments[0]["exprs0"] var ppath = list(0,0,0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[this.i-1]; if (typeof(o)=="Link") { - var from = arg1.model.rpar.objs[o.from[1-1]-1]; - var to = arg1.model.rpar.objs[o.to[1-1]-1]; if (from.gui=="GAINBLK") { switch (to.gui) { case "SUMMATION": @@ -86,13 +82,10 @@ function PID() { } } var newpar = list(); - var xx1 = arg1.model.rpar.objs[ppath[1-1]-1]; this.exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; - var xx2 = arg1.model.rpar.objs[ppath[2-1]-1]; this.exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; - var xx3 = arg1.model.rpar.objs[ppath[3-1]-1]; this.exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; @@ -108,9 +101,6 @@ function PID() { xx2.model.rpar = this.i; xx3.graphics.exprs = this.exprs0[3-1]; xx3.model.rpar = this.d; - arg1.model.rpar.objs[ppath[1-1]-1] = xx1; - arg1.model.rpar.objs[ppath[2-1]-1] = xx2; - arg1.model.rpar.objs[ppath[3-1]-1] = xx3; break; } } @@ -121,7 +111,6 @@ function PID() { newpar[size(newpar)+1-1] = ppath[3-1]; var needcompile = 2; } - this.x = arg1; var y = max(y,needcompile); var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index f2b15d1a..392781a3 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -84,7 +84,7 @@ p23 g4 sS'xx3.model.rpar' p24 -NsS'model.in1' +NsS'model.intyp' p25 g4 sS'scs_m.objs[19-1]' @@ -149,27 +149,27 @@ g4 sS'xx2.graphics' p46 g2 -sS'model.intyp' -p47 -g4 sS'i_old' -p48 +p47 NsS'scs_m.objs[3-1]' -p49 +p48 g4 sS'arg1.model.rpar.objs[ppath[3-1]-1]' -p50 +p49 g2 sS'ppath[1-1]' -p51 +p50 g4 sS'exprs[3-1]' -p52 +p51 g4 sS'scs_m.objs[14-1]' -p53 +p52 g4 sS'scs_m.objs[17-1]' +p53 +g4 +sS'model.in' p54 g4 sS'scs_m.objs[4-1]' diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 7d0077d3..92437384 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -4,7 +4,7 @@ function REGISTER() { this.z0 = zeros(10,1); this.model = scicos_model(); this.model.sim = list(new ScilabString(["delay4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); @@ -29,10 +29,7 @@ function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==1) { this.exprs = [[this.exprs],[sci2exp(1)]]; } diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 8dd4c7e1..a1ee7aa7 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -39,25 +39,25 @@ p8 NsS'model.out' p9 g4 -sS'model.in1' -p10 -g4 sS'x.graphics' -p11 +p10 g6 sS'typ' -p12 +p11 S'vector' -p13 +p12 sS'model.evtin' -p14 +p13 g4 sS'model.sim' -p15 +p14 g2 sS'in1' +p15 +g12 +sS'model.in' p16 -g13 +g4 sS'graphics.exprs' p17 S'matrix' @@ -75,16 +75,16 @@ S'string' p23 sS'model.dep_ut' p24 -g13 +g12 sS'exprs' p25 g4 sS'gr_i' p26 -g13 +g12 sS'y' p27 -g13 +g12 sS'x' p28 g4 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 478fe1e2..329bdc09 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -4,7 +4,7 @@ function REGISTER_f() { this.z0 = zeros(10,1); this.model = scicos_model(); this.model.sim = new ScilabString(["delay"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); @@ -26,10 +26,7 @@ function REGISTER_f() { REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.z0,this.exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index 0fb58e59..862af688 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -44,30 +44,30 @@ p11 NsS'model.dstate' p12 g4 -sS'model.blocktype' -p13 -g2 sS'exprs' -p14 +p13 g4 sS'x.model' -p15 +p14 NsS'gr_i' -p16 +p15 S'vector' -p17 +p16 sS'z0' -p18 +p17 g4 sS'model.dep_ut' +p18 +g16 +sS'model.in' p19 -g17 +g4 sS'graphics' p20 g9 sS'y' p21 -g17 +g16 sS'x' p22 g4 @@ -76,8 +76,8 @@ p23 g9 sS'typ' p24 -g17 -sS'model.out' +g16 +sS'model.blocktype' p25 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 3664af57..3332a6a8 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -4,7 +4,7 @@ function SAMPHOLD() { var in1 = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["samphold4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -22,7 +22,6 @@ function SAMPHOLD() { return options; } SAMPHOLD.prototype.set = function SAMPHOLD() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index 32879b77..59f3bcea 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -19,44 +19,44 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'x.model.firing' p5 -S'string' +S'vector' p6 -sS'x.model.firing' +sS'model.evtin' p7 -S'vector' +S'double' p8 -sS'model.evtin' -p9 -g4 sS'in1' -p10 -g4 +p9 +g8 sS'model.dep_ut' +p10 +g6 +sS'model.out' p11 g8 -sS'model.out' -p12 -g4 sS'gr_i' +p12 +g6 +sS'model.in' p13 g8 sS'y' p14 -g8 +g6 sS'x' p15 -g4 +g8 sS'model' p16 S'object' p17 sS'typ' p18 -g8 +g6 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 07015edf..c9b51b93 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -3,7 +3,7 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.define = function SAMPHOLD_m() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["samphold4_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -29,11 +29,8 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.set = function SAMPHOLD_m() { this.it = arguments[0]["it"] this.exprs = arguments[0]["exprs"] - this.x = arg1; this.x.model.firing = []; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.it,this.exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); if (!ok) { @@ -44,16 +41,13 @@ function SAMPHOLD_m() { var ok = false; } if (ok) { - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index 9bae4649..c99a685d 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -57,10 +57,10 @@ g5 sS'in1' p16 g9 -sS'model.in1' +sS'model.outtyp' p17 g5 -sS'model.outtyp' +sS'model.in' p18 g5 sS'graphics.exprs' diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 8489ab24..f44c2f5d 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -4,7 +4,7 @@ function SAMPLEHOLD_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["samphold"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -22,7 +22,6 @@ function SAMPLEHOLD_f() { return options; } SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index 8e96cab8..3ae36d40 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -19,43 +19,43 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'x.model.firing' -p6 +p4 S'vector' -p7 +p5 sS'model.evtin' -p8 -g4 +p6 +S'double' +p7 sS'in1' -p9 -g4 +p8 +g7 sS'model.dep_ut' +p9 +g5 +sS'model.out' p10 g7 -sS'model.out' -p11 -g4 sS'gr_i' +p11 +g5 +sS'model.in' p12 g7 sS'y' p13 -g7 +g5 sS'x' p14 -g4 +g7 sS'model' p15 S'object' p16 sS'typ' p17 -g7 +g5 s.
\ No newline at end of file diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 06f1177f..bbbf8327 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -4,7 +4,7 @@ function SOM_f() { var sgn = [[1],[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); @@ -23,9 +23,6 @@ function SOM_f() { return options; } SOM_f.prototype.set = function SOM_f() { - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 89465842..3ae0ff70 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -19,60 +19,60 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 -sS'model.blocktype' +sS'model.in' p5 -S'string' +S'matrix' p6 sS'exprs' p7 -g4 +g6 sS'arg1' p8 S'object' p9 sS'sgn' p10 -g4 -sS'model.dep_ut' +g6 +sS'model.rpar' p11 -S'vector' +g6 +sS'labs' p12 -sS'model.out' +S'vector' p13 -S'double' +sS'p' p14 -sS'labs' +g4 +sS'gr_i' p15 -g12 -sS'p' +g13 +sS'model.dep_ut' p16 -g14 -sS'gr_i' -p17 -g12 -sS'model.rpar' -p18 -g4 +g13 sS'str' -p19 -g4 +p17 +g6 sS'graphics' -p20 +p18 g9 sS'y' -p21 -g12 +p19 +g13 sS'x' -p22 -g14 +p20 +g4 sS'model' -p23 +p21 g9 sS'typ' +p22 +g13 +sS'model.blocktype' +p23 +S'string' p24 -g12 s.
\ No newline at end of file diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index afad8077..9967727b 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -4,7 +4,7 @@ function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.out2 = new ScilabDouble([-2]); @@ -32,9 +32,6 @@ function SUMMATION() { this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,1)==1) { this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 8539744e..710ffd4f 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -45,28 +45,28 @@ p10 sS'model.in2' p11 g8 -sS'model.in1' -p12 -g8 sS'x.graphics' -p13 +p12 g2 sS'model.sim' -p14 +p13 S'list' -p15 +p14 sS'model.out2' -p16 +p15 g10 sS'in1' -p17 +p16 g10 sS'in2' -p18 +p17 g10 sS'model.rpar' +p18 +NsS'model.in' p19 -NsS'graphics.exprs' +g8 +sS'graphics.exprs' p20 g8 sS'nout2' diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 0c134618..c56ea5a0 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -3,7 +3,7 @@ function SUM_f() { SUM_f.prototype.define = function SUM_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["plusblk"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,7 +21,6 @@ function SUM_f() { return options; } SUM_f.prototype.set = function SUM_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 96074d47..515d7f3c 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -19,9 +19,9 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 sS'model.blocktype' p5 @@ -31,25 +31,25 @@ sS'exprs' p7 S'vector' p8 -sS'model.out' +sS'model.dep_ut' p9 -S'double' -p10 +g8 sS'p' -p11 -g10 +p10 +g4 sS'gr_i' -p12 +p11 g8 -sS'model.dep_ut' +sS'model.in' +p12 +S'matrix' p13 -g8 sS'y' p14 g8 sS'x' p15 -g10 +g4 sS'model' p16 S'object' diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index d65a0170..8bbaca6a 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -11,7 +11,7 @@ function TCLSS() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1],[nx]); + this.model.in = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); @@ -43,10 +43,7 @@ function TCLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index 79765239..23368990 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -46,47 +46,47 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g5 sS'x.graphics' -p11 +p10 g2 sS'nx' -p12 +p11 g8 sS'model.evtin' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'B' -p18 +p17 g8 sS'D' -p19 +p18 g8 sS'in1' -p20 +p19 g8 sS'model.rpar' -p21 +p20 g5 sS'mmm' -p22 +p21 S'vector' -p23 +p22 sS'model.state' -p24 +p23 g8 +sS'model.in' +p24 +g5 sS'graphics.exprs' p25 g8 @@ -95,23 +95,23 @@ p26 g8 sS'typ' p27 -g23 +g22 sS'model.blocktype' p28 S'string' p29 sS'model.dep_ut' p30 -g23 +g22 sS'exprs' p31 g5 sS'gr_i' p32 -g23 +g22 sS'y' p33 -g23 +g22 sS'x' p34 g8 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index c1b6a82f..bc5216cf 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -11,7 +11,7 @@ function TCLSS_f() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1],[nx]); + this.model.in = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); @@ -43,10 +43,7 @@ function TCLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index 79765239..23368990 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -46,47 +46,47 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g5 sS'x.graphics' -p11 +p10 g2 sS'nx' -p12 +p11 g8 sS'model.evtin' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'B' -p18 +p17 g8 sS'D' -p19 +p18 g8 sS'in1' -p20 +p19 g8 sS'model.rpar' -p21 +p20 g5 sS'mmm' -p22 +p21 S'vector' -p23 +p22 sS'model.state' -p24 +p23 g8 +sS'model.in' +p24 +g5 sS'graphics.exprs' p25 g8 @@ -95,23 +95,23 @@ p26 g8 sS'typ' p27 -g23 +g22 sS'model.blocktype' p28 S'string' p29 sS'model.dep_ut' p30 -g23 +g22 sS'exprs' p31 g5 sS'gr_i' p32 -g23 +g22 sS'y' p33 -g23 +g22 sS'x' p34 g8 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 8401943f..f3bc0687 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -7,7 +7,7 @@ function TIME_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["time_delay"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.out = new ScilabDouble([nin]); this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); @@ -34,11 +34,8 @@ function TIME_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - var nin = this.model.in1[1-1]; + var nin = this.model.in[1-1]; while (true) { [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index 50fbebef..abce5a99 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -35,32 +35,32 @@ sS'model.out' p5 S'double' p6 -sS'model.in1' -p7 -S'vector' -p8 sS'x.graphics' -p9 +p7 g2 sS'init' -p10 +p8 g6 sS'model.sim' -p11 +p9 S'list' -p12 +p10 sS'nin' -p13 +p11 g6 sS'model.rpar' -p14 -g8 +p12 +S'vector' +p13 sS'N' -p15 +p14 g6 sS'T' -p16 +p15 g6 +sS'model.in' +p16 +g13 sS'graphics.exprs' p17 NsS'model.ipar' @@ -68,7 +68,7 @@ p18 g6 sS'typ' p19 -g8 +g13 sS'ok' p20 S'boolean' @@ -79,17 +79,17 @@ S'string' p23 sS'model.dep_ut' p24 -g8 +g13 sS'exprs' p25 S'matrix' p26 sS'gr_i' p27 -g8 +g13 sS'y' p28 -g8 +g13 sS'x' p29 g6 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 09352e17..d3032318 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -7,7 +7,7 @@ function VARIABLE_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["variable_delay"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nin],[1]); + this.model.in = new ScilabDouble([nin],[1]); this.model.out = new ScilabDouble([nin]); this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); @@ -34,11 +34,8 @@ function VARIABLE_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - var nin = this.model.in1[1-1]; + var nin = this.model.in[1-1]; while (true) { [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 175985ac..6aad7d01 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -35,33 +35,33 @@ sS'model.out' p5 S'double' p6 -sS'model.in1' -p7 -S'matrix' -p8 sS'x.graphics' -p9 +p7 g2 sS'init' -p10 +p8 g6 sS'model.sim' -p11 +p9 S'list' -p12 +p10 sS'nin' -p13 +p11 g6 sS'model.rpar' -p14 +p12 S'vector' -p15 +p13 sS'N' -p16 +p14 g6 sS'T' -p17 +p15 g6 +sS'model.in' +p16 +S'matrix' +p17 sS'graphics.exprs' p18 NsS'model.ipar' @@ -69,7 +69,7 @@ p19 g6 sS'typ' p20 -g15 +g13 sS'ok' p21 S'boolean' @@ -80,16 +80,16 @@ S'string' p24 sS'model.dep_ut' p25 -g15 +g13 sS'exprs' p26 -g8 +g17 sS'gr_i' p27 -g15 +g13 sS'y' p28 -g15 +g13 sS'x' p29 g6 diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 085f2dd6..4d00c97b 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -5,7 +5,7 @@ function CUMSUM() { var function_name = "cumsum_m"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function CUMSUM() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -85,7 +82,7 @@ function CUMSUM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -96,10 +93,7 @@ function CUMSUM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 8d65b461..8e670128 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 1278000e..7cea4357 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -5,7 +5,7 @@ function EXTRACT() { var function_name = "extract"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -41,10 +41,7 @@ function EXTRACT() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -86,7 +83,7 @@ function EXTRACT() { } } this.model.ipar = new ScilabDouble([this.a],[this.b],[ma],[mb]); - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [ma,mb]; var funtyp = 4; if (ok) { @@ -97,9 +94,6 @@ function EXTRACT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index be86bc15..e7b7e01e 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -36,66 +36,66 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'b' -p28 +p27 g2 sS'model.state' -p29 +p28 g2 +sS'model.in' +p29 +g7 sS'graphics.exprs' p30 NsS'ma' @@ -122,7 +122,7 @@ S'boolean' p38 sS'model.blocktype' p39 -g19 +g18 sS'mb' p40 g7 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 754a7f70..d5df2bef 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -5,7 +5,7 @@ function EXTTRI() { var function_name = "extrilz"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function EXTTRI() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -82,7 +79,7 @@ function EXTTRI() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -93,10 +90,7 @@ function EXTTRI() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 1f0d8fe7..8e670128 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -36,63 +36,63 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' @@ -113,7 +113,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 7a73236f..ada27447 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -5,7 +5,7 @@ function MATBKSL() { var function_name = "mat_bksl"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-2]); @@ -37,10 +37,7 @@ function MATBKSL() { MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATBKSL() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATBKSL() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index 4b73461e..c3f3b3f1 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -31,64 +31,64 @@ g4 sS'it' p6 g2 -sS'model.intyp' -p7 -g2 sS'funtyp' -p8 +p7 S'double' -p9 +p8 sS'model.out' -p10 -g9 +p9 +g8 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 S'matrix' +p12 +sS'model.intyp' p13 -sS'model.in1' -p14 -g13 +g2 sS'label' -p15 +p14 g2 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 -g9 +p23 +g8 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 -g9 +p26 +g8 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' @@ -109,7 +109,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 @@ -121,11 +121,11 @@ p39 g2 sS'x' p40 -g9 +g8 sS'model' p41 g4 sS'ot' p42 -g9 +g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 02be8cf8..f251b068 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -5,7 +5,7 @@ function MATCATH() { var function_name = "mat_cath"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); @@ -37,9 +37,6 @@ function MATCATH() { MATCATH.prototype.set = function MATCATH() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; @@ -62,9 +59,6 @@ function MATCATH() { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index d890df42..2e41f8ac 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -82,15 +82,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g12 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 7325fb09..5dded552 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -7,7 +7,7 @@ function MATCATV() { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in2 = new ScilabDouble([-1],[-1]); - this.model.in1 = new ScilabDouble([-2],[-3]); + this.model.in = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([-1,-1]); this.model.out = new ScilabDouble([0]); this.model.out2 = new ScilabDouble([-1]); @@ -38,9 +38,6 @@ function MATCATV() { MATCATV.prototype.set = function MATCATV() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; @@ -63,9 +60,6 @@ function MATCATV() { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index 6a100159..a2c7e6f7 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -82,15 +82,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g12 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 5393e6ee..72ab2633 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -5,7 +5,7 @@ function MATDET() { var function_name = "mat_det"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -37,10 +37,7 @@ function MATDET() { MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATDET() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATDET() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index e844f514..18f9e923 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -5,7 +5,7 @@ function MATDIAG() { var function_name = "mat_diag"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATDIAG() { MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATDIAG() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATDIAG() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 5639c8ed..30f1f5f6 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -5,7 +5,7 @@ function MATDIV() { var function_name = "mat_div"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-3],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATDIV() { MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATDIV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATDIV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index 4b73461e..c3f3b3f1 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -31,64 +31,64 @@ g4 sS'it' p6 g2 -sS'model.intyp' -p7 -g2 sS'funtyp' -p8 +p7 S'double' -p9 +p8 sS'model.out' -p10 -g9 +p9 +g8 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 S'matrix' +p12 +sS'model.intyp' p13 -sS'model.in1' -p14 -g13 +g2 sS'label' -p15 +p14 g2 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 -g9 +p23 +g8 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 -g9 +p26 +g8 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' @@ -109,7 +109,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 @@ -121,11 +121,11 @@ p39 g2 sS'x' p40 -g9 +g8 sS'model' p41 g4 sS'ot' p42 -g9 +g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 6ab752ec..927932c6 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -5,7 +5,7 @@ function MATEIG() { var function_name = "mat_vps"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function MATEIG() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -94,10 +91,7 @@ function MATEIG() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index 3ab460e6..a2639242 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 1c08ba1b..c4c3ca56 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -5,7 +5,7 @@ function MATEXPM() { var function_name = "mat_expm"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATEXPM() { MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATEXPM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATEXPM() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 1708660f..9e8b7ebd 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -5,7 +5,7 @@ function MATINV() { var function_name = "mat_inv"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATINV() { MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATINV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATINV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 527120df..174fec1b 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -5,7 +5,7 @@ function MATLU() { var function_name = "mat_lu"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1],[-1]); @@ -37,9 +37,6 @@ function MATLU() { MATLU.prototype.set = function MATLU() { this.typ = inverse(arguments[0]["typ"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -62,7 +59,7 @@ function MATLU() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index 16367e49..ba0a2e1f 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -47,7 +47,7 @@ p11 sS'model.in2' p12 g7 -sS'model.in1' +sS'model.intyp' p13 g7 sS'x.graphics' @@ -76,18 +76,18 @@ g2 sS'model.out2' p23 g11 -sS'model.intyp' -p24 -g7 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g2 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 5374bd5f..ae7d4669 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -5,7 +5,7 @@ function MATMAGPHI() { var function_name = "matz_abs"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); @@ -37,9 +37,6 @@ function MATMAGPHI() { MATMAGPHI.prototype.set = function MATMAGPHI() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -75,10 +72,7 @@ function MATMAGPHI() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 52acca8a..f4a3b3e8 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -82,15 +82,15 @@ g10 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g8 sS'model.outtyp' -p27 +p26 g2 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g8 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 1aa8eeac..09afbea5 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -3,7 +3,7 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); @@ -30,7 +30,6 @@ function MATMUL() { this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; this.graphics = this.x.graphics; var label = this.graphics.exprs; this.model = this.x.model; @@ -158,7 +157,6 @@ function MATMUL() { this.graphics.exprs = new ScilabDouble([label]); this.x.graphics = this.graphics; this.x.model = this.model; - var arg1 = this.x; break; } } diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index cc0f48ba..53c54721 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -52,40 +52,40 @@ sS'model.in2' p13 S'matrix' p14 -sS'model.in1' -p15 -g14 sS'x.graphics' -p16 +p15 g2 sS'kmin' -p17 +p16 g10 sS'label' -p18 +p17 g8 sS'np' -p19 +p18 g10 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'label[2-1]' -p22 +p21 g5 sS'model.out2' -p23 +p22 g10 sS'in1' -p24 +p23 g14 sS'model.rpar' -p25 +p24 g14 sS'kmax' -p26 +p25 g10 +sS'model.in' +p26 +g14 sS'graphics' p27 g2 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index df098edd..3a7d53d3 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -5,7 +5,7 @@ function MATPINV() { var function_name = "mat_pinv"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-2]); @@ -37,10 +37,7 @@ function MATPINV() { MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATPINV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATPINV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 3b9cb604..f9546732 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -5,7 +5,7 @@ function MATRESH() { var function_name = "mat_reshape"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -41,9 +41,6 @@ function MATRESH() { this.l1 = arguments[0]["l1"] this.out = arguments[0]["out"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -100,9 +97,6 @@ function MATRESH() { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index 202e6e77..3cfbb362 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -80,18 +80,18 @@ g4 sS'model.out2' p23 g7 -sS'model.in1' -p24 -g7 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index d372a251..e20b6523 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -5,7 +5,7 @@ function MATSING() { var function_name = "mat_sing"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function MATSING() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -97,10 +94,7 @@ function MATSING() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index 3ab460e6..a2639242 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index f6e5631a..b62dfd04 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -5,7 +5,7 @@ function MATSUM() { var function_name = "mat_sum"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -39,9 +39,6 @@ function MATSUM() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -88,7 +85,7 @@ function MATSUM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var funtyp = 4; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); @@ -98,10 +95,7 @@ function MATSUM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 8d65b461..8e670128 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index f66776ed..0ce87a9b 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -3,7 +3,7 @@ function MATTRAN() { MATTRAN.prototype.define = function MATTRAN() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["mattran_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); @@ -27,10 +27,7 @@ function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==1) { label[2-1] = sci2exp(1); } @@ -55,7 +52,7 @@ function MATTRAN() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -66,9 +63,6 @@ function MATTRAN() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index 7ed2495a..170273d4 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -43,32 +43,32 @@ p9 sS'model.in2' p10 g5 -sS'model.in1' -p11 -g5 sS'label' -p12 +p11 g9 sS'function_name' -p13 +p12 S'string' -p14 +p13 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'arg1.graphics' -p17 +p16 g2 sS'label[2-1]' -p18 -g14 +p17 +g13 sS'model.out2' -p19 +p18 g5 sS'in1' -p20 +p19 g9 +sS'model.in' +p20 +g5 sS'graphics.exprs' p21 NsS'typ' diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 9f91eda7..93f29e8d 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -5,7 +5,7 @@ function MATZCONJ() { var function_name = "matz_conj"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1]); @@ -34,7 +34,6 @@ function MATZCONJ() { return options; } MATZCONJ.prototype.set = function MATZCONJ() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle index eee96938..2f73e88e 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.pickle @@ -29,7 +29,7 @@ g4 sS'model.in2' p6 g4 -sS'model.in1' +sS'model.intyp' p7 g4 sS'label' @@ -55,18 +55,18 @@ g2 sS'model.out2' p16 g4 -sS'model.intyp' -p17 -g4 sS'model.rpar' -p18 +p17 g2 sS'model.outtyp' -p19 +p18 g4 sS'model.state' -p20 +p19 g2 +sS'model.in' +p20 +g4 sS'model.ipar' p21 g2 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 0758fecb..cad93e6a 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -5,7 +5,7 @@ function MATZREIM() { var function_name = "matz_reim"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); @@ -37,9 +37,6 @@ function MATZREIM() { MATZREIM.prototype.set = function MATZREIM() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -75,10 +72,7 @@ function MATZREIM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 7ac4c77e..eddc8cd5 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -82,15 +82,15 @@ g10 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g8 sS'model.outtyp' -p27 +p26 g2 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g8 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 50c61ec1..99c33112 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -5,7 +5,7 @@ function RICC() { var function_name = "ricc_m"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.in2 = new ScilabDouble([-1],[-1],[-1]); this.model.intyp = new ScilabDouble([1,1,1]); this.model.out = new ScilabDouble([-1]); @@ -39,10 +39,7 @@ function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,7 +48,7 @@ function RICC() { if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; @@ -63,9 +60,6 @@ function RICC() { if (ok) { this.model.ipar = new ScilabDouble([this.tpe],[this.mod]); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 7e047045..835cb977 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -82,15 +82,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g12 sS'model.outtyp' -p27 +p26 g8 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index de51409f..fa95397e 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -5,7 +5,7 @@ function ROOTCOEF() { var function_name = "root_coef"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-2]); @@ -39,10 +39,7 @@ function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -74,9 +71,6 @@ function ROOTCOEF() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 5138a17a..bac0fcfd 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -34,63 +34,63 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' @@ -111,7 +111,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index db55a22b..b948cf84 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -3,7 +3,7 @@ function SQRT() { SQRT.prototype.define = function SQRT() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["mat_sqrt"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -27,10 +27,7 @@ function SQRT() { SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { @@ -46,7 +43,7 @@ function SQRT() { } var it = this.typ; var ot = this.typ; - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -57,9 +54,6 @@ function SQRT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index bb5d0c7b..a4d1b2a1 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -28,46 +28,46 @@ sS'it' p4 S'vector' p5 -sS'model.intyp' +sS'funtyp' p6 S'double' p7 -sS'funtyp' -p8 -g7 sS'model.out' -p9 +p8 g7 sS'out' -p10 +p9 g5 sS'model.in2' -p11 +p10 g7 -sS'model.in1' -p12 +sS'model.intyp' +p11 g7 sS'label' -p13 +p12 g5 sS'function_name' -p14 +p13 S'string' -p15 +p14 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'arg1.graphics' -p18 +p17 g2 sS'model.out2' -p19 +p18 g7 sS'in1' -p20 +p19 g5 sS'model.outtyp' +p20 +g7 +sS'model.in' p21 g7 sS'graphics.exprs' diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index c114440e..0f4dc30c 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -5,7 +5,7 @@ function SUBMAT() { var function_name = "submat"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -47,10 +47,7 @@ function SUBMAT() { this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); } @@ -103,9 +100,6 @@ function SUBMAT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 61bc9841..2505d213 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -42,74 +42,74 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' p30 -g15 +g14 sS'typ' p31 g2 sS'label[6-1]' p32 -g19 +g18 sS'arg1.model' p33 NsS'ok' @@ -118,7 +118,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 47fd3137..834a9e15 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -13,7 +13,7 @@ function AUTOMAT() { var rpar = [this.X0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["automat"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([2*NX+1],[2*NX+1]); + this.model.in = new ScilabDouble([2*NX+1],[2*NX+1]); this.model.out = new ScilabDouble([2],[2*NX]); this.model.state = new ScilabDouble([ones(2*NX,1)]); this.model.nzcross = new ScilabDouble([1]); @@ -36,10 +36,7 @@ function AUTOMAT() { return options; } AUTOMAT.prototype.set = function AUTOMAT() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var NMode = ipar[1-1]; var NX = ipar[3-1]; diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index f6e87b0c..f93dffcd 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -27,52 +27,52 @@ S'NMode_old' p1 S'double' p2 -sS'arg1' +sS'model.in' p3 -S'object' +S'matrix' p4 -sS'graphics.exprs' +sS'arg1' p5 -NsS'rpar' +S'object' p6 -S'vector' +sS'graphics.exprs' p7 -sS'ModifEncore' +NsS'rpar' p8 -S'boolean' +S'vector' p9 -sS'model.out' +sS'ModifEncore' p10 -S'matrix' +S'boolean' p11 -sS'exprs.slice(NMode_old+6-1,NMode+5)' +sS'model.out' p12 +g4 +sS'exprs.slice(NMode_old+6-1,NMode+5)' +p13 g2 sS'MSG' -p13 -S'string' p14 -sS'XP' +S'string' p15 -g11 -sS'MaxModes' +sS'XP' p16 -g2 -sS'nzcross' +g4 +sS'MaxModes' p17 g2 -sS'model.in1' +sS'nzcross' p18 -g11 +g2 sS'MSG0' p19 -g14 +g15 sS'MSG3' p20 -g14 +g15 sS'MSG2' p21 -g14 +g15 sS'model.nzcross' p22 g2 @@ -81,19 +81,19 @@ p23 g2 sS'graphics.gr_i[1-1][1-1]' p24 -g14 +g15 sS'C2' p25 -g7 +g9 sS'X0' p26 -g7 +g9 sS'model.firing' p27 g2 sS'OUT' p28 -g7 +g9 sS'model.sim' p29 S'list' @@ -103,37 +103,37 @@ p31 g2 sS'model.rpar' p32 -g7 +g9 sS'CX' p33 -g14 +g15 sS'INP[i-1][1-1]' p34 g2 sS'VEC' p35 -g14 +g15 sS'GTV' p36 -g14 +g15 sS'graphics' p37 -g4 +g6 sS'model.state' p38 g2 sS'exprs.slice(NMode+6-1,NMode_old+5)' p39 -g7 +g9 sS'model.ipar' p40 -g11 +g4 sS'typ' p41 -g7 +g9 sS'C1' p42 -g7 +g9 sS'NMode' p43 g2 @@ -142,37 +142,37 @@ p44 g2 sS'model.blocktype' p45 -g14 +g15 sS'x.graphics' p46 -g4 +g6 sS'INP' p47 g2 sS'x.model' p48 -g4 +g6 sS'model.dep_ut' p49 -g7 +g9 sS'exprs' p50 -g11 +g4 sS'gr_i' p51 -g7 +g9 sS'ipar' p52 -g11 +g4 sS'y' p53 -g7 +g9 sS'x' p54 g2 sS'model' p55 -g4 +g6 sS'Minitial' p56 g2 diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 7a97b2bd..b80aa2a1 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -4,7 +4,7 @@ function BACKLASH() { this.exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); @@ -30,10 +30,7 @@ function BACKLASH() { this.gap = arguments[0]["gap"] this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; while (true) { [ok,this.ini,this.gap,this.zcr,this.exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle index 045121b8..e07d65e3 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -25,7 +25,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -64,26 +64,26 @@ p18 sS'model.dep_ut' p19 g18 -sS'graphics' +sS'model.in' p20 +g4 +sS'graphics' +p21 g8 sS'y' -p21 +p22 g18 sS'x' -p22 +p23 g4 sS'model' -p23 +p24 g8 sS'rpar[1-1]' -p24 -NsS'typ' p25 +NsS'typ' +p26 g18 sS'rpar[2-1]' -p26 -NsS'model.out' p27 -g4 -s.
\ No newline at end of file +Ns.
\ No newline at end of file diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 2436898c..5b1111ec 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -25,7 +25,7 @@ function BOUNCE() { var state = transpose(state); this.model = scicos_model(); this.model.sim = list(new ScilabString(["bounce_ball"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([n],[n]); this.model.state = new ScilabDouble(state.slice()); this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); @@ -66,10 +66,7 @@ function BOUNCE() { this.g = parseFloat(arguments[0]["g"]) this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<9) { this.exprs[8-1] = "9.81"; this.exprs[9-1] = "0"; diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index d1e22a27..62455ca7 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -33,38 +33,38 @@ p15 atp16 Rp17 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'vector' p2 -sS'graphics.exprs' +sS'arg1' p3 -NsS'xd' +S'object' p4 -S'matrix' +sS'graphics.exprs' p5 -sS'x.model' +NsS'xd' p6 -NsS'model.out' +S'matrix' p7 -g5 -sS'xt' +sS'x.model' p8 -S'vector' +NsS'model.out' p9 -sS'model.in1' +g7 +sS'xt' p10 -g9 +g2 sS'x.graphics' p11 -g2 +g4 sS'model.nzcross' p12 S'double' p13 sS'state' p14 -g9 +g2 sS'exprs[9-1]' p15 S'string' @@ -78,13 +78,13 @@ p19 g13 sS'yd' p20 -g5 +g7 sS'model.rpar' p21 -g5 +g7 sS'walls' p22 -g5 +g7 sS'rpar1' p23 g13 @@ -93,13 +93,13 @@ p24 g13 sS'graphics' p25 -g2 +g4 sS'model.ipar' p26 -g9 +g2 sS'typ' p27 -g9 +g2 sS'exprs[8-1]' p28 g16 @@ -118,31 +118,31 @@ p33 g13 sS'model.dep_ut' p34 -g9 +g2 sS'n' p35 g13 sS'exprs' p36 -g5 +g7 sS'gr_i' p37 -g9 +g2 sS'ipar' p38 -g9 +g2 sS'y' p39 -g5 +g7 sS'x' p40 g13 sS'model' p41 -g2 +g4 sS'ipar[k-1]' p42 NsS'model.state' p43 -g9 +g2 s.
\ No newline at end of file diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 3039d82b..3218aa73 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -11,7 +11,7 @@ function BOUNCEXY() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bouncexy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -61,10 +61,7 @@ function BOUNCEXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle index 51806beb..d0b7c403 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -69,7 +69,7 @@ g4 sS'model.in2' p16 g2 -sS'model.in1' +sS'model.intyp' p17 g2 sS'z[6*(i-1)+2-1]' @@ -106,10 +106,10 @@ g2 sS'imode' p29 g4 -sS'model.intyp' +sS'model.rpar' p30 g2 -sS'model.rpar' +sS'model.in' p31 g2 sS'graphics' diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 59014bfa..fc8529a9 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -10,7 +10,7 @@ function BPLATFORM() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bplatform2"]), new ScilabDouble([5])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); @@ -45,10 +45,7 @@ function BPLATFORM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle index af17dc6e..31705ba2 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -55,32 +55,32 @@ g2 sS'ymin' p11 g2 -sS'model.in1' -p12 -g8 sS'ymax' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g2 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'phi' -p18 +p17 g2 sS'mess' -p19 +p18 g8 sS'csiz' -p20 +p19 g2 sS'model.rpar' +p20 +g8 +sS'model.in' p21 g8 sS'graphics.exprs' diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 9e443562..34958153 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -15,7 +15,7 @@ function CBLOCK() { this.ng = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -70,9 +70,6 @@ function CBLOCK() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.i,this.o,this.ci,this.co,this.xx,this.ng,this.z,this.rpar,this.ipar,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block2 block parameters",["simulation function","is block implicit? (y,n)","input ports sizes","output ports sizes","input event ports sizes","output events ports sizes","initial continuous state","number of zero crossing surfaces","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label[1-1]); @@ -141,7 +138,7 @@ function CBLOCK() { var ok = tmpvar1[2]; if (ok) { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([this.i]); + this.model.in = new ScilabDouble([this.i]); this.model.out = new ScilabDouble([this.o]); this.model.evtin = new ScilabDouble([this.ci]); this.model.evtout = new ScilabDouble([this.co]); diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index af698327..aeb5ed82 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -87,70 +87,70 @@ g2 sS'out' p17 g2 -sS'model.in1' -p18 -g2 sS'nevin' -p19 +p18 g2 sS'clkin' -p20 +p19 g8 sS'x.graphics' -p21 +p20 g5 sS'model.nzcross' -p22 +p21 g2 sS'tt' -p23 +p22 g2 sS'label' -p24 +p23 S'list' -p25 +p24 sS'nx' -p26 +p25 g2 sS'nz' -p27 +p26 g2 sS'z0' -p28 +p27 g8 sS'model.evtin' -p29 +p28 g8 sS'model.firing' -p30 +p29 g8 sS'nevout' -p31 +p30 g2 sS'model.sim' -p32 -g25 +p31 +g24 sS'model.evtout' -p33 +p32 g8 sS'clkout' -p34 +p33 g8 sS'auto' -p35 +p34 g8 sS'label[2-1]' -p36 +p35 g2 sS'in1' -p37 +p36 g2 sS'model.rpar' -p38 +p37 g8 sS'model.state' -p39 +p38 g8 +sS'model.in' +p39 +g2 sS'graphics' p40 g5 diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 9596ae7c..ff7cd776 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -4,14 +4,14 @@ function CBLOCK4() { var funam = "toto"; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); + var label = list([[funam],["n"],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -64,9 +64,6 @@ function CBLOCK4() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.in1,this.it,this.out,this.ot,this.ci,this.co,this.xx,this.z,this.oz,this.rpar,this.ipar,this.opar,this.nmode,this.nzcr,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block4 block parameters",["Simulation function","Is block implicit? (y,n)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label[1-1]); diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index aefd22d2..4d3566f0 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -80,71 +80,71 @@ g3 sS'xx' p11 g9 -sS'model.intyp' -p12 -g3 sS'funtyp' -p13 +p12 g3 sS'funam' -p14 +p13 S'string' -p15 +p14 sS'model.dstate' -p16 +p15 g9 sS'model.in2' -p17 +p16 g3 -sS'model.in1' -p18 +sS'model.intyp' +p17 g3 sS'nevin' -p19 +p18 g3 sS'x.graphics' -p20 +p19 g6 sS'model.nzcross' -p21 +p20 NsS'tt' -p22 +p21 g3 sS'label' -p23 +p22 S'list' -p24 +p23 sS'nx' -p25 +p24 g3 sS'nz' -p26 +p25 g3 sS'model.firing' -p27 +p26 NsS'nevout' -p28 +p27 g3 sS'model.sim' -p29 -g24 +p28 +g23 sS'label[2-1]' -p30 +p29 g3 sS'model.out2' -p31 +p30 g3 sS'model.nmode' -p32 +p31 NsS'model.rpar' -p33 +p32 g9 sS'model.outtyp' -p34 +p33 g3 sS'model.state' -p35 +p34 g9 +sS'model.in' +p35 +g3 sS'graphics' p36 g6 diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 71667091..7812d35e 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -6,7 +6,7 @@ function CONSTRAINT2_c() { this.id = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.ipar = new ScilabDouble(this.id); @@ -33,10 +33,7 @@ function CONSTRAINT2_c() { this.xd0 = inverse(arguments[0]["xd0"]) this.id = inverse(arguments[0]["id"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { var ask_again = false; [ok,this.x0,this.xd0,this.id,this.exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); @@ -73,7 +70,7 @@ function CONSTRAINT2_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.model.ipar = new ScilabDouble(this.id); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index 44576d32..ab82e036 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -41,29 +41,29 @@ p8 sS'id' p9 g6 -sS'model.in1' -p10 -S'double' -p11 sS'x.graphics' -p12 +p10 g2 sS'Nid' -p13 -g11 +p11 +S'double' +p12 sS'model.sim' -p14 +p13 S'list' -p15 +p14 sS'N' -p16 -g11 +p15 +g12 sS'Nxd' -p17 -g11 +p16 +g12 sS'model.state' -p18 +p17 g8 +sS'model.in' +p18 +g12 sS'graphics.exprs' p19 NsS'x0' @@ -84,13 +84,13 @@ p25 g6 sS'exprs' p26 -g15 +g14 sS'gr_i' p27 g6 sS'id[i-1]' p28 -g11 +g12 sS'ask_again' p29 S'boolean' @@ -100,7 +100,7 @@ p31 g6 sS'x' p32 -g11 +g12 sS'model' p33 g2 diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 3340e545..895c1f8b 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -4,7 +4,7 @@ function CONSTRAINT_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); @@ -26,10 +26,7 @@ function CONSTRAINT_c() { CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { this.x0 = inverse(arguments[0]["x0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),this.exprs); if (!ok) { @@ -48,7 +45,7 @@ function CONSTRAINT_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.model.ipar = new ScilabDouble([-1*ones(N,1)]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 40a25edd..081ea36e 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -38,34 +38,34 @@ p9 g8 sS'graphics.exprs' p10 -NsS'model.in1' +NsS'model.dep_ut' p11 -g4 -sS'model.dep_ut' -p12 S'vector' -p13 +p12 sS'N' -p14 +p13 g4 sS'exprs' -p15 +p14 g6 sS'x.model' -p16 +p15 NsS'gr_i' -p17 -g13 +p16 +g12 sS'model.state' -p18 +p17 S'matrix' +p18 +sS'model.in' p19 +g4 sS'graphics' p20 g8 sS'y' p21 -g13 +g12 sS'x' p22 g4 @@ -77,8 +77,8 @@ p24 g4 sS'typ' p25 -g13 +g12 sS'x0' p26 -g19 +g18 s.
\ No newline at end of file diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 7feab424..82f8cb60 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -6,7 +6,7 @@ function DEADBAND() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["deadband"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -34,10 +34,7 @@ function DEADBAND() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle index 5bc0ae5c..64da890e 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.pickle @@ -32,38 +32,38 @@ sS'rpar' p4 S'matrix' p5 -sS'model.out' +sS'minp' p6 S'double' p7 sS'x.model' p8 -NsS'minp' +NsS'model.out' p9 g7 -sS'model.in1' -p10 -g7 sS'x.graphics' -p11 +p10 g2 sS'typ' -p12 +p11 S'vector' -p13 +p12 sS'maxp' -p14 +p13 g7 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'model.nmode' -p17 +p16 g7 sS'model.rpar' -p18 +p17 g5 +sS'model.in' +p18 +g7 sS'graphics.exprs' p19 NsS'model.nzcross' @@ -75,16 +75,16 @@ S'string' p22 sS'model.dep_ut' p23 -g13 +g12 sS'exprs' p24 g5 sS'gr_i' p25 -g13 +g12 sS'y' p26 -g13 +g12 sS'x' p27 g7 diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 6312c951..ac82e092 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -18,8 +18,6 @@ function DEBUG() { return options; } DEBUG.prototype.set = function DEBUG() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var textmp = this.exprs[2-1]; var ok = true; diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js index 8400a7cd..d30188c8 100644 --- a/js/Misc/DEBUG_SCICOS.js +++ b/js/Misc/DEBUG_SCICOS.js @@ -13,8 +13,6 @@ function DEBUG_SCICOS() { return options; } DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { - arg1.gui = "DEBUG"; - var tmpvar0 = DEBUG("set",arg1); this.x = tmpvar0[0]; var y = tmpvar0[1]; var typ = tmpvar0[2]; diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 07b59247..cd928692 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -4,7 +4,7 @@ function DIFF_f() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["diffblk"]), new ScilabDouble([10001])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function DIFF_f() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = arguments[0]["xd0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle index a0e81b2c..726d3c27 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.pickle @@ -23,7 +23,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -47,21 +47,21 @@ p12 NsS'model.dep_ut' p13 g8 -sS'model.out' -p14 -g4 sS'exprs' -p15 +p14 S'matrix' -p16 +p15 sS'x.model' -p17 +p16 NsS'gr_i' -p18 +p17 g8 sS'model.state' +p18 +g15 +sS'model.in' p19 -g16 +g4 sS'graphics' p20 g10 @@ -79,5 +79,5 @@ p24 g8 sS'x0' p25 -g16 +g15 s.
\ No newline at end of file diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 3773cf7a..cb3364e8 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -14,10 +14,7 @@ function DSUPER() { DSUPER.prototype.set = function DSUPER() { var y = this.needcompile; var typ = list(); - this.graphics = arg1.graphics; if ((length(this.graphics.exprs)==0)) { - warnBlockByUID(arg1.model.label,"Invalid masked block."); - this.x = arg1; return; } this.exprs = this.graphics.exprs[1-1]; @@ -25,15 +22,12 @@ function DSUPER() { var btitre = this.graphics.exprs[2-1][2-1][1-1]; var bitems = this.graphics.exprs[2-1][2-1].slice(2-1,$); if (exprs0==[]) { - this.x = arg1; return; } - var context = [arg1.model.rpar.props.context]; var tmpvar0 = script2var(context,PREVAR_scicos_context); var PREVAR_scicos_context = tmpvar0[0]; var ierr = tmpvar0[1]; if (ierr!=0) { - this.x = arg1; return; } var tt = "scicos_context."+exprs0[1-1]; @@ -44,7 +38,6 @@ function DSUPER() { var scicos_context = PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); if (this.ok) { - this.x = arg1; var PREVAR_scicos_context = scicos_context; var sblock = this.x.model.rpar; var tmpvar1 = do_eval(sblock,list(),scicos_context); @@ -56,7 +49,6 @@ function DSUPER() { this.x.graphics.exprs[1-1] = this.exprs; this.x.model.rpar = sblock; } else { - this.x = arg1; } return new BasicBlock(this.x); } diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 6c27dd25..dca05409 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -4,7 +4,7 @@ function EDGETRIGGER() { this.edge = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["edgetrig"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([1]); @@ -28,10 +28,7 @@ function EDGETRIGGER() { EDGETRIGGER.prototype.set = function EDGETRIGGER() { this.edge = parseFloat(arguments[0]["edge"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.edge,this.exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index a3f569ae..6d5d505a 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -41,33 +41,33 @@ p10 g9 sS'graphics.exprs' p11 -NsS'model.out' +NsS'model.dep_ut' p12 -g4 -sS'gr_i' -p13 S'vector' +p13 +sS'gr_i' p14 +g13 sS'model.nzcross' p15 g4 sS'exprs' p16 -g14 +g13 sS'x.model' p17 NsS'edge' p18 g4 -sS'model.dep_ut' +sS'model.in' p19 -g14 +g4 sS'graphics' p20 g9 sS'y' p21 -g14 +g13 sS'x' p22 g4 @@ -79,5 +79,5 @@ p24 g4 sS'typ' p25 -g14 +g13 s.
\ No newline at end of file diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 1288a52d..c97300b6 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -74,7 +74,7 @@ function EDGE_TRIGGER() { lnk={}; this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); @@ -90,8 +90,6 @@ function EDGE_TRIGGER() { return options; } EDGE_TRIGGER.prototype.set = function EDGE_TRIGGER() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EDGETRIGGER") { var ppath = list(i); break; @@ -108,20 +106,19 @@ function EDGE_TRIGGER() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -150,12 +147,10 @@ function EDGE_TRIGGER() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle index 66a780dd..69db91d2 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -57,77 +57,77 @@ g10 sS'graphics.orig' p17 g2 -sS'model.in1' -p18 -g6 sS'model.ipar' -p19 +p18 g6 sS'model.nzcross' -p20 +p19 g6 sS'blk' -p21 +p20 g10 sS'newpar[size(newpar)+1-1]' -p22 +p21 NsS'scs_m_1' -p23 +p22 g10 sS'eqn' -p24 +p23 g10 sS'np' -p25 +p24 g6 sS'blk.model' -p26 +p25 NsS'graphics.pein' -p27 +p26 g6 sS'lnk.from' -p28 +p27 g2 sS'scs_m_1.objs[2-1]' -p29 +p28 g10 sS'model.sim' -p30 +p29 S'string' -p31 +p30 sS'model.evtout' -p32 +p31 g6 sS'spath' -p33 +p32 g8 sS'newpar' -p34 +p33 g8 sS'model.evtin' -p35 +p34 g2 sS'graphics.pout' -p36 +p35 g6 sS'model.nmode' -p37 +p36 g6 sS'model_n' -p38 +p37 g10 sS'arg1[spath-1]' -p39 +p38 g10 sS'scs_m_1.objs[4-1]' -p40 +p39 g10 sS'graphics.pin' -p41 +p40 g6 sS'model.rpar' -p42 +p41 g10 +sS'model.in' +p42 +g6 sS'scs_m_1.objs[5-1]' p43 g6 diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 21116c3a..5f1739ea 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -18,8 +18,6 @@ function ENDBLK() { return options; } ENDBLK.prototype.set = function ENDBLK() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="END_c") { var ppath = list(i); break; @@ -36,20 +34,19 @@ function ENDBLK() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (!isequalbitwise(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -78,12 +75,10 @@ function ENDBLK() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index 9ecf333f..a10233a3 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -57,38 +57,38 @@ g10 sS'out' p13 g10 -sS'model.in1' -p14 -S'matrix' -p15 sS'x.graphics' -p16 +p14 g2 sS'%mm' -p17 +p15 g10 sS'typ' -p18 +p16 g7 sS'%head' -p19 +p17 g5 sS'%ok1' -p20 +p18 S'boolean' -p21 +p19 sS'model.sim' -p22 +p20 S'list' -p23 +p21 sS'in1' -p24 -g15 +p22 +S'matrix' +p23 sS'model.rpar' -p25 +p24 NsS'model.nmode' +p25 +NsS'model.in' p26 -NsS'graphics.exprs' +g23 +sS'graphics.exprs' p27 NsS'model.ipar' p28 @@ -99,13 +99,13 @@ p30 g7 sS'ok' p31 -g21 +g19 sS'model.dep_ut' p32 g7 sS'exprs' p33 -g15 +g23 sS'gr_i' p34 g7 diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index c832f96f..845c47ca 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -79,7 +79,7 @@ function Extract_Activation() { lnk={}; this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); @@ -95,7 +95,6 @@ function Extract_Activation() { return options; } Extract_Activation.prototype.set = function Extract_Activation() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle index ec0f50df..c30f31f0 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.pickle @@ -38,55 +38,55 @@ g4 sS'graphics.orig' p10 g2 -sS'model.in1' -p11 -g4 sS'typ' -p12 +p11 g2 sS'blk' -p13 +p12 g8 sS'model.evtin' -p14 +p13 g2 sS'blk.model' -p15 +p14 NsS'graphics.pein' -p16 +p15 g4 sS'lnk.from' -p17 +p16 g2 sS'scs_m_1.objs[2-1]' -p18 +p17 g8 sS'model.sim' -p19 +p18 S'string' -p20 +p19 sS'model.evtout' -p21 +p20 g4 sS'scs_m_1.objs[8-1]' -p22 +p21 g4 sS'scs_m_1' -p23 +p22 g8 sS'model.nmode' -p24 +p23 g4 sS'model.rpar' -p25 +p24 g8 sS'graphics.sz' -p26 +p25 g2 sS'y' -p27 +p26 g2 sS'graphics.pin' +p27 +g4 +sS'model.in' p28 g4 sS'graphics.exprs' diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index a4ef4c44..241ed150 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -7,7 +7,7 @@ function HYSTHERESIS() { var rpar = [[1],[0],[1],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["hystheresis"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.nzcross = new ScilabDouble([this.nzz]); @@ -39,10 +39,7 @@ function HYSTHERESIS() { this.out_low = arguments[0]["out_low"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle index 22118741..d7daefca 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -42,27 +42,27 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'typ' -p11 +p10 S'vector' -p12 +p11 sS'model.sim' -p13 +p12 S'list' +p13 +sS'in1' p14 -sS'model.nmode' -p15 g8 sS'model.rpar' -p16 +p15 g5 -sS'in1' +sS'model.nmode' +p16 +g8 +sS'model.in' p17 g8 sS'graphics.exprs' @@ -79,19 +79,19 @@ p22 g8 sS'model.dep_ut' p23 -g12 +g11 sS'exprs' p24 g5 sS'gr_i' p25 -g12 +g11 sS'ipar' p26 -g12 +g11 sS'y' p27 -g12 +g11 sS'x' p28 g8 diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index 6abfab60..da3bf6ed 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -8,7 +8,7 @@ function IMPSPLIT_f() { mo.inputs = "n"; mo.outputs = [["n"],["n"]]; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.x = standard_define([1,1]/3,this.model,[],[]); this.x.graphics.in_implicit = ["I"]; @@ -24,7 +24,6 @@ function IMPSPLIT_f() { return options; } IMPSPLIT_f.prototype.set = function IMPSPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle index c3f3ee9a..99827fe0 100644 --- a/js/Misc/IMPSPLIT_f.pickle +++ b/js/Misc/IMPSPLIT_f.pickle @@ -19,45 +19,45 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'x.graphics.out_implicit' -p6 +p5 S'vector' -p7 +p6 sS'mo' -p8 +p7 S'object' -p9 +p8 sS'mo.inputs' -p10 +p9 g2 sS'mo.model' -p11 +p10 g2 sS'model.out' -p12 +p11 g4 sS'x.graphics.in_implicit' +p12 +g6 +sS'model.in' p13 -g7 +g4 sS'y' p14 -g7 +g6 sS'x' p15 g4 sS'model' p16 -g9 +g8 sS'typ' p17 -g7 +g6 sS'mo.outputs' p18 S'matrix' diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 4910a7b4..b7d0569c 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -6,7 +6,7 @@ function LOGICAL_OP() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -34,10 +34,7 @@ function LOGICAL_OP() { this.Datatype = arguments[0]["Datatype"] this.tp = parseFloat(arguments[0]["tp"]) this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==2) { this.exprs = [[this.exprs],[sci2exp(1)],[sci2exp(0)]]; } diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 59b44b2a..27047612 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -50,32 +50,32 @@ g8 sS'graphics.style' p12 g8 -sS'model.in1' -p13 -S'matrix' -p14 sS'x.graphics' -p15 +p13 g2 sS'tp' -p16 +p14 g10 sS'label' -p17 +p15 g5 sS'model.sim' -p18 +p16 S'list' -p19 +p17 sS'nin' -p20 +p18 g10 sS'in1' +p19 +S'matrix' +p20 +sS'model.in' p21 -g14 +g20 sS'graphics.exprs' p22 -g14 +g20 sS'model.ipar' p23 g8 @@ -94,7 +94,7 @@ p28 g10 sS'exprs' p29 -g14 +g20 sS'gr_i' p30 g8 diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index e1ee5947..0dadcc51 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -23,7 +23,7 @@ function MBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([30004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); @@ -56,9 +56,6 @@ function MBLOCK() { this.pprop = inverse(arguments[0]["pprop"]) this.Tfunam = arguments[0]["Tfunam"] this.lab_1 = arguments[0]["lab_1"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -69,7 +66,7 @@ function MBLOCK() { } this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - this.lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + this.lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { [ok,this.Tin,this.Tintype,this.Tout,this.Touttype,this.Tparam,this.pprop,this.Tfunam,this.lab_1] = scicos_getvalue("Set Modelica generic block parameters",["Input variables: ","Input variables types: ","Output variables: ","Output variables types:","Parameters in Modelica:","Parameters properties: ","Function name: "],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),this.lab_1); @@ -268,7 +265,7 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = this.lab_1[1-1]; + this.exprs.in = this.lab_1[1-1]; this.exprs.intype = this.lab_1[2-1]; this.exprs.out = this.lab_1[3-1]; this.exprs.outtype = this.lab_1[4-1]; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index cb0d67a2..6054d6b8 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -47,147 +47,147 @@ S'rhs_txt' p1 S'string' p2 -sS'model.sim' -p3 -S'list' -p4 sS'arg1' -p5 +p3 S'object' -p6 +p4 sS'graphics.gr_i[1-1][1-1]' -p7 +p5 g2 sS'graphics.exprs' -p8 -g6 +p6 +g4 sS'outtypex' -p9 +p7 S'double' -p10 +p8 sS'mo.model' -p11 +p9 g2 sS'ierr' -p12 -g10 +p10 +g8 sS'exprs.paramv[i-1]' -p13 -g10 +p11 +g8 sS'lab_2_tmp' +p12 +S'list' +p13 +sS'x.model' p14 g4 -sS'x.model' -p15 -g6 sS'exprs.outtype' -p16 -g10 +p15 +g8 sS'exprs.intype' -p17 -g10 +p16 +g8 sS'exprs.nameF' +p17 +g8 +sS'exprs.in' p18 -g10 -sS'exprs.funtxt' -p19 -S'vector' -p20 +g8 sS'graphics.out_implicit' -p21 +p19 NsS'out' -p22 +p20 S'matrix' -p23 +p21 sS'nameF' -p24 +p22 g2 sS'lab_2_tmp[i-1]' -p25 -g10 +p23 +g8 sS'exprs.pprop' -p26 -g10 +p24 +g8 sS'Tparam_lab' -p27 -g10 +p25 +g8 sS'exprs.out' -p28 -g10 +p26 +g8 sS'graphics.in_implicit' -p29 +p27 NsS'typ' -p30 -g20 +p28 +S'vector' +p29 sS'getvalue_txt' -p31 +p30 g2 sS'mo.inputs' -p32 -g20 +p31 +g29 sS'param' +p32 +g21 +sS'gr_i' p33 -g23 +g29 sS'paramv' p34 -g4 -sS'gr_i' +g13 +sS'exprs.funtxt' p35 -g20 +g29 sS'x.graphics.in_implicit' p36 -g20 +g29 sS'mo.parameters' p37 -g4 +g13 sS'Tparam_sz' p38 -g10 +g8 sS'pprop' p39 -g23 +g21 sS'model.out' p40 -g10 -sS'exprs.in1' +g8 +sS'model.sim' p41 -g10 +g13 sS'model.equations' p42 -g6 +g4 sS'mo.outputs' p43 -g23 +g21 sS'intype' p44 -g20 +g29 sS'x.graphics.out_implicit' p45 -g23 +g21 sS'in1' p46 -g20 +g29 sS'model.rpar' p47 -g23 -sS'model.in1' -p48 -g10 +g21 sS'lhs_txt' -p49 +p48 g2 sS'outtype' +p49 +g21 +sS'model.in' p50 -g23 +g8 sS'graphics' p51 -g6 +g4 sS'intypex' p52 -g10 +g8 sS'lab_1' p53 -g4 +g13 sS'lab_2' p54 NsS'paramv[$+1-1]' @@ -202,27 +202,27 @@ p58 g2 sS'exprs.param' p59 -g10 +g8 sS'model.sim[1-1]' p60 NsS'mo' p61 -g6 +g4 sS'x.graphics' p62 -g6 +g4 sS'pprop[$+1-1]' p63 -g10 +g8 sS'model.dep_ut' p64 -g20 +g29 sS'exprs.paramv' p65 -g4 +g13 sS'exprs' p66 -g10 +g8 sS'lab_2[$+1-1]' p67 g2 @@ -234,14 +234,14 @@ p69 g2 sS'y' p70 -g20 +g29 sS'x' p71 -g10 +g8 sS'model' p72 -g6 +g4 sS'tt' p73 -g20 +g29 s.
\ No newline at end of file diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 684e0463..e19c1b2f 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -6,7 +6,7 @@ function MEMORY_f() { this.exprs = [[string(z)],[string(1)]]; this.model = scicos_model(); this.model.sim = new ScilabString(["memo"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); @@ -31,10 +31,7 @@ function MEMORY_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { @@ -58,7 +55,7 @@ function MEMORY_f() { if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index b10dd11b..80e99e9d 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -41,23 +41,23 @@ g2 sS'out' p9 g2 -sS'model.in1' -p10 -g2 sS'x.graphics' -p11 +p10 g4 sS'model.evtin' -p12 +p11 g2 sS'model.sim' -p13 +p12 S'string' -p14 +p13 sS'in1' -p15 +p14 g2 sS'model.rpar' +p15 +g2 +sS'model.in' p16 g2 sS'graphics.exprs' @@ -72,7 +72,7 @@ S'boolean' p21 sS'model.blocktype' p22 -g14 +g13 sS'model.dep_ut' p23 g19 diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 7570905b..2ceff438 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -23,7 +23,7 @@ function MPBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([10004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); @@ -41,9 +41,6 @@ function MPBLOCK() { return options; } MPBLOCK.prototype.set = function MPBLOCK() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -54,7 +51,7 @@ function MPBLOCK() { } this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - var lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1); @@ -252,7 +249,7 @@ function MPBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = lab_1[1-1]; + this.exprs.in = lab_1[1-1]; this.exprs.intype = lab_1[2-1]; this.exprs.out = lab_1[3-1]; this.exprs.outtype = lab_1[4-1]; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index f7e22d8c..0fadb8a9 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -31,51 +31,51 @@ S'rhs_txt' p1 S'string' p2 -sS'model.sim' -p3 -S'list' -p4 sS'ee' -p5 +p3 S'double' -p6 +p4 sS'arg1' -p7 +p5 S'object' -p8 +p6 sS'graphics.gr_i[1-1][1-1]' -p9 +p7 g2 sS'graphics.exprs' -p10 -g8 -sS'outtypex' -p11 +p8 g6 +sS'outtypex' +p9 +g4 sS'mo.model' -p12 +p10 g2 sS'ierr' -p13 -g6 +p11 +g4 sS'exprs.paramv[i-1]' -p14 -g6 -sS'lab_2_tmp' -p15 +p12 g4 +sS'lab_2_tmp' +p13 +S'list' +p14 sS'x.model' -p16 -g8 -sS'exprs.outtype' -p17 +p15 g6 +sS'exprs.outtype' +p16 +g4 sS'exprs.intype' -p18 -g6 +p17 +g4 sS'exprs.nameF' +p18 +g4 +sS'exprs.in' p19 -g6 +g4 sS'graphics.out_implicit' p20 NsS'out' @@ -87,16 +87,16 @@ p23 g2 sS'lab_2_tmp[i-1]' p24 -g6 +g4 sS'exprs.pprop' p25 -g6 +g4 sS'Tparam_lab' p26 -g6 +g4 sS'exprs.out' p27 -g6 +g4 sS'graphics.in_implicit' p28 NsS'typ' @@ -114,7 +114,7 @@ p33 g30 sS'paramv' p34 -g4 +g14 sS'gr_i' p35 g30 @@ -123,22 +123,22 @@ p36 g30 sS'mo.parameters' p37 -g4 +g14 sS'Tparam_sz' p38 -g6 +g4 sS'pprop' p39 g30 sS'model.out' p40 -g6 -sS'exprs.in1' +g4 +sS'model.sim' p41 -g6 +g14 sS'model.equations' p42 -g8 +g6 sS'mo.outputs' p43 g22 @@ -154,24 +154,24 @@ g30 sS'model.rpar' p47 g22 -sS'model.in1' -p48 -g6 sS'lhs_txt' -p49 +p48 g2 sS'outtype' -p50 +p49 g22 +sS'model.in' +p50 +g4 sS'graphics' p51 -g8 +g6 sS'intypex' p52 -g6 +g4 sS'lab_1' p53 -g4 +g14 sS'lab_2' p54 NsS'paramv[$+1-1]' @@ -186,18 +186,18 @@ p58 g2 sS'exprs.param' p59 -g6 +g4 sS'model.sim[1-1]' p60 NsS'mo' p61 -g8 +g6 sS'x.graphics' p62 -g8 +g6 sS'pprop[$+1-1]' p63 -g6 +g4 sS'model.dep_ut' p64 g30 @@ -206,7 +206,7 @@ p65 g2 sS'exprs' p66 -g6 +g4 sS'lab_2[$+1-1]' p67 g2 @@ -221,11 +221,11 @@ p70 g30 sS'x' p71 -g6 +g4 sS'model' p72 -g8 +g6 sS'exprs.paramv' p73 -g4 +g14 s.
\ No newline at end of file diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 22da4d26..e853f63d 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -5,7 +5,7 @@ function PAL_f() { scs.props.title = "Palette"; this.model = scicos_model(); this.model.sim = new ScilabString(["palette"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); @@ -24,14 +24,10 @@ function PAL_f() { return options; } PAL_f.prototype.set = function PAL_f() { - var tmpvar0 = scicos(arg1.model.rpar); this.x = tmpvar0[0]; var newparameters = tmpvar0[1]; var needcompile = tmpvar0[2]; var edited = tmpvar0[3]; - arg1.graphics.id = this.x.props.title[1-1]; - arg1.model.rpar = this.x; - this.x = arg1; var y = []; var typ = []; %exit = resume(false) diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle index 50b9152f..7e78d5e8 100644 --- a/js/Misc/PAL_f.pickle +++ b/js/Misc/PAL_f.pickle @@ -26,57 +26,57 @@ p4 sS'model.blocktype' p5 g2 -sS'model.dep_ut' -p6 -S'vector' -p7 sS'arg1' -p8 +p6 g4 sS'scs.props' -p9 +p7 g4 -sS'model.in1' -p10 -g7 +sS'model.dep_ut' +p8 +S'vector' +p9 sS'scs.props.title' -p11 +p10 g2 sS'x.props' -p12 +p11 g4 sS'model.out' -p13 -g7 +p12 +g9 sS'gr_i' -p14 -g7 +p13 +g9 sS'model.rpar' -p15 +p14 S'double' -p16 +p15 sS'scs' -p17 +p16 g4 +sS'model.in' +p17 +g9 sS'y' p18 -g7 +g9 sS'x' p19 -g16 +g15 sS'model' p20 g4 sS'x.graphics.id' p21 -g16 +g15 sS'typ' p22 -g7 +g9 sS'arg1.model.rpar' p23 g4 sS'arg1.graphics.id' p24 -g16 +g15 s.
\ No newline at end of file diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 1faf9f7f..c6264f51 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -10,7 +10,7 @@ function PENDULUM_ANIM() { this.ymax = 5; this.model = scicos_model(); this.model.sim = list(new ScilabString(["anim_pen"]), new ScilabDouble([5])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); @@ -45,10 +45,7 @@ function PENDULUM_ANIM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle index af17dc6e..31705ba2 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -55,32 +55,32 @@ g2 sS'ymin' p11 g2 -sS'model.in1' -p12 -g8 sS'ymax' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g2 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'phi' -p18 +p17 g2 sS'mess' -p19 +p18 g8 sS'csiz' -p20 +p19 g2 sS'model.rpar' +p20 +g8 +sS'model.in' p21 g8 sS'graphics.exprs' diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index dd065a28..10022a5a 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -6,7 +6,7 @@ function RATELIMITER() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ratelimiter"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -30,10 +30,7 @@ function RATELIMITER() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle index e089b9bc..d2922df3 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -23,7 +23,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -65,22 +65,22 @@ p19 sS'model.dep_ut' p20 g19 -sS'graphics' +sS'model.in' p21 +g4 +sS'graphics' +p22 g9 sS'y' -p22 +p23 g19 sS'x' -p23 +p24 g4 sS'model' -p24 +p25 g9 sS'typ' -p25 -g19 -sS'model.out' p26 -g4 +g19 s.
\ No newline at end of file diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index aa9801f3..1bc6fdef 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -5,7 +5,7 @@ function RELATIONALOP() { var label = "<"; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relationalop"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -32,10 +32,7 @@ function RELATIONALOP() { this.zcr = parseFloat(arguments[0]["zcr"]) this.Datatype = arguments[0]["Datatype"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==2) { this.exprs = [[this.exprs],[sci2exp(1)]]; } diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 9387c264..474e3399 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -51,32 +51,32 @@ g8 sS'graphics.style' p13 g8 -sS'model.in1' -p14 -S'matrix' -p15 sS'x.graphics' -p16 +p14 g2 sS'typ' -p17 +p15 g8 sS'label' -p18 +p16 g5 sS'model.sim' -p19 +p17 S'list' -p20 +p18 sS'model.nmode' -p21 +p19 g10 sS'in1' +p20 +S'matrix' +p21 +sS'model.in' p22 -g15 +g21 sS'graphics.exprs' p23 -g15 +g21 sS'x.graphics.style' p24 g8 @@ -98,7 +98,7 @@ p30 g10 sS'exprs' p31 -g15 +g21 sS'gr_i' p32 g8 diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index cd072345..86282c59 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -3,7 +3,7 @@ function SPLIT_f() { SPLIT_f.prototype.define = function SPLIT_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["lsplit"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -19,7 +19,6 @@ function SPLIT_f() { return options; } SPLIT_f.prototype.set = function SPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle index 90f5dbc2..2575c12c 100644 --- a/js/Misc/SPLIT_f.pickle +++ b/js/Misc/SPLIT_f.pickle @@ -19,32 +19,32 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'model.dep_ut' -p6 +p4 S'vector' -p7 +p5 sS'model.out' -p8 +p6 S'matrix' +p7 +sS'model.in' +p8 +S'double' p9 sS'y' p10 -g7 +g5 sS'x' p11 -g4 +g9 sS'model' p12 S'object' p13 sS'typ' p14 -g7 +g5 s.
\ No newline at end of file diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 9ffae6bb..e9280aa1 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -13,7 +13,7 @@ function SUPER_f() { scs.objs[2-1] = out; this.model = scicos_model(); this.model.sim = new ScilabString(["super"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); @@ -31,7 +31,6 @@ function SUPER_f() { return options; } SUPER_f.prototype.set = function SUPER_f() { - xcos(arg1.model.rpar); return new SuperBlock(this.x); } } diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle index 28d079d5..965e905e 100644 --- a/js/Misc/SUPER_f.pickle +++ b/js/Misc/SUPER_f.pickle @@ -15,42 +15,42 @@ p6 atp7 Rp8 .(dp0 -S'arg1' +S'scs.objs[2-1]' p1 S'object' p2 -sS'scs.objs[1-1]' +sS'arg1' p3 g2 -sS'scs.props.title' +sS'scs.objs[1-1]' p4 -S'string' +g2 +sS'scs.props.title' p5 -sS'model.out' +S'string' p6 -S'double' +sS'model.out' p7 -sS'scs' +S'double' p8 -g7 -sS'out' +sS'scs' p9 -g2 -sS'model.in1' +g8 +sS'out' p10 -g7 +g2 sS'model.sim' p11 -g5 +g6 sS'in1' p12 g2 sS'model.rpar' p13 -g7 -sS'scs.objs[2-1]' +g8 +sS'model.in' p14 -g2 +g8 sS'in1.graphics.orig' p15 S'vector' @@ -69,7 +69,7 @@ p20 g2 sS'model.blocktype' p21 -g5 +g6 sS'model.dep_ut' p22 g16 @@ -84,7 +84,7 @@ p25 g16 sS'x' p26 -g7 +g8 sS'model' p27 g2 diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 77de720a..f459c135 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -31,11 +31,8 @@ function TEXT_f() { this.font = parseFloat(arguments[0]["font"]) this.siz = parseFloat(arguments[0]["siz"]) this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; var orig = this.graphics.orig; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],["3"],["1"]]; } diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 82443e22..a75b4337 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -13,7 +13,7 @@ function c_block() { this.funam = "toto"; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2001])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -47,9 +47,6 @@ function c_block() { this.rpar = inverse(arguments[0]["rpar"]) this.funam = arguments[0]["funam"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set C_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); @@ -66,7 +63,7 @@ function c_block() { this.o = int(this.o.slice()); var no = size(this.o,1); var tt = label[2-1]; - if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { + if (this.model.sim[1-1]!=this.funam||size(this.model.in,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } var tmpvar0 = CFORTR(this.funam,tt,this.i,this.o); diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index ed1b3b80..609f4f1a 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -61,55 +61,55 @@ g9 sS'ni' p15 g9 -sS'model.in1' -p16 -g9 sS'clkin' -p17 +p16 g3 sS'x.graphics' -p18 +p17 g5 sS'z0' -p19 +p18 g3 sS'tt' -p20 +p19 g3 sS'label' -p21 +p20 S'list' -p22 +p21 sS'model.evtin' -p23 +p22 g3 sS'model.firing' -p24 +p23 g3 sS'model.sim' -p25 -g22 +p24 +g21 sS'model.evtout' -p26 +p25 g3 sS'clkout' -p27 +p26 g3 sS'auto' -p28 +p27 g3 sS'label[2-1]' -p29 +p28 g3 sS'in1' -p30 +p29 g9 sS'model.rpar' -p31 +p30 g3 sS'model.state' -p32 +p31 g3 +sS'model.in' +p32 +g9 sS'graphics.exprs' p33 NsS'x0' diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index af2470bc..69e90760 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -3,7 +3,7 @@ function fortran_block() { fortran_block.prototype.define = function fortran_block() { this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([1001])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -15,7 +15,7 @@ function fortran_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; - var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); + var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -38,9 +38,6 @@ function fortran_block() { this.rpar = inverse(arguments[0]["rpar"]) this.funam = arguments[0]["funam"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set fortran_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); @@ -57,7 +54,7 @@ function fortran_block() { this.o = int(this.o.slice()); var no = size(this.o,1); var tt = label[2-1]; - if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { + if (this.model.sim[1-1]!=this.funam||size(this.model.in,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } var tmpvar0 = FORTR(this.funam,tt,this.i,this.o); diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index 3c9327de..468f2187 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -58,40 +58,40 @@ p13 sS'ni' p14 g13 -sS'model.in1' -p15 -g13 sS'x.graphics' -p16 +p15 g5 sS'tt' -p17 +p16 g3 sS'label' -p18 +p17 S'list' -p19 +p18 sS'model.evtin' -p20 +p19 g3 sS'model.firing' -p21 +p20 g3 sS'model.sim' -p22 -g19 +p21 +g18 sS'model.evtout' -p23 +p22 g3 sS'label[2-1]' -p24 +p23 g3 sS'model.rpar' -p25 +p24 g3 sS'model.state' -p26 +p25 g3 +sS'model.in' +p26 +g13 sS'graphics.exprs' p27 NsS'model.ipar' diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 20190ebe..5c35f244 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -3,7 +3,7 @@ function func_block() { func_block.prototype.define = function func_block() { this.model = scicos_model(); this.model.sim = new ScilabString([" "]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,10 +21,7 @@ function func_block() { return options; } func_block.prototype.set = function func_block() { - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.x = arg1; this.model = this.x.model; var tmpvar0 = genfunc(this.exprs); var ok = tmpvar0[0]; diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle index 1c7eb85f..0f6235b8 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.pickle @@ -19,7 +19,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -35,27 +35,27 @@ p8 g7 sS'graphics.exprs' p9 -NsS'model.out' +NsS'model.dep_ut' p10 -g4 -sS'exprs' +S'vector' p11 +sS'exprs' +p12 g2 sS'x.model' -p12 -NsS'gr_i' p13 -S'vector' +NsS'gr_i' p14 -sS'model.dep_ut' +g11 +sS'model.in' p15 -g14 +g4 sS'graphics' p16 g7 sS'y' p17 -g14 +g11 sS'x' p18 g4 @@ -64,5 +64,5 @@ p19 g7 sS'typ' p20 -g14 +g11 s.
\ No newline at end of file diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index ecab32f5..07044219 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -5,7 +5,7 @@ function generic_block() { this.function_name = "sinblk"; this.funtyp = 1; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -16,7 +16,7 @@ function generic_block() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -57,9 +57,6 @@ function generic_block() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -120,10 +117,7 @@ function generic_block() { this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index e0a29524..03c75a64 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -75,39 +75,39 @@ g2 sS'model.dstate' p13 g8 -sS'model.in1' -p14 -g2 sS'label' -p15 +p14 S'matrix' -p16 +p15 sS'model.evtin' -p17 +p16 g8 sS'model.firing' -p18 +p17 g8 sS'function_name' -p19 +p18 S'string' -p20 +p19 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'model.evtout' -p23 +p22 g8 sS'arg1.graphics' -p24 +p23 g5 sS'model.rpar' -p25 +p24 g8 sS'model.state' -p26 +p25 g8 +sS'model.in' +p26 +g2 sS'graphics' p27 g5 @@ -131,7 +131,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g20 +g19 sS'i' p36 g2 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 71079407..218ea693 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -5,7 +5,7 @@ function generic_block2() { this.function_name = "sinblk"; this.funtyp = 1; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -16,7 +16,7 @@ function generic_block2() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -61,9 +61,6 @@ function generic_block2() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -126,10 +123,7 @@ function generic_block2() { this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index 93899811..9d27db23 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -79,43 +79,43 @@ g2 sS'model.dstate' p13 g8 -sS'model.in1' -p14 -g2 sS'model.nzcross' -p15 +p14 NsS'label' -p16 +p15 S'matrix' -p17 +p16 sS'model.evtin' -p18 +p17 g8 sS'model.firing' -p19 +p18 g8 sS'function_name' -p20 +p19 S'string' -p21 +p20 sS'model.sim' -p22 +p21 S'list' -p23 +p22 sS'model.evtout' -p24 +p23 g8 sS'arg1.graphics' -p25 +p24 g5 sS'model.nmode' -p26 +p25 NsS'model.rpar' -p27 +p26 g8 sS'model.state' -p28 +p27 g8 +sS'model.in' +p28 +g2 sS'graphics' p29 g5 @@ -139,7 +139,7 @@ S'boolean' p36 sS'model.blocktype' p37 -g21 +g20 sS'i' p38 g2 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 92f07aba..c0a7e2b4 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -5,14 +5,14 @@ function generic_block3() { this.function_name = "sinblk"; this.funtyp = 4; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -65,9 +65,6 @@ function generic_block3() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -138,10 +135,7 @@ function generic_block3() { this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index 769cacf9..fafdff3f 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -79,57 +79,57 @@ p9 sS'xx' p10 g9 -sS'model.intyp' -p11 -g3 sS'funtyp' -p12 +p11 g3 sS'model.out' -p13 +p12 g3 sS'model.dstate' -p14 +p13 g9 sS'model.in2' -p15 +p14 g3 -sS'model.in1' -p16 +sS'model.intyp' +p15 g3 sS'model.nzcross' -p17 +p16 NsS'label' -p18 +p17 S'matrix' -p19 +p18 sS'model.firing' -p20 +p19 NsS'function_name' -p21 +p20 S'string' -p22 +p21 sS'model.sim' -p23 +p22 S'list' -p24 +p23 sS'arg1.graphics' -p25 +p24 g6 sS'model.out2' -p26 +p25 g3 sS'model.nmode' -p27 +p26 NsS'model.rpar' -p28 +p27 g9 sS'model.outtyp' -p29 +p28 g3 sS'model.state' -p30 +p29 g9 +sS'model.in' +p30 +g3 sS'graphics' p31 g6 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 1b119b75..b0eb30c6 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -12,7 +12,7 @@ function scifunc_block() { this.rpar = []; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -58,9 +58,6 @@ function scifunc_block() { this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] var needcompile = 0; - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs[1-1],"*")==8) { this.exprs[1-1][9-1] = "0"; diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index 62d40dcc..96aa9782 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -73,62 +73,62 @@ g3 sS'ni' p15 g3 -sS'model.in1' -p16 -g3 sS'model.ipar' -p17 +p16 g3 sS'clkin' -p18 +p17 g9 sS'dep_ut[2-1]' -p19 +p18 S'boolean' -p20 +p19 sS'no' -p21 +p20 g3 sS'z0' -p22 +p21 g9 sS'auto' -p23 +p22 g9 sS'model.evtin' -p24 +p23 g9 sS'exprs[2-1]' -p25 +p24 NsS'model.firing' -p26 +p25 g9 sS'model.sim' -p27 +p26 S'list' -p28 +p27 sS'model.evtout' -p29 +p28 g9 sS'clkout' -p30 +p29 g9 sS'exprs[1-1][9-1]' -p31 +p30 S'string' -p32 +p31 sS'in1' -p33 +p32 g3 sS'model.rpar' -p34 +p33 g9 sS'nci' -p35 +p34 g3 sS'model.state' -p36 +p35 g9 +sS'model.in' +p36 +g3 sS'nco' p37 g3 @@ -140,16 +140,16 @@ p39 g3 sS'typ' p40 -g32 +g31 sS'model.opar' p41 -g28 +g27 sS'needcompile' p42 g3 sS'model.blocktype' p43 -g32 +g31 sS'i' p44 g3 @@ -164,7 +164,7 @@ p47 g3 sS'exprs' p48 -g28 +g27 sS'gr_i' p49 g9 diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index b895df36..002bef48 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -13,7 +13,7 @@ function scifunc_block_m() { var it = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.in2 = new ScilabDouble([in1]); this.model.intyp = new ScilabDouble([it]); this.model.out = new ScilabDouble([out]); @@ -63,9 +63,6 @@ function scifunc_block_m() { this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] var needcompile = 0; - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs[1-1]); diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index 626c343d..44d38606 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -61,79 +61,79 @@ p10 sS'xx' p11 g10 -sS'model.intyp' -p12 -g3 sS'model.out' -p13 +p12 g3 sS'model.dstate' -p14 +p13 g10 sS'out' -p15 +p14 g3 sS'ni' -p16 +p15 g3 -sS'model.in1' -p17 +sS'model.intyp' +p16 g3 sS'model.ipar' -p18 +p17 g3 sS'clkin' -p19 +p18 g10 sS'dep_ut[2-1]' -p20 +p19 S'boolean' -p21 +p20 sS'no' -p22 +p21 g3 sS'z0' -p23 +p22 g10 sS'model.evtin' -p24 +p23 g10 sS'exprs[2-1]' -p25 +p24 NsS'model.firing' -p26 +p25 g10 sS'model.sim' -p27 +p26 S'list' -p28 +p27 sS'model.evtout' -p29 +p28 g10 sS'clkout' -p30 +p29 g10 sS'model.in2' -p31 +p30 g3 sS'auto' -p32 +p31 g10 sS'model.out2' -p33 +p32 g3 sS'in1' -p34 +p33 g3 sS'model.rpar' -p35 +p34 g10 sS'nci' -p36 +p35 g3 sS'model.state' -p37 +p36 g10 +sS'model.in' +p37 +g3 sS'nco' p38 g3 @@ -152,7 +152,7 @@ S'string' p43 sS'model.opar' p44 -g28 +g27 sS'needcompile' p45 g3 @@ -173,7 +173,7 @@ p50 g10 sS'exprs' p51 -g28 +g27 sS'gr_i' p52 g10 diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index fe09aa27..4aa265a4 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -3,7 +3,7 @@ function ABSBLK_f() { ABSBLK_f.prototype.define = function ABSBLK_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["absblk"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -20,7 +20,6 @@ function ABSBLK_f() { return options; } ABSBLK_f.prototype.set = function ABSBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle index 0b2f3527..1ef3fb82 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_f.pickle @@ -19,35 +19,35 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'model.dep_ut' p5 -S'string' +S'vector' p6 -sS'model.dep_ut' +sS'model.out' p7 -S'vector' +S'double' p8 -sS'model.out' -p9 -g4 sS'gr_i' +p9 +g6 +sS'model.in' p10 g8 sS'y' p11 -g8 +g6 sS'x' p12 -g4 +g8 sS'model' p13 S'object' p14 sS'typ' p15 -g8 +g6 s.
\ No newline at end of file diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index ecb60264..496d0a87 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -4,7 +4,7 @@ function ABS_VALUE() { var nu = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["absolute_value"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.out = new ScilabDouble([nu]); this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); @@ -27,10 +27,7 @@ function ABS_VALUE() { ABS_VALUE.prototype.set = function ABS_VALUE() { this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index c72016a5..289fe0f7 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -41,30 +41,30 @@ p10 NsS'model.nmode' p11 g4 -sS'model.out' +sS'model.dep_ut' p12 -g4 -sS'model.nzcross' +S'vector' p13 +sS'model.nzcross' +p14 g4 sS'exprs' -p14 -S'vector' p15 +g13 sS'x.model' p16 NsS'gr_i' p17 -g15 -sS'model.dep_ut' +g13 +sS'model.in' p18 -g15 +g4 sS'graphics' p19 g8 sS'y' p20 -g15 +g13 sS'x' p21 g4 @@ -73,7 +73,7 @@ p22 g8 sS'typ' p23 -g15 +g13 sS'nu' p24 g4 diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index ced1c488..cd2525a5 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -4,7 +4,7 @@ function COSBLK_f() { var in1 = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["cosblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,7 +21,6 @@ function COSBLK_f() { return options; } COSBLK_f.prototype.set = function COSBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle index 32033c36..f3e87953 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_f.pickle @@ -19,37 +19,37 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'in1' -p6 -g4 +p4 +S'double' +p5 sS'model.dep_ut' -p7 +p6 S'vector' -p8 +p7 sS'model.out' -p9 -g4 +p8 +g5 sS'gr_i' +p9 +g7 +sS'model.in' p10 -g8 +g5 sS'y' p11 -g8 +g7 sS'x' p12 -g4 +g5 sS'model' p13 S'object' p14 sS'typ' p15 -g8 +g7 s.
\ No newline at end of file diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index d8ed79dc..d821aa28 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -9,7 +9,7 @@ function DLRADAPT_f() { this.last_y = [[0],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dlradp"]); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.last_u],[this.last_y]); @@ -45,10 +45,7 @@ function DLRADAPT_f() { this.last_u = inverse(arguments[0]["last_u"]) this.last_y = inverse(arguments[0]["last_y"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,this.exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),this.exprs); if (!ok) { diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index 8e6f3e4d..53f09156 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -47,41 +47,41 @@ NsS'model.out' p8 S'double' p9 -sS'model.in1' -p10 -g2 sS'x.graphics' -p11 +p10 g4 sS'rd' -p12 +p11 g2 sS'model.evtin' -p13 +p12 g9 sS'rn' -p14 +p13 S'vector' -p15 +p14 sS'model.firing' -p16 -g15 +p15 +g14 sS'model.sim' -p17 +p16 S'string' -p18 +p17 sS'last_y' -p19 +p18 g2 sS'exprs' -p20 +p19 g2 sS'model.rpar' -p21 +p20 g2 sS'last_u' +p21 +g14 +sS'model.in' p22 -g15 +g2 sS'graphics.exprs' p23 NsS'model.ipar' @@ -89,10 +89,10 @@ p24 g2 sS'typ' p25 -g15 +g14 sS'model.blocktype' p26 -g18 +g17 sS'g' p27 g2 @@ -101,19 +101,19 @@ p28 g9 sS'model.dep_ut' p29 -g15 +g14 sS'p' p30 g2 sS'gr_i' p31 -g15 +g14 sS'ipar' p32 g2 sS'y' p33 -g15 +g14 sS'x' p34 g9 diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index fb9cc031..111b9833 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -5,7 +5,7 @@ function EXPBLK_f() { this.a = math.E; this.model = scicos_model(); this.model.sim = new ScilabString(["expblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); @@ -26,10 +26,7 @@ function EXPBLK_f() { EXPBLK_f.prototype.set = function EXPBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index c74f3125..dc13791b 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -25,7 +25,7 @@ sS'model.sim' p3 S'string' p4 -sS'model.in1' +sS'model.out' p5 g2 sS'model.blocktype' @@ -59,22 +59,22 @@ g14 sS'model.dep_ut' p17 g14 -sS'graphics' +sS'model.in' p18 +g2 +sS'graphics' +p19 g8 sS'y' -p19 +p20 g14 sS'x' -p20 +p21 g2 sS'model' -p21 +p22 g8 sS'typ' -p22 -g14 -sS'model.out' p23 -g2 +g14 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 7b19a711..2159634f 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -5,7 +5,7 @@ function EXPBLK_m() { this.a = math.E; this.model = scicos_model(); this.model.sim = list(new ScilabString(["expblk_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); @@ -30,10 +30,7 @@ function EXPBLK_m() { EXPBLK_m.prototype.set = function EXPBLK_m() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index ce1d5ea1..2f63aefd 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -26,45 +26,45 @@ p3 g2 sS'x.model' p4 -NsS'model.intyp' +NsS'model.out' p5 S'double' p6 -sS'model.out' +sS'model.in2' p7 g6 -sS'model.in2' +sS'model.intyp' p8 g6 -sS'model.in1' -p9 -g6 sS'x.graphics' -p10 +p9 g2 sS'model.sim' -p11 +p10 S'list' -p12 +p11 sS'model.out2' -p13 +p12 g6 sS'in1' -p14 +p13 g6 sS'model.rpar' -p15 +p14 g6 sS'y' -p16 +p15 S'vector' +p16 +sS'model.in' p17 +g6 sS'graphics.exprs' p18 g6 sS'typ' p19 -g17 +g16 sS'a' p20 g6 @@ -74,13 +74,13 @@ S'string' p22 sS'model.dep_ut' p23 -g17 +g16 sS'exprs' p24 -g17 +g16 sS'gr_i' p25 -g17 +g16 sS'model.outtyp' p26 g6 diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index e6b3904e..ef4d31b3 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -4,7 +4,7 @@ function FSV_f() { var in1 = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["fsv"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -22,7 +22,6 @@ function FSV_f() { return options; } FSV_f.prototype.set = function FSV_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle index a647fcc2..e756a04e 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_f.pickle @@ -19,41 +19,41 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'exprs' p5 -S'string' +g4 +sS'in1' p6 -sS'exprs' +S'double' p7 -g6 -sS'in1' -p8 -g4 sS'model.dep_ut' -p9 +p8 S'vector' -p10 +p9 sS'model.out' -p11 -g4 +p10 +g7 sS'gr_i' +p11 +g9 +sS'model.in' p12 -g10 +g7 sS'y' p13 -g10 +g9 sS'x' p14 -g4 +g7 sS'model' p15 S'object' p16 sS'typ' p17 -g10 +g9 s.
\ No newline at end of file diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 655d7ca9..0f25e1fd 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -6,7 +6,7 @@ function INTRP2BLK_f() { this.c = [[0,1],[1,2]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["intrp2"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); @@ -33,10 +33,7 @@ function INTRP2BLK_f() { this.b = inverse(arguments[0]["b"]) this.c = inverse(arguments[0]["c"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.b,this.c,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),this.exprs); if (!ok) { diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index 7ae82279..c808353d 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -48,30 +48,30 @@ p11 g10 sS'graphics.exprs' p12 -NsS'model.in1' +NsS'model.rpar' p13 g2 -sS'model.rpar' -p14 -g2 sS'exprs' -p15 +p14 g2 sS'x.model' -p16 +p15 NsS'gr_i' -p17 +p16 S'vector' -p18 +p17 sS'model.dep_ut' +p18 +g17 +sS'model.in' p19 -g18 +g2 sS'graphics' p20 g10 sS'y' p21 -g18 +g17 sS'x' p22 S'double' @@ -84,7 +84,7 @@ p25 g2 sS'typ' p26 -g18 +g17 sS'model.out' p27 g23 diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 3a9a9aff..03022c73 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -5,7 +5,7 @@ function INTRPLBLK_f() { this.b = [[0],[1]]; this.model = scicos_model(); this.model.sim = new ScilabString(["intrpl"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); @@ -29,10 +29,7 @@ function INTRPLBLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.b,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index 5d54b94c..e4d076d8 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -27,7 +27,7 @@ sS'model.sim' p3 S'string' p4 -sS'model.in1' +sS'model.out' p5 S'double' p6 @@ -61,22 +61,22 @@ p17 sS'model.dep_ut' p18 g17 -sS'graphics' +sS'model.in' p19 +g6 +sS'graphics' +p20 g10 sS'y' -p20 +p21 g17 sS'x' -p21 +p22 g6 sS'model' -p22 +p23 g10 sS'typ' -p23 -g17 -sS'model.out' p24 -g6 +g17 s.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 002fe2a4..a3b6f8c1 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -4,7 +4,7 @@ function INVBLK() { var in1 = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["invblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -22,7 +22,6 @@ function INVBLK() { return options; } INVBLK.prototype.set = function INVBLK() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle index a647fcc2..e756a04e 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.pickle @@ -19,41 +19,41 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'exprs' p5 -S'string' +g4 +sS'in1' p6 -sS'exprs' +S'double' p7 -g6 -sS'in1' -p8 -g4 sS'model.dep_ut' -p9 +p8 S'vector' -p10 +p9 sS'model.out' -p11 -g4 +p10 +g7 sS'gr_i' +p11 +g9 +sS'model.in' p12 -g10 +g7 sS'y' p13 -g10 +g9 sS'x' p14 -g4 +g7 sS'model' p15 S'object' p16 sS'typ' p17 -g10 +g9 s.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index ffd7a4a4..c505c7f1 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -4,7 +4,7 @@ function INVBLK_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["invblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -22,7 +22,6 @@ function INVBLK_f() { return options; } INVBLK_f.prototype.set = function INVBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle index b5941377..3c2d269d 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_f.pickle @@ -19,40 +19,40 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'exprs' -p6 +p4 g2 sS'in1' -p7 -g4 +p5 +S'double' +p6 sS'model.dep_ut' -p8 +p7 S'vector' -p9 +p8 sS'model.out' -p10 -g4 +p9 +g6 sS'gr_i' +p10 +g8 +sS'model.in' p11 -g9 +g6 sS'y' p12 -g9 +g8 sS'x' p13 -g4 +g6 sS'model' p14 S'object' p15 sS'typ' p16 -g9 +g8 s.
\ No newline at end of file diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index e4f7dc45..72669ba6 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -5,7 +5,7 @@ function LOGBLK_f() { this.a = math.E; this.model = scicos_model(); this.model.sim = new ScilabString(["logblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); @@ -26,10 +26,7 @@ function LOGBLK_f() { LOGBLK_f.prototype.set = function LOGBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index 61ad1ed0..becbf40c 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -25,7 +25,7 @@ sS'model.sim' p3 S'string' p4 -sS'model.in1' +sS'model.out' p5 g2 sS'model.blocktype' @@ -59,22 +59,22 @@ p16 sS'model.dep_ut' p17 g16 -sS'graphics' +sS'model.in' p18 +g2 +sS'graphics' +p19 g8 sS'y' -p19 +p20 g16 sS'x' -p20 +p21 g2 sS'model' -p21 +p22 g8 sS'typ' -p22 -g16 -sS'model.out' p23 -g2 +g16 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 1495a39e..a423c30e 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -10,7 +10,7 @@ function LOOKUP2D() { var Nx = length(this.xx); var Ny = length(this.yy); this.model.sim = list(new ScilabString(["lookup2d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); @@ -41,9 +41,6 @@ function LOOKUP2D() { this.Method = parseFloat(arguments[0]["Method"]) this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index 0ee74d21..f7203e42 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -68,30 +68,30 @@ g8 sS'gh' p18 g4 -sS'model.in1' -p19 -g13 sS'gh2' -p20 +p19 g8 sS'gh.figure_id' -p21 +p20 NsS'METHOD' -p22 +p21 g2 sS'model.sim' -p23 +p22 S'list' -p24 +p23 sS'model.rpar' -p25 +p24 g13 sS'yy' -p26 +p25 g11 sS'exprs[5-1]' -p27 +p26 g2 +sS'model.in' +p27 +g13 sS'graphics' p28 g4 @@ -122,7 +122,7 @@ p37 g11 sS'exprs' p38 -g24 +g23 sS'gr_i' p39 g11 diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 5a351f6d..62b500b3 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -8,7 +8,7 @@ function LOOKUP_c() { this.Method = 1; var Graf = "n"; this.model.sim = list(new ScilabString(["lookup_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); @@ -46,9 +46,6 @@ function LOOKUP_c() { this.extrapo = parseFloat(arguments[0]["extrapo"]) this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index b190057a..e6e522ce 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -647,103 +647,103 @@ g7 sS'a.x_ticks' p173 g19 -sS'graphics' +sS'model.in' p174 +g7 +sS'graphics' +p175 g19 sS'Exitm' -p175 +p176 g4 sS'N2' -p176 +p177 g7 sS'model.ipar' -p177 +p178 g27 sS'Pw3' -p178 +p179 g2 sS'f' -p179 +p180 g7 sS'a.grid' -p180 +p181 g2 sS'y[N-1]' -p181 +p182 g7 sS'gr_i' -p182 +p183 g2 sS'ipar' -p183 +p184 g2 sS'ystC' -p184 +p185 g4 sS'mtd' -p185 +p186 g7 sS'PERIODIC' -p186 +p187 g4 sS'xmx1' -p187 +p188 g7 sS'scam' -p188 +p189 g4 sS'exprs[4-1]' -p189 +p190 g4 sS'ans0' -p190 +p191 g4 sS'ymn1' -p191 +p192 g7 sS't1' -p192 +p193 g4 sS'model.evtout' -p193 +p194 g2 sS'rpar' -p194 +p195 g2 sS'lx11' -p195 +p196 g7 sS'np5' -p196 +p197 g2 sS'Bias3' -p197 +p198 g2 sS'Tp3' -p198 +p199 g2 sS'model.out' -p199 +p200 g7 sS'np4' -p200 +p201 g2 sS'rectx' -p201 +p202 g7 sS'np1' -p202 +p203 g7 sS'Lx' -p203 +p204 g7 sS'x21' -p204 +p205 g4 sS'model.in2' -p205 -g7 -sS'model.in1' p206 g7 sS'x[k-1]' diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 986ab6d5..b81270c8 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -3,7 +3,7 @@ function LOOKUP_f() { LOOKUP_f.prototype.define = function LOOKUP_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["lookup"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); @@ -21,10 +21,7 @@ function LOOKUP_f() { return options; } LOOKUP_f.prototype.set = function LOOKUP_f() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; var n = size(rpar,"*")/2; var xx = rpar.slice(1-1,n); diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 6d86ebed..3b7a3227 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -19,7 +19,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -61,25 +61,25 @@ g16 sS'model.dep_ut' p20 g16 -sS'graphics' +sS'model.in' p21 +g4 +sS'graphics' +p22 g9 sS'y' -p22 +p23 g16 sS'x' -p23 +p24 g4 sS'model' -p24 +p25 g9 sS'n' -p25 +p26 g4 sS'typ' -p26 -g16 -sS'model.out' p27 -g4 +g16 s.
\ No newline at end of file diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 9401773e..4e4cf002 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -4,7 +4,7 @@ function MAXMIN() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["minmax"]), new ScilabDouble([4])); this.model.out = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); @@ -30,10 +30,7 @@ function MAXMIN() { this.nin = arguments[0]["nin"] this.zcr = parseFloat(arguments[0]["zcr"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.mm,this.nin,this.zcr,this.exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index bc411026..2b7f21f2 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -41,24 +41,24 @@ sS'graphics.style' p8 S'string' p9 -sS'model.in1' -p10 -g6 sS'x.graphics' -p11 +p10 g2 sS'typ' -p12 +p11 S'vector' -p13 +p12 sS'label' -p14 +p13 g9 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'model.nmode' +p16 +g6 +sS'model.in' p17 g6 sS'graphics.exprs' @@ -84,16 +84,16 @@ p25 g6 sS'model.dep_ut' p26 -g13 +g12 sS'exprs' p27 -g13 +g12 sS'gr_i' p28 -g13 +g12 sS'y' p29 -g13 +g12 sS'x' p30 g6 diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 7184504d..3ca90eb0 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -4,7 +4,7 @@ function MAX_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["maxblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); @@ -23,7 +23,6 @@ function MAX_f() { return options; } MAX_f.prototype.set = function MAX_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle index 6107ebd6..d4bf1ac5 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_f.pickle @@ -19,44 +19,44 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.dstate' -p5 +p3 S'matrix' -p6 +p4 sS'model.blocktype' -p7 +p5 g2 sS'exprs' -p8 +p6 g2 sS'in1' -p9 -g4 +p7 +S'double' +p8 sS'model.dep_ut' -p10 +p9 S'vector' -p11 +p10 sS'model.out' -p12 -g4 +p11 +g8 sS'gr_i' +p12 +g10 +sS'model.in' p13 -g11 +g8 sS'y' p14 -g11 +g10 sS'x' p15 -g4 +g8 sS'model' p16 S'object' p17 sS'typ' p18 -g11 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 4656728b..7a157259 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -4,7 +4,7 @@ function MIN_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["minblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); @@ -23,7 +23,6 @@ function MIN_f() { return options; } MIN_f.prototype.set = function MIN_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle index 6107ebd6..d4bf1ac5 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_f.pickle @@ -19,44 +19,44 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.dstate' -p5 +p3 S'matrix' -p6 +p4 sS'model.blocktype' -p7 +p5 g2 sS'exprs' -p8 +p6 g2 sS'in1' -p9 -g4 +p7 +S'double' +p8 sS'model.dep_ut' -p10 +p9 S'vector' -p11 +p10 sS'model.out' -p12 -g4 +p11 +g8 sS'gr_i' +p12 +g10 +sS'model.in' p13 -g11 +g8 sS'y' p14 -g11 +g10 sS'x' p15 -g4 +g8 sS'model' p16 S'object' p17 sS'typ' p18 -g11 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index fa90ed98..bec8fe51 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -5,7 +5,7 @@ function POWBLK_f() { this.a = 1.5; this.model = scicos_model(); this.model.sim = new ScilabString(["powblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); @@ -26,10 +26,7 @@ function POWBLK_f() { POWBLK_f.prototype.set = function POWBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index 0fc9dbc5..dd1ad090 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -25,7 +25,7 @@ sS'model.sim' p3 S'string' p4 -sS'model.in1' +sS'model.out' p5 g2 sS'model.blocktype' @@ -59,28 +59,28 @@ p16 sS'model.dep_ut' p17 g16 -sS'graphics' +sS'model.in' p18 +g2 +sS'graphics' +p19 g8 sS'y' -p19 +p20 g16 sS'x' -p20 +p21 g2 sS'model' -p21 +p22 g8 sS'model.ipar' -p22 -g16 -sS'typ' p23 g16 -sS'model.firing' +sS'typ' p24 g16 -sS'model.out' +sS'model.firing' p25 -g2 +g16 s.
\ No newline at end of file diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index c9d3706e..4f8ff4d5 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -4,7 +4,7 @@ function PRODUCT() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["product"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); @@ -25,9 +25,6 @@ function PRODUCT() { PRODUCT.prototype.set = function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.sgn,this.exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),this.exprs); diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index e6c6e3e4..5e4dd023 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -21,17 +21,17 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 sS'ok' p5 S'boolean' p6 -sS'model.blocktype' +sS'model.in' p7 -S'string' +S'matrix' p8 sS'x.graphics' p9 @@ -42,47 +42,47 @@ p11 g10 sS'sgn' p12 -g4 +g8 sS'in1' p13 -S'double' +g4 +sS'model.dep_ut' p14 -sS'model.out' +S'vector' p15 -g14 sS'exprs' p16 -g8 -sS'x.model' +S'string' p17 -NsS'gr_i' +sS'x.model' p18 -S'vector' +NsS'gr_i' p19 -sS'model.dep_ut' -p20 -g19 +g15 sS'graphics.exprs' -p21 +p20 NsS'graphics' -p22 +p21 g10 sS'y' -p23 -g19 +p22 +g15 sS'x' -p24 -g14 +p23 +g4 sS'model' -p25 +p24 g10 sS'model.ipar' -p26 -g4 +p25 +g8 sS'typ' -p27 -g19 +p26 +g15 sS'nout' +p27 +g4 +sS'model.blocktype' p28 -g14 +g17 s.
\ No newline at end of file diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 5090deb5..3e67f178 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -3,7 +3,7 @@ function PROD_f() { PROD_f.prototype.define = function PROD_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["prod"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -19,7 +19,6 @@ function PROD_f() { return options; } PROD_f.prototype.set = function PROD_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index 1a26bbb9..3c98d962 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_f.pickle @@ -19,36 +19,36 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 sS'model.blocktype' p5 S'string' p6 -sS'model.out' +sS'model.dep_ut' p7 -S'double' +S'vector' p8 sS'p' p9 -g8 -sS'model.dep_ut' +g4 +sS'model.in' p10 -S'vector' +S'matrix' p11 sS'y' p12 -g11 +g8 sS'x' p13 -g8 +g4 sS'model' p14 S'object' p15 sS'typ' p16 -g11 +g8 s.
\ No newline at end of file diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index e893d104..785401c5 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -5,7 +5,7 @@ function QUANT_f() { this.meth = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["qzrnd"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.pas]); this.model.ipar = new ScilabDouble([this.meth]); @@ -30,10 +30,7 @@ function QUANT_f() { this.pas = parseFloat(arguments[0]["pas"]) this.meth = parseFloat(arguments[0]["meth"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.pas,this.meth,this.exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index e5bb9a9e..7de54b31 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -23,7 +23,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -60,28 +60,28 @@ p17 sS'model.dep_ut' p18 g17 -sS'graphics' +sS'model.in' p19 +g4 +sS'graphics' +p20 g8 sS'y' -p20 +p21 g17 sS'x' -p21 +p22 g4 sS'model' -p22 +p23 g8 sS'model.ipar' -p23 +p24 g4 sS'typ' -p24 +p25 g17 sS'meth' -p25 -g4 -sS'model.out' p26 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 75a5713c..4f116bf3 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -6,7 +6,7 @@ function SATURATION() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["satur"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -34,10 +34,7 @@ function SATURATION() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index 5bc0ae5c..64da890e 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -32,38 +32,38 @@ sS'rpar' p4 S'matrix' p5 -sS'model.out' +sS'minp' p6 S'double' p7 sS'x.model' p8 -NsS'minp' +NsS'model.out' p9 g7 -sS'model.in1' -p10 -g7 sS'x.graphics' -p11 +p10 g2 sS'typ' -p12 +p11 S'vector' -p13 +p12 sS'maxp' -p14 +p13 g7 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'model.nmode' -p17 +p16 g7 sS'model.rpar' -p18 +p17 g5 +sS'model.in' +p18 +g7 sS'graphics.exprs' p19 NsS'model.nzcross' @@ -75,16 +75,16 @@ S'string' p22 sS'model.dep_ut' p23 -g13 +g12 sS'exprs' p24 g5 sS'gr_i' p25 -g13 +g12 sS'y' p26 -g13 +g12 sS'x' p27 g7 diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 9fc71471..d4061ca8 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -7,7 +7,7 @@ function SAT_f() { var rpar = [[this.minp],[this.maxp],[slope]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["lusat"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); @@ -34,10 +34,7 @@ function SAT_f() { this.maxp = parseFloat(arguments[0]["maxp"]) this.pente = arguments[0]["pente"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.minp,this.maxp,this.pente,this.exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index 10e2a264..5463c231 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -36,37 +36,37 @@ sS'rpar' p6 S'matrix' p7 -sS'model.out' +sS'minp' p8 g2 sS'x.model' p9 -NsS'minp' +NsS'model.out' p10 g2 -sS'model.in1' -p11 -g2 sS'x.graphics' -p12 +p11 g4 sS'typ' -p13 +p12 S'vector' -p14 +p13 sS'maxp' -p15 +p14 g2 sS'model.firing' -p16 -g14 +p15 +g13 sS'model.sim' -p17 +p16 S'list' -p18 +p17 sS'model.rpar' -p19 +p18 g7 +sS'model.in' +p19 +g2 sS'graphics.exprs' p20 NsS'model.nzcross' @@ -78,16 +78,16 @@ S'string' p23 sS'model.dep_ut' p24 -g14 +g13 sS'exprs' p25 g7 sS'gr_i' p26 -g14 +g13 sS'y' p27 -g14 +g13 sS'x' p28 g2 diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index b6b26b91..316ac142 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -4,7 +4,7 @@ function SIGNUM() { var nu = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["signum"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.out = new ScilabDouble([nu]); this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); @@ -27,10 +27,7 @@ function SIGNUM() { SIGNUM.prototype.set = function SIGNUM() { this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index c72016a5..289fe0f7 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -41,30 +41,30 @@ p10 NsS'model.nmode' p11 g4 -sS'model.out' +sS'model.dep_ut' p12 -g4 -sS'model.nzcross' +S'vector' p13 +sS'model.nzcross' +p14 g4 sS'exprs' -p14 -S'vector' p15 +g13 sS'x.model' p16 NsS'gr_i' p17 -g15 -sS'model.dep_ut' +g13 +sS'model.in' p18 -g15 +g4 sS'graphics' p19 g8 sS'y' p20 -g15 +g13 sS'x' p21 g4 @@ -73,7 +73,7 @@ p22 g8 sS'typ' p23 -g15 +g13 sS'nu' p24 g4 diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 523f8bc0..621fe1dc 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -3,7 +3,7 @@ function SINBLK_f() { SINBLK_f.prototype.define = function SINBLK_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["sinblk"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,7 +21,6 @@ function SINBLK_f() { return options; } SINBLK_f.prototype.set = function SINBLK_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle index d782f7c8..08fc2768 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_f.pickle @@ -19,37 +19,37 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'exprs' -p6 +p4 g2 sS'model.dep_ut' -p7 +p5 S'vector' -p8 +p6 sS'model.out' -p9 -g4 +p7 +S'double' +p8 sS'gr_i' +p9 +g6 +sS'model.in' p10 g8 sS'y' p11 -g8 +g6 sS'x' p12 -g4 +g8 sS'model' p13 S'object' p14 sS'typ' p15 -g8 +g6 s.
\ No newline at end of file diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index a1976325..9cc919cd 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -4,7 +4,7 @@ function TANBLK_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["tanblk"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -22,7 +22,6 @@ function TANBLK_f() { return options; } TANBLK_f.prototype.set = function TANBLK_f() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle index e86bebae..dac5e218 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_f.pickle @@ -19,43 +19,43 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'x.model.firing' -p6 +p4 S'vector' -p7 +p5 sS'exprs' -p8 +p6 g2 sS'in1' -p9 -g4 +p7 +S'double' +p8 sS'model.dep_ut' -p10 -g7 +p9 +g5 sS'model.out' -p11 -g4 +p10 +g8 sS'gr_i' +p11 +g5 +sS'model.in' p12 -g7 +g8 sS'y' p13 -g7 +g5 sS'x' p14 -g4 +g8 sS'model' p15 S'object' p16 sS'typ' p17 -g7 +g5 s.
\ No newline at end of file diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 29e03a50..1b089e62 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -3,7 +3,7 @@ function TrigFun() { TrigFun.prototype.define = function TrigFun() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["sin_blk"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -23,10 +23,7 @@ function TrigFun() { TrigFun.prototype.set = function TrigFun() { this.fun = arguments[0]["fun"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]]; var PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]]; while (true) { diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index 08bf3277..983ac5a2 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -57,22 +57,22 @@ p17 sS'model.dep_ut' p18 g17 -sS'graphics' +sS'model.in' p19 +g4 +sS'graphics' +p20 g8 sS'y' -p20 +p21 g17 sS'x' -p21 +p22 g4 sS'model' -p22 +p23 g8 sS'typ' -p23 -g17 -sS'model.out' p24 -g4 +g17 s.
\ No newline at end of file diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index c3b3fa93..a6ce11f9 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -4,7 +4,7 @@ function PDE() { this.model = scicos_model(); this.model.state = new ScilabDouble([zeros(10,1)]); this.model.sim = list(new ScilabString(["PDE"]), new ScilabDouble([0])); - this.model.in1 = new ScilabDouble([1],[1],[1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1],[1],[1]); this.model.out = new ScilabDouble([10],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); @@ -26,10 +26,7 @@ function PDE() { this.okk = parseBoolean(arguments[0]["okk"]) this.rdnom = arguments[0]["rdnom"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; var params_pde = label[1-1]; while (true) { [ln,fun]=where() diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index f9f438cf..d9e37bfa 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -53,33 +53,33 @@ g10 sS'ind4' p14 g2 -sS'model.in1' -p15 -g10 sS'ind1' -p16 +p15 g2 sS'ind2' -p17 +p16 g2 sS'type_meth' -p18 +p17 g2 sS'label' -p19 +p18 S'list' -p20 +p19 sS'rdnom' -p21 +p20 g2 sS'model.sim' -p22 -g20 +p21 +g19 sS'label[2-1]' -p23 +p22 NsS'model.state' -p24 +p23 g2 +sS'model.in' +p24 +g10 sS'delta' p25 g2 diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 257cff45..868cdb9c 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -9,7 +9,7 @@ function AFFICH_m() { this.in1 = [1,1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["affich2"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([this.in1[1-1][1-1]]); + this.model.in = new ScilabDouble([this.in1[1-1][1-1]]); this.model.in2 = new ScilabDouble([this.in1[1-1][2-1]]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); @@ -18,7 +18,7 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); - this.exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; + this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new AfficheBlock(this.x); @@ -47,10 +47,7 @@ function AFFICH_m() { this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,this.exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index f2197601..8e4f9dac 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -52,40 +52,40 @@ g7 sS'model.in2' p10 g7 -sS'model.in1' -p11 -g7 sS'x.graphics' -p12 +p11 g4 sS'nd' -p13 +p12 g7 sS'model.evtin' -p14 +p13 g7 sS'nt' -p15 +p14 g7 sS'model.firing' -p16 +p15 S'vector' -p17 +p16 sS'model.label' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'mess' -p22 +p21 g2 sS'in1' -p23 -g17 +p22 +g16 sS'fontsize' +p23 +g7 +sS'model.in' p24 g7 sS'graphics.exprs' @@ -95,26 +95,26 @@ p26 g2 sS'typ' p27 -g17 +g16 sS'ok' p28 S'boolean' p29 sS'model.blocktype' p30 -g19 +g18 sS'model.dep_ut' p31 -g17 +g16 sS'exprs' p32 g2 sS'gr_i' p33 -g17 +g16 sS'y' p34 -g17 +g16 sS'x' p35 g7 diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index c7f144bc..c4997f64 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -9,7 +9,7 @@ function BARXY() { this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5])); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); this.model.evtin = new ScilabDouble([1]); @@ -41,10 +41,7 @@ function BARXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.thickness = arguments[0]["thickness"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,this.exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 324d5e98..8f54bbe7 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -45,38 +45,38 @@ p8 sS'ymin' p9 g8 -sS'model.in1' +sS'model.intyp' p10 -S'matrix' -p11 +g5 sS'ymax' -p12 +p11 g8 sS'x.graphics' -p13 +p12 g2 sS'x.graphics.in_implicit' -p14 +p13 g5 sS'model.evtin' -p15 +p14 g5 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'mess' +p17 +S'matrix' p18 -g11 sS'x.graphics.out_implicit' p19 g5 -sS'model.intyp' -p20 -g5 sS'model.rpar' +p20 +g18 +sS'model.in' p21 -g11 +g18 sS'graphics.exprs' p22 NsS'model.ipar' @@ -100,7 +100,7 @@ sS'exprs' p30 NsS'x.graphics.exprs' p31 -g11 +g18 sS'xmax' p32 g8 diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 552889b4..5a80546d 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -14,7 +14,7 @@ function CANIMXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -60,10 +60,7 @@ function CANIMXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index 0a699534..8fa3a89c 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -59,62 +59,62 @@ p8 NsS'model.intyp' p9 g4 -sS'model.in1' -p10 -g4 sS'xmin' -p11 +p10 g2 sS'ymin' -p12 +p11 g2 sS'model.in2' -p13 +p12 g4 sS'graphics' -p14 +p13 S'object' -p15 +p14 sS'ymax' -p16 +p15 g2 sS'x.graphics' -p17 -g15 +p16 +g14 sS'siz' -p18 +p17 g2 sS'arg1' -p19 -g15 +p18 +g14 sS'model.evtin' -p20 +p19 g2 sS'model.firing' -p21 +p20 S'vector' -p22 +p21 sS'model.sim' -p23 +p22 S'list' -p24 +p23 sS'xmax' -p25 +p24 g2 sS'mess' -p26 +p25 g4 sS'in1' -p27 +p26 S'string' -p28 +p27 sS'in2' -p29 +p28 g2 sS'N' -p30 +p29 g2 sS'model.rpar' +p30 +g4 +sS'model.in' p31 g4 sS'graphics.exprs' @@ -124,35 +124,35 @@ p33 g4 sS'typ' p34 -g22 +g21 sS'ok' p35 S'boolean' p36 sS'model.blocktype' p37 -g28 +g27 sS'model.dep_ut' p38 -g22 +g21 sS'exprs' p39 g4 sS'gr_i' p40 -g22 +g21 sS'ipar' p41 g4 sS'y' p42 -g22 +g21 sS'x' p43 g2 sS'model' p44 -g15 +g14 sS'nbr_curves' p45 g2 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 9c481615..3e14c5a6 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -14,7 +14,7 @@ function CANIMXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); @@ -60,10 +60,7 @@ function CANIMXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index 7c476fb5..ba83184c 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -59,62 +59,62 @@ p8 NsS'model.intyp' p9 g2 -sS'model.in1' -p10 -g2 sS'model.in2' -p11 +p10 g2 sS'graphics' -p12 +p11 S'object' -p13 +p12 sS'x.graphics' -p14 -g13 +p13 +g12 sS'siz' -p15 +p14 g2 sS'vec_z' -p16 +p15 g2 sS'arg1' -p17 -g13 +p16 +g12 sS'model.evtin' -p18 +p17 g5 sS'model.firing' -p19 +p18 S'vector' -p20 +p19 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'mess' -p23 +p22 g2 sS'vec_x' -p24 +p23 g2 sS'vec_y' -p25 +p24 g2 sS'in1' -p26 +p25 S'string' -p27 +p26 sS'in2' -p28 +p27 g5 sS'N' -p29 +p28 g5 sS'size_siz' -p30 +p29 g5 sS'model.rpar' +p30 +g2 +sS'model.in' p31 g2 sS'graphics.exprs' @@ -124,38 +124,38 @@ p33 g2 sS'typ' p34 -g20 +g19 sS'ok' p35 S'boolean' p36 sS'model.blocktype' p37 -g27 +g26 sS'param3ds' p38 g2 sS'model.dep_ut' p39 -g20 +g19 sS'exprs' p40 g2 sS'gr_i' p41 -g20 +g19 sS'ipar' p42 g2 sS'y' p43 -g20 +g19 sS'x' p44 g5 sS'model' p45 -g13 +g12 sS'nbr_curves' p46 g5 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 499e2e08..68a84e58 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -41,10 +41,7 @@ function CEVENTSCOPE() { this.wdim = inverse(arguments[0]["wdim"]) this.per = parseFloat(arguments[0]["per"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),this.exprs); this.nclock = int(this.nclock); diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 48ed64d8..f9d59174 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -49,10 +49,7 @@ function CFSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.wu = arguments[0]["wu"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index 2d336c14..fc89a6e6 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -24,9 +24,6 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.set = function CLKOUTV_f() { this.prt = arguments[0]["prt"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),this.exprs); @@ -48,14 +45,11 @@ function CLKOUTV_f() { return new EventOutBlock(this.x); } CLKOUTV_f.prototype.getinputs = function CLKOUTV_f() { - var orig = arg1.graphics.orig; - var sz = arg1.graphics.sz; this.x = orig[1-1]+sz[1-1]/2; var y = orig[2-1]+sz[2-1]; var typ = -ones(this.x); } CLKOUTV_f.prototype.getorigin = function CLKOUTV_f() { - var tmpvar0 = standard_origin(arg1); this.x = tmpvar0[0]; var y = tmpvar0[1]; } @@ -67,10 +61,6 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.plot = function CLKOUTV_f() { var xf = 60; var yf = 40; - var orig = arg1.graphics.orig; - var sz = arg1.graphics.sz; - var orient = arg1.graphics.flip; - this.prt = arg1.model.ipar; var pat = xget("pattern"); xset("pattern",this.default_color[-1-1]); var thick = xget("thickness"); @@ -79,7 +69,6 @@ function CLKOUTV_f() { var y = orig[2-1]+sz[2-1]*[[0],[1/3],[1],[1],[1/3]]; var xo = orig[1-1]; var yo = orig[2-1]+sz[2-1]/3; - this.gr_i = arg1.graphics.gr_i; if (this.type[this.gr_i-1]==15) { var coli = this.gr_i[2-1]; var pcoli = xget("pattern"); @@ -96,7 +85,6 @@ function CLKOUTV_f() { xfpoly(in1.slice()[1-1]+ones(4,1)*(orig[1-1]+sz[1-1]/2),in1.slice()[2-1]+ones(4,1)*(orig[2-1]+sz[2-1]),1); xset("thickness",thick); xset("pattern",pat); - var ident = arg1.graphics.id; if (ident!=[]&&ident!="") { var font = xget("font"); xset("font",this.options.ID[1-1][1-1],this.options.ID[1-1][2-1]); diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 1dc5d670..95ee36ad 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -24,9 +24,6 @@ function CLKOUT_f() { CLKOUT_f.prototype.set = function CLKOUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 61bbdb86..2e58a087 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -11,7 +11,7 @@ function CMAT3D() { var size_y = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmat3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); @@ -44,10 +44,7 @@ function CMAT3D() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle index dbb67d12..a5ce2127 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -50,7 +50,7 @@ g2 sS'model.in2' p10 g2 -sS'model.in1' +sS'model.intyp' p11 g2 sS'x.graphics' @@ -70,15 +70,15 @@ sS'mess' p17 S'matrix' p18 -sS'model.intyp' -p19 -g2 sS'model.rpar' -p20 +p19 g18 sS'rpar' -p21 +p20 g18 +sS'model.in' +p21 +g2 sS'graphics.exprs' p22 NsS'model.ipar' diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index e9e77c5d..fe50b305 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -9,7 +9,7 @@ function CMATVIEW() { var beta_c = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmatview"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); @@ -38,10 +38,7 @@ function CMATVIEW() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index b5cb593d..7893017c 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -47,7 +47,7 @@ g2 sS'model.in2' p11 g2 -sS'model.in1' +sS'model.intyp' p12 g2 sS'x.graphics' @@ -70,15 +70,15 @@ sS'mess' p19 S'matrix' p20 -sS'model.intyp' -p21 -g2 sS'model.rpar' -p22 +p21 g20 sS'rpar' -p23 +p22 g20 +sS'model.in' +p23 +g2 sS'graphics.exprs' p24 NsS'model.ipar' diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index c4811853..924a4d4f 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -14,7 +14,7 @@ function CMSCOPE() { var period = transpose(this.per.slice()); this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(this.in1); + this.model.in = new ScilabDouble(this.in1); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -59,10 +59,7 @@ function CMSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 7daa4956..83f9f0b5 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -63,60 +63,60 @@ p10 g2 sS'x.model' p11 -NsS'model.intyp' +NsS'ymin' p12 g2 -sS'ymin' +sS'model.in2' p13 g2 -sS'model.in2' +sS'model.intyp' p14 g2 -sS'model.in1' -p15 -g2 sS'ymax' -p16 +p15 g2 sS'x.graphics' -p17 +p16 g7 sS'graphics.exprs' -p18 +p17 NsS'per' -p19 +p18 g2 sS'win' -p20 +p19 S'double' -p21 +p20 sS'model.evtin' -p22 -g21 +p21 +g20 sS'graphics.id' -p23 +p22 NsS'model.label' -p24 +p23 NsS'model.sim' -p25 +p24 S'list' -p26 +p25 sS'mess' -p27 +p26 g2 sS'in1' -p28 +p27 g2 sS'in2' -p29 -g21 +p28 +g20 sS'N' -p30 -g21 +p29 +g20 sS'yy' -p31 +p30 g2 sS'model.rpar' +p31 +g2 +sS'model.in' p32 g2 sS'wdim' @@ -130,7 +130,7 @@ p35 g4 sS'a' p36 -g21 +g20 sS'ok' p37 S'boolean' @@ -156,7 +156,7 @@ p45 g4 sS'x' p46 -g21 +g20 sS'model' p47 g7 diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index f708ea28..36819266 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -11,7 +11,7 @@ function CSCOPE() { this.per = 30; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscope"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); @@ -53,10 +53,7 @@ function CSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index 628431d5..a8fcda26 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -89,13 +89,13 @@ p21 sS'mess' p22 g2 -sS'model.in1' -p23 -g5 sS'model.rpar' -p24 +p23 g2 sS'N' +p24 +g5 +sS'model.in' p25 g5 sS'wdim' diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 7d104223..5bbc625d 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -14,7 +14,7 @@ function CSCOPXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -59,10 +59,7 @@ function CSCOPXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index f16dc117..98585da1 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -59,58 +59,58 @@ p8 NsS'model.intyp' p9 g4 -sS'model.in1' -p10 -g4 sS'xmin' -p11 +p10 g2 sS'ymin' -p12 +p11 g2 sS'model.in2' -p13 +p12 g4 sS'graphics' -p14 +p13 S'object' -p15 +p14 sS'ymax' -p16 +p15 g2 sS'x.graphics' -p17 -g15 +p16 +g14 sS'siz' -p18 +p17 g2 sS'arg1' -p19 -g15 +p18 +g14 sS'model.evtin' -p20 +p19 g2 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'xmax' -p23 +p22 g2 sS'mess' -p24 +p23 g4 sS'in1' -p25 +p24 S'string' -p26 +p25 sS'in2' -p27 +p26 g2 sS'N' -p28 +p27 g2 sS'model.rpar' +p28 +g4 +sS'model.in' p29 g4 sS'graphics.exprs' @@ -128,7 +128,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g26 +g25 sS'model.dep_ut' p37 g33 @@ -149,7 +149,7 @@ p42 g2 sS'model' p43 -g15 +g14 sS'nbr_curves' p44 g2 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index ba2eb57d..e4995638 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -14,7 +14,7 @@ function CSCOPXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -59,10 +59,7 @@ function CSCOPXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index 891332f9..ae5afc50 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -59,58 +59,58 @@ p8 NsS'model.intyp' p9 g2 -sS'model.in1' -p10 -g2 sS'model.in2' -p11 +p10 g2 sS'graphics' -p12 +p11 S'object' -p13 +p12 sS'x.graphics' -p14 -g13 +p13 +g12 sS'siz' -p15 +p14 g2 sS'vec_z' -p16 +p15 g2 sS'arg1' -p17 -g13 +p16 +g12 sS'model.evtin' -p18 +p17 g5 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'mess' -p21 +p20 g2 sS'vec_x' -p22 +p21 g2 sS'vec_y' -p23 +p22 g2 sS'in1' -p24 +p23 S'string' -p25 +p24 sS'in2' -p26 +p25 g5 sS'N' -p27 +p26 g5 sS'size_siz' -p28 +p27 g5 sS'model.rpar' +p28 +g2 +sS'model.in' p29 g2 sS'graphics.exprs' @@ -128,7 +128,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g25 +g24 sS'param3ds' p37 g2 @@ -152,7 +152,7 @@ p43 g5 sS'model' p44 -g13 +g12 sS'nbr_curves' p45 g5 diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index de52222b..ab05fc00 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -2,7 +2,7 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.define = function OUTIMPL_f() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.prt = 1; this.model.sim = new ScilabString(["outimpl"]); @@ -30,10 +30,7 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.set = function OUTIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; } diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index 394f3d4f..a6a25290 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -39,24 +39,24 @@ sS'model.in2' p9 S'vector' p10 -sS'model.in1' -p11 -g10 sS'x.graphics' -p12 +p11 g2 sS'mo.inputs' -p13 +p12 g5 sS'x.graphics.in_implicit' -p14 +p13 g10 sS'model.sim' -p15 +p14 g5 sS'model.equations' -p16 +p15 g7 +sS'model.in' +p16 +g10 sS'graphics.exprs' p17 g7 diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 968ceb1b..e6dc0e39 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -5,7 +5,7 @@ function OUT_f() { this.prt = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["output"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([this.prt]); @@ -27,9 +27,6 @@ function OUT_f() { OUT_f.prototype.set = function OUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index 44e3674f..03c970ad 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -25,7 +25,7 @@ sS'model.sim' p3 S'string' p4 -sS'model.in1' +sS'model.intyp' p5 g2 sS'model.blocktype' @@ -41,30 +41,30 @@ p9 sS'graphics.exprs' p10 g2 -sS'model.intyp' -p11 -g2 sS'model.dep_ut' -p12 +p11 S'vector' -p13 +p12 sS'n' -p14 +p13 g2 sS'exprs' -p15 +p14 g4 sS'x.model' -p16 +p15 NsS'gr_i' +p16 +g12 +sS'model.in' p17 -g13 +g2 sS'graphics' p18 g9 sS'y' p19 -g13 +g12 sS'x' p20 g2 @@ -76,7 +76,7 @@ p22 g2 sS'typ' p23 -g13 +g12 sS'x.graphics' p24 g9 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 8ebbb85e..7dae3640 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -7,7 +7,7 @@ function TOWS_c() { this.herit = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tows_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([]); @@ -39,9 +39,6 @@ function TOWS_c() { this.varnam = arguments[0]["varnam"] this.herit = parseFloat(arguments[0]["herit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.nz,this.varnam,this.herit,this.exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),this.exprs); diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 458ab931..b2ec6996 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -47,9 +47,9 @@ p10 sS'model.in2' p11 g5 -sS'model.in1' +sS'model.intyp' p12 -g8 +g5 sS'herit' p13 g5 @@ -78,10 +78,10 @@ p21 sS'model.evtout' p22 g8 -sS'model.intyp' -p23 -g5 sS'model.rpar' +p23 +g8 +sS'model.in' p24 g8 sS'graphics.exprs' diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 7ef3e6ad..b57a85ea 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -4,7 +4,7 @@ function TRASH_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["trash"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); @@ -22,7 +22,6 @@ function TRASH_f() { return options; } TRASH_f.prototype.set = function TRASH_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle index 12da9c14..606695ab 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_f.pickle @@ -19,40 +19,40 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'exprs' -p6 +p4 g2 sS'in1' -p7 -g4 +p5 +S'double' +p6 sS'model.dep_ut' -p8 +p7 S'vector' -p9 +p8 sS'model.evtin' -p10 -g4 +p9 +g6 sS'gr_i' +p10 +g8 +sS'model.in' p11 -g9 +g6 sS'y' p12 -g9 +g8 sS'x' p13 -g4 +g6 sS'model' p14 S'object' p15 sS'typ' p16 -g9 +g8 s.
\ No newline at end of file diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 62ea59fb..5e2ced67 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -9,7 +9,7 @@ function WFILE_f() { this.N = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["writef"]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); @@ -42,11 +42,7 @@ function WFILE_f() { var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); - warnBlockByUID(arg1.model.label,warnXcosMessage); - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; var lunit = dstate[2-1]; var fname = this.exprs[2-1]; @@ -93,7 +89,7 @@ function WFILE_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabDouble([true,false]); diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index 2a1970d6..fafc1645 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -73,10 +73,10 @@ g15 sS'nin' p19 g11 -sS'model.in1' +sS'in1' p20 g11 -sS'in1' +sS'N' p21 g11 sS'warnAdvise' @@ -85,37 +85,37 @@ g11 sS'warnXcosMessage' p23 g11 -sS'graphics' +sS'model.in' p24 +g11 +sS'graphics' +p25 g4 sS'model.ipar' -p25 +p26 g2 sS'typ' -p26 +p27 g9 sS'arg1.model' -p27 +p28 g4 sS'ok' -p28 -S'boolean' p29 -sS'model.blocktype' +S'boolean' p30 +sS'model.blocktype' +p31 g15 sS'frmt1' -p31 +p32 g11 sS'fname1' -p32 +p33 g11 sS'exprs' -p33 -g2 -sS'N' p34 -g11 +g2 sS'gr_i' p35 g9 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index d9bfa994..9cfcc038 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -10,7 +10,7 @@ function WRITEAU_f() { this.N = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["writeau"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); @@ -35,10 +35,7 @@ function WRITEAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -66,7 +63,7 @@ function WRITEAU_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.graphics.exprs = new ScilabDouble([this.exprs]); diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index f3a19a0a..83272f8a 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -44,42 +44,42 @@ sS'model.dep_ut' p8 S'vector' p9 -sS'model.in1' -p10 -S'double' -p11 sS'x.graphics' -p12 +p10 g4 sS'lunit' -p13 -g11 +p11 +S'double' +p12 sS'swap' -p14 -g11 +p13 +g12 sS'fname' -p15 +p14 S'string' -p16 +p15 sS'frmt' -p17 -g16 +p16 +g15 sS'model.evtin' -p18 -g11 +p17 +g12 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'nin' -p21 -g11 +p20 +g12 sS'in1' -p22 -g11 +p21 +g12 sS'N' +p22 +g12 +sS'model.in' p23 -g11 +g12 sS'graphics.exprs' p24 NsS'model.ipar' @@ -94,13 +94,13 @@ S'boolean' p28 sS'model.blocktype' p29 -g16 +g15 sS'frmt1' p30 -g16 +g15 sS'fname1' p31 -g16 +g15 sS'exprs' p32 g9 @@ -115,7 +115,7 @@ p35 g9 sS'x' p36 -g11 +g12 sS'model' p37 g4 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 358c89bc..1a602fa9 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -10,7 +10,7 @@ function WRITEC_f() { this.N = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["writec"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); @@ -41,10 +41,7 @@ function WRITEC_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -96,7 +93,7 @@ function WRITEC_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.graphics.exprs = new ScilabDouble([this.exprs]); diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index b482fa90..9ff122d1 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -52,45 +52,45 @@ sS'model.dep_ut' p8 S'vector' p9 -sS'model.in1' -p10 -S'double' -p11 sS'x.graphics' -p12 +p10 g4 sS'lunit' -p13 -g11 +p11 +S'double' +p12 sS'swap' -p14 -g11 +p13 +g12 sS'fname' -p15 +p14 S'string' -p16 +p15 sS'frmt' -p17 -g16 +p16 +g15 sS'model.evtin' -p18 -g11 +p17 +g12 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'nin' -p21 -g11 +p20 +g12 sS'fmts' -p22 +p21 g9 sS'in1' -p23 -g11 +p22 +g12 sS'N' +p23 +g12 +sS'model.in' p24 -g11 +g12 sS'graphics.exprs' p25 NsS'model.ipar' @@ -105,13 +105,13 @@ S'boolean' p29 sS'model.blocktype' p30 -g16 +g15 sS'frmt1' p31 -g16 +g15 sS'fname1' p32 -g11 +g12 sS'exprs' p33 g2 @@ -126,7 +126,7 @@ p36 g9 sS'x' p37 -g11 +g12 sS'model' p38 g4 diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index a36af2c0..ed031ea4 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -25,9 +25,6 @@ function CLKINV_f() { CLKINV_f.prototype.set = function CLKINV_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 7d77c8f0..e5928680 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -24,9 +24,6 @@ function CLKIN_f() { CLKIN_f.prototype.set = function CLKIN_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 259f09de..a967cc83 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -56,15 +56,12 @@ function CLOCK_c() { this.dt = arguments[0]["dt"] this.t0 = arguments[0]["t0"] this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; @@ -84,7 +81,6 @@ function CLOCK_c() { this.model.rpar = new ScilabDouble([this.dt],[this.t0]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -96,7 +92,6 @@ function CLOCK_c() { } else { var needcompile = 0; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index 8783f17d..3fb2bb94 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -56,15 +56,12 @@ function CLOCK_f() { this.dt = arguments[0]["dt"] this.t0 = arguments[0]["t0"] this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; @@ -84,7 +81,6 @@ function CLOCK_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -96,7 +92,6 @@ function CLOCK_f() { } else { var needcompile = 0; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index f3a25e18..b48b2892 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -4,7 +4,7 @@ function CONST() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); @@ -25,10 +25,7 @@ function CONST() { CONST.prototype.set = function CONST() { this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle index 4820fb4d..79e16740 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -43,27 +43,27 @@ g2 sS'model.rpar' p11 g2 -sS'model.in1' -p12 -S'vector' -p13 sS'exprs' -p14 +p12 g2 sS'x.model' -p15 +p13 NsS'gr_i' -p16 -g13 +p14 +S'vector' +p15 sS'model.dep_ut' +p16 +g15 +sS'model.in' p17 -g13 +g15 sS'graphics' p18 g7 sS'y' p19 -g13 +g15 sS'x' p20 g2 @@ -76,7 +76,7 @@ S'list' p23 sS'typ' p24 -g13 +g15 sS'nout' p25 g2 diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 518831b3..f86e6d30 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -4,7 +4,7 @@ function CONST_f() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); @@ -25,10 +25,7 @@ function CONST_f() { CONST_f.prototype.set = function CONST_f() { this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle index 473b5774..4f742b51 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -44,27 +44,27 @@ g4 sS'model.rpar' p12 g4 -sS'model.in1' -p13 -S'vector' -p14 sS'exprs' -p15 +p13 g4 sS'x.model' -p16 +p14 NsS'gr_i' -p17 -g14 +p15 +S'vector' +p16 sS'model.dep_ut' +p17 +g16 +sS'model.in' p18 -g14 +g16 sS'graphics' p19 g8 sS'y' p20 -g14 +g16 sS'x' p21 g4 @@ -73,7 +73,7 @@ p22 g8 sS'typ' p23 -g14 +g16 sS'nout' p24 g4 diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index ea17b2c4..12236b48 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -4,7 +4,7 @@ function CONST_m() { this.C = [1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([size(this.C,1)]); this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([size(this.C,2)]); @@ -28,10 +28,7 @@ function CONST_m() { CONST_m.prototype.set = function CONST_m() { this.C = inverse(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index 5ada7cb9..550ae682 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -36,23 +36,23 @@ sS'model.in2' p7 S'vector' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'model.sim' -p11 +p10 S'list' -p12 +p11 sS'C' -p13 +p12 g8 sS'model.out2' -p14 +p13 g6 sS'model.rpar' +p14 +g8 +sS'model.in' p15 g8 sS'graphics.exprs' @@ -62,7 +62,7 @@ p17 g8 sS'model.opar' p18 -g12 +g11 sS'ok' p19 S'boolean' diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 3bd5134d..47ca2a52 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -9,7 +9,7 @@ function CURVE_c() { this.PeriodicOption = "y"; var Graf = "n"; this.model.sim = list(new ScilabString(["curve_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[1]); @@ -43,9 +43,6 @@ function CURVE_c() { this.PeriodicOption = arguments[0]["PeriodicOption"] this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index c186f931..7db8558b 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -649,105 +649,105 @@ p172 NsS'XMX' p173 g7 -sS'graphics' +sS'model.in' p174 +g2 +sS'graphics' +p175 g74 sS'Exitm' -p175 +p176 g4 sS'N2' -p176 +p177 g7 sS'model.ipar' -p177 +p178 g26 sS'Pw3' -p178 +p179 g2 sS'f' -p179 +p180 g7 sS'a.grid' -p180 +p181 g2 sS'y[N-1]' -p181 +p182 g7 sS'xy[zz-1].slice()' -p182 +p183 g2 sS'gr_i' -p183 +p184 g2 sS'ipar' -p184 +p185 g2 sS'ystC' -p185 +p186 g4 sS'mtd' -p186 +p187 g7 sS'PERIODIC' -p187 +p188 g4 sS'xmx1' -p188 +p189 g7 sS'scam' -p189 +p190 g4 sS'exprs[4-1]' -p190 +p191 g4 sS'ans0' -p191 +p192 g4 sS'ymn1' -p192 +p193 g7 sS't1' -p193 +p194 g4 sS'model.evtout' -p194 +p195 g7 sS'rpar' -p195 +p196 g2 sS'lx11' -p196 +p197 g7 sS'model.out' -p197 +p198 g7 sS'Bias3' -p198 +p199 g2 sS'Tp3' -p199 +p200 g2 sS'np5' -p200 +p201 g2 sS'np4' -p201 +p202 g2 sS'rectx' -p202 +p203 g7 sS'np1' -p203 +p204 g7 sS'Lx' -p204 +p205 g7 sS'x21' -p205 -g4 -sS'model.in1' p206 -g2 +g4 sS'x[k-1]' p207 g2 diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index c7e3fd39..2dcaa156 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -9,7 +9,7 @@ function CURV_f() { var rpar = [[xx],[yy],[rect.slice()]]; this.model = scicos_model(); this.model.sim = new ScilabString(["intplt"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([xx],[yy],[rect.slice()]); this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); @@ -28,9 +28,6 @@ function CURV_f() { return options; } CURV_f.prototype.set = function CURV_f() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var rpar = this.model.rpar; var ipar = this.model.ipar; var n = ipar[1-1]; diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle index 3d37146b..56f1b102 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_f.pickle @@ -34,28 +34,28 @@ sS'model.out' p8 S'double' p9 -sS'model.in1' +sS'x.graphics' p10 -S'vector' +NsS'model.firing' p11 -sS'x.graphics' +S'vector' p12 -NsS'model.firing' -p13 -g11 sS'model.sim' -p14 +p13 S'string' -p15 +p14 sS'axisdata' -p16 +p15 g4 sS'model.rpar' -p17 +p16 g4 sS'yy' -p18 +p17 g4 +sS'model.in' +p18 +g12 sS'graphics' p19 NsS'model.ipar' @@ -63,35 +63,35 @@ p20 g4 sS'typ' p21 -g11 +g12 sS'rect' p22 -g11 +g12 sS'ok' p23 S'boolean' p24 sS'model.blocktype' p25 -g15 +g14 sS'xx' p26 g4 sS'model.dep_ut' p27 -g11 +g12 sS'n' p28 g9 sS'gr_i' p29 -g11 +g12 sS'ipar' p30 g4 sS'y' p31 -g11 +g12 sS'x' p32 g9 diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 26085612..d0e462d0 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -34,10 +34,7 @@ function Counter() { this.maxim = parseFloat(arguments[0]["maxim"]) this.rule = parseFloat(arguments[0]["rule"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 2c8e6e64..1489096a 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -20,8 +20,6 @@ function FROMWSB() { return options; } FROMWSB.prototype.set = function FROMWSB() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="FROMWS_c") { var ppath = list(i); break; @@ -38,20 +36,19 @@ function FROMWSB() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (!isequalbitwise(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -80,12 +77,10 @@ function FROMWSB() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 02a6c352..85acbda6 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -39,10 +39,7 @@ function FROMWS_c() { this.ZC = parseFloat(arguments[0]["ZC"]) this.OutEnd = parseFloat(arguments[0]["OutEnd"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 9a9f29eb..e99e4566 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -4,7 +4,7 @@ function GENSIN_f() { var rpar = [[1],[1],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["gensin"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -32,10 +32,7 @@ function GENSIN_f() { this.F = arguments[0]["F"] this.P = arguments[0]["P"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index 2043a20b..222abe50 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -25,28 +25,28 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 -S'vector' +S'double' p4 sS'ok' p5 S'boolean' p6 -sS'model.blocktype' +sS'model.in' p7 -g2 -sS'x.graphics' +S'vector' p8 -S'object' +sS'x.graphics' p9 -sS'arg1' +S'object' p10 -g9 -sS'model.out2' +sS'arg1' p11 -S'double' +g10 +sS'model.out2' p12 +g4 sS'model.rpar' p13 S'matrix' @@ -61,31 +61,31 @@ sS'x.model' p17 NsS'gr_i' p18 -g4 +g8 sS'model.dep_ut' p19 -g4 +g8 sS'graphics.exprs' p20 NsS'graphics' p21 -g9 +g10 sS'y' p22 -g4 +g8 sS'x' p23 -g12 +g4 sS'model' p24 -g9 +g10 sS'typ' p25 -g4 +g8 sS'model.outtyp' p26 -g12 -sS'model.out' +g4 +sS'model.blocktype' p27 -g12 +g2 s.
\ No newline at end of file diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 162dbe83..9d78b143 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -28,10 +28,7 @@ function GENSQR_f() { GENSQR_f.prototype.set = function GENSQR_f() { this.Amplitude = parseFloat(arguments[0]["Amplitude"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index f119e1dc..41a6cbeb 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -20,7 +20,7 @@ function GEN_SQR() { scs_m_1.objs[16-1] = scicos_link(xx=[[48.313686],[48.229901]],yy=[[403.57431],[385.21998]],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[1,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -65,16 +65,13 @@ function GEN_SQR() { scicos_context.F = arguments[0]["scicos_context.F"] this.exprs = arguments[0]["exprs"] var y = this.needcompile; - arg1.model.ipar = 1; var typ = list(); - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; var Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; var Ss = list("mat",[-1,-1],"mat",[-1,-1],"pol",-1,"pol",-1); var scicos_context = struct(); - this.x = arg1; var ok = false; while (!ok) { [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index fce61f2d..42a37c4c 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -87,9 +87,9 @@ g4 sS'model.in2' p24 g7 -sS'model.in1' +sS'model.intyp' p25 -g7 +g4 sS'model.nzcross' p26 g4 @@ -154,21 +154,21 @@ g4 sS'sblock' p47 g9 -sS'model.intyp' +sS'model.nmode' p48 g4 sS'model.rpar' p49 g4 -sS'model.nmode' -p50 -g4 sS'scs_m_1.objs[4-1]' -p51 +p50 g4 sS'sblock.props' -p52 +p51 g9 +sS'model.in' +p52 +g7 sS'graphics' p53 g9 diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index b30d73e8..a87dfdbf 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -4,7 +4,7 @@ function Ground_g() { var C = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([1]); @@ -27,7 +27,6 @@ function Ground_g() { return options; } Ground_g.prototype.set = function Ground_g() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle index 12e7a77c..5d502d5e 100644 --- a/js/Sources/Ground_g.pickle +++ b/js/Sources/Ground_g.pickle @@ -37,22 +37,22 @@ sS'model.out2' p9 S'double' p10 -sS'model.in1' -p11 -g4 sS'model.rpar' -p12 +p11 g4 sS'model.opar' -p13 +p12 g2 sS'model.out' -p14 +p13 g10 sS'gr_i' -p15 +p14 g4 sS'model.dep_ut' +p15 +g4 +sS'model.in' p16 g4 sS'y' diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 75664e3c..c5260693 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -30,10 +30,7 @@ function INIMPL_f() { INIMPL_f.prototype.set = function INIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; } diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 6ff481fa..2437d88b 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -24,9 +24,6 @@ function IN_f() { return options; } IN_f.prototype.set = function IN_f() { - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 22d253bb..f9d34251 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -30,10 +30,7 @@ function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); this.ini_c = int(this.ini_c); diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 796d4e50..4d79196d 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -15,7 +15,7 @@ function PULSE_SC() { scs_m_1.objs[11-1] = scicos_link(xx=[[154.57795],[174.57795]],yy=[[206.09381],[206.09381]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -60,16 +60,13 @@ function PULSE_SC() { scicos_context.A = arguments[0]["scicos_context.A"] this.exprs = arguments[0]["exprs"] var y = this.needcompile; - arg1.model.ipar = 1; var typ = list(); - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; var Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; var Ss = list("pol",-1,"pol",-1,"pol",-1,"mat",[-1,-1]); var scicos_context = struct(); - this.x = arg1; var ok = false; while (!ok) { [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 7cd361a3..91045067 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -40,109 +40,109 @@ sS'model.dstate' p6 S'vector' p7 -sS'arg1' +sS'W' p8 -S'object' +g4 +sS'arg1' p9 -sS'scs_m_1.objs[6-1]' +S'object' p10 +sS'scs_m_1.objs[6-1]' +p11 g4 sS'scs_m_1.objs[5-1]' -p11 +p12 g4 sS'scs_m_1.objs[3-1]' -p12 +p13 g4 sS'scicos_context' -p13 +p14 g4 sS'model.out' -p14 +p15 g4 sS'x.model' -p15 -g9 -sS'scs_m_1.objs[9-1]' p16 +g10 +sS'scs_m_1.objs[9-1]' +p17 g4 sS'x.model.rpar' -p17 -g9 -sS'Btitre' p18 -S'string' +g10 +sS'Btitre' p19 -sS'E' +S'string' p20 +sS'E' +p21 g4 sS'scs_m_1.objs[11-1]' -p21 +p22 g4 sS'model.in2' -p22 -g7 -sS'model.in1' p23 g7 -sS'model.nzcross' +sS'model.intyp' p24 g4 -sS'model.opar' +sS'model.nzcross' p25 +g4 +sS'model.opar' +p26 g2 sS'gr_i' -p26 +p27 g7 sS'scs_m_1' -p27 +p28 g4 sS'model.evtin' -p28 +p29 g7 sS'scs_m_1.objs[2-1]' -p29 +p30 g4 sS'model.label' -p30 -g19 -sS'model.sim' p31 -g19 -sS'model.evtout' +g20 +sS'model.sim' p32 +g20 +sS'model.evtout' +p33 g7 sS'model.equations' -p33 +p34 g2 sS'scs_m_1.objs[8-1]' -p34 +p35 g4 sS'scs_m_1.objs[10-1]' -p35 +p36 g4 sS'F' -p36 +p37 g4 sS'Ss' -p37 +p38 g2 sS'Exprs0' -p38 -S'matrix' p39 -sS'model.out2' +S'matrix' p40 +sS'model.out2' +p41 g4 sS'sblock' -p41 -g9 -sS'model.intyp' p42 -g4 -sS'model.rpar' +g10 +sS'model.nmode' p43 g4 -sS'model.nmode' +sS'model.rpar' p44 g4 sS'scs_m_1.objs[4-1]' @@ -150,13 +150,13 @@ p45 g4 sS'sblock.props' p46 -g9 -sS'W' +g10 +sS'model.in' p47 -g4 +g7 sS'graphics' p48 -g9 +g10 sS'scs_m_1.objs[7-1]' p49 g4 @@ -171,14 +171,14 @@ p52 g4 sS'Bitems' p53 -g39 +g40 sS'ok' p54 S'boolean' p55 sS'model.blocktype' p56 -g19 +g20 sS'scs_m_1.objs[1-1]' p57 g4 @@ -204,7 +204,7 @@ p64 g4 sS'model' p65 -g9 +g10 sS'model.state' p66 g7 diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 3ac0a879..5d1ffec1 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -7,7 +7,7 @@ function RAMP() { var rpar = [[this.slope],[this.stt],[this.iout]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ramp"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -35,10 +35,7 @@ function RAMP() { this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index ec96548a..9b83ecf6 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -41,31 +41,31 @@ p8 NsS'model.out' p9 g2 -sS'model.in1' -p10 -S'vector' -p11 sS'x.graphics' -p12 +p10 g4 sS'model.nzcross' -p13 +p11 g2 sS'model.sim' -p14 +p12 S'list' -p15 +p13 sS'model.nmode' -p16 +p14 g2 sS'model.rpar' -p17 +p15 g7 +sS'model.in' +p16 +S'vector' +p17 sS'graphics.exprs' p18 NsS'typ' p19 -g11 +g17 sS'model.blocktype' p20 S'string' @@ -75,19 +75,19 @@ p22 g2 sS'model.dep_ut' p23 -g11 +g17 sS'stt' p24 g2 sS'exprs' p25 -g11 +g17 sS'gr_i' p26 -g11 +g17 sS'y' p27 -g11 +g17 sS'x' p28 g2 diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 73084f93..1c215505 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -38,10 +38,7 @@ function RAND_f() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==5) { this.exprs = this.exprs.slice(1-1,3); } diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 56333efc..c4c64ea4 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -9,7 +9,7 @@ function RAND_m() { var funtyp = 4; this.model = scicos_model(); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); @@ -49,10 +49,7 @@ function RAND_m() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==14) { this.exprs[9-1] = []; } diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index bd5f8157..7e5ecfa1 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -52,7 +52,7 @@ sS'model.in2' p11 S'vector' p12 -sS'model.in1' +sS'model.intyp' p13 g12 sS'x.graphics' @@ -81,19 +81,19 @@ g12 sS'model.out2' p23 g8 -sS'model.intyp' -p24 -g12 sS'model.rpar' -p25 +p24 g12 sS'model.outtyp' -p26 +p25 g8 sS'flag' -p27 +p26 g8 sS'model.state' +p27 +g12 +sS'model.in' p28 g12 sS'graphics.exprs' diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 76498f48..1cb14586 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -41,10 +41,7 @@ function READAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 0e72d59d..9020963e 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -55,9 +55,7 @@ function READC_f() { this.offset = parseFloat(arguments[0]["offset"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; this.model = this.x.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 4cc3f634..31d3047b 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -45,10 +45,7 @@ function RFILE_f() { this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; var ipar = this.model.ipar; var ievt = ipar[3-1]; diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 2cfae4d2..313fc0cc 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -22,7 +22,6 @@ function SAWTOOTH_f() { return options; } SAWTOOTH_f.prototype.set = function SAWTOOTH_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index c5d93cd3..7322169b 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -34,10 +34,7 @@ function STEP() { this.in1 = arguments[0]["in1"] this.fi = arguments[0]["fi"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 5d81952f..af1f38d7 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -60,8 +60,6 @@ function STEP_FUNCTION() { return options; } STEP_FUNCTION.prototype.set = function STEP_FUNCTION() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="STEP") { var ppath = list(i); break; @@ -77,14 +75,13 @@ function STEP_FUNCTION() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { @@ -116,11 +113,9 @@ function STEP_FUNCTION() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; } } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 4fe2eb15..4c5c67f3 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -26,9 +26,6 @@ function SampleCLK() { this.frequ = arguments[0]["frequ"] this.offset = arguments[0]["offset"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs); diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index 96c8d9b7..c8f61747 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -25,8 +25,6 @@ function Sigbuilder() { } Sigbuilder.prototype.set = function Sigbuilder() { var ppath = list(0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="CURVE_c") { ppath[1-1] = i; break; @@ -43,20 +41,19 @@ function Sigbuilder() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -85,12 +82,10 @@ function Sigbuilder() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; this.y = max(this.y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 1cb47909..7cc4ac99 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -19,7 +19,6 @@ function TIME_f() { return options; } TIME_f.prototype.set = function TIME_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index ec4bba02..2b93dbf4 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -32,10 +32,7 @@ function TKSCALE() { this.b = parseFloat(arguments[0]["b"]) this.f = parseFloat(arguments[0]["f"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs); if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 210e3760..0eaab256 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -7,7 +7,7 @@ function GENERAL_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); this.model.nzcross = new ScilabDouble([this.in1]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.rpar = new ScilabDouble([0],[0],[0],[0]); this.model.blocktype = new ScilabString(["z"]); @@ -32,12 +32,9 @@ function GENERAL_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.out = parseFloat(arguments[0]["out"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; - this.in1 = this.model.in1; + this.in1 = this.model.in; this.out = this.model.evtout; var nin = sum(this.in1); var nout = sum(this.out); diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle index 6b56ff54..877fbe9c 100644 --- a/js/Threshold/GENERAL_f.pickle +++ b/js/Threshold/GENERAL_f.pickle @@ -42,41 +42,41 @@ p9 g8 sS'nin1' p10 -NsS'model.in1' +NsS'rp' p11 g8 -sS'rp' -p12 -g8 sS'x.graphics' -p13 +p12 g2 sS'typ' -p14 +p13 S'vector' -p15 +p14 sS'model.firing' -p16 +p15 g8 sS'model.sim' -p17 +p16 S'list' -p18 +p17 sS'model.evtout' -p19 +p18 g8 sS'nin' -p20 +p19 g8 sS'rp.slice(1-1,nout1).slice(1-1,2*n)' -p21 +p20 g8 sS'in1' -p22 +p21 g8 sS'model.rpar' -p23 +p22 g5 +sS'model.in' +p23 +g8 sS'graphics.exprs' p24 NsS'nout1' @@ -90,7 +90,7 @@ S'string' p28 sS'model.dep_ut' p29 -g15 +g14 sS'n' p30 g8 @@ -99,10 +99,10 @@ p31 g5 sS'gr_i' p32 -g15 +g14 sS'y' p33 -g15 +g14 sS'x' p34 g8 diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 9079f107..1e5f07dc 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -4,7 +4,7 @@ function NEGTOPOS_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); this.model.nzcross = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]); this.model.blocktype = new ScilabString(["z"]); @@ -23,7 +23,6 @@ function NEGTOPOS_f() { return options; } NEGTOPOS_f.prototype.set = function NEGTOPOS_f() { - this.x = arg1; this.x.model.firing = -1; return new BasicBlock(this.x); } diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle index c9626baf..0a4ba0f4 100644 --- a/js/Threshold/NEGTOPOS_f.pickle +++ b/js/Threshold/NEGTOPOS_f.pickle @@ -19,7 +19,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.evtout' p3 S'double' p4 @@ -33,23 +33,23 @@ g4 sS'model.nzcross' p8 g4 -sS'model.evtout' -p9 -g4 sS'model.rpar' -p10 +p9 S'matrix' -p11 +p10 sS'gr_i' -p12 +p11 S'vector' -p13 +p12 sS'model.dep_ut' +p13 +g12 +sS'model.in' p14 -g13 +g4 sS'y' p15 -g13 +g12 sS'x' p16 g4 @@ -59,7 +59,7 @@ S'object' p18 sS'typ' p19 -g13 +g12 sS'model.firing' p20 g4 diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index db0e654e..5cd1be0a 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -5,7 +5,7 @@ function POSTONEG_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); this.model.nzcross = new ScilabDouble([1]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]); this.model.blocktype = new ScilabString(["z"]); @@ -24,7 +24,6 @@ function POSTONEG_f() { return options; } POSTONEG_f.prototype.set = function POSTONEG_f() { - this.x = arg1; this.x.model.firing = [-1]; return new BasicBlock(this.x); } diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle index 6e98a2b8..761812c7 100644 --- a/js/Threshold/POSTONEG_f.pickle +++ b/js/Threshold/POSTONEG_f.pickle @@ -19,7 +19,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.evtout' p3 S'double' p4 @@ -34,22 +34,22 @@ p8 sS'model.nzcross' p9 g4 -sS'model.evtout' -p10 -g4 sS'model.rpar' -p11 +p10 S'matrix' -p12 +p11 sS'rpar' -p13 -g12 +p12 +g11 sS'gr_i' -p14 +p13 g8 sS'model.dep_ut' -p15 +p14 g8 +sS'model.in' +p15 +g4 sS'y' p16 g8 diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 288e89e9..1e6e117a 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -5,7 +5,7 @@ function ZCROSS_f() { this.in1 = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]); @@ -28,10 +28,7 @@ function ZCROSS_f() { ZCROSS_f.prototype.set = function ZCROSS_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),this.exprs); if (!ok) { @@ -47,7 +44,7 @@ function ZCROSS_f() { } this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]); this.graphics.exprs = new ScilabDouble([this.exprs]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.firing = new ScilabDouble([-1]); this.x.graphics = this.graphics; diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle index 95285053..71c16f55 100644 --- a/js/Threshold/ZCROSS_f.pickle +++ b/js/Threshold/ZCROSS_f.pickle @@ -30,38 +30,38 @@ S'matrix' p5 sS'x.model' p6 -NsS'model.in1' +NsS'x.graphics' p7 -S'double' -p8 -sS'x.graphics' -p9 g2 sS'typ' -p10 +p8 S'vector' -p11 +p9 sS'model.firing' -p12 -g8 +p10 +S'double' +p11 sS'model.sim' -p13 +p12 S'list' -p14 +p13 sS'model.evtout' -p15 -g8 +p14 +g11 sS'in1' -p16 -g8 +p15 +g11 sS'model.rpar' -p17 +p16 g5 +sS'model.in' +p17 +g11 sS'graphics.exprs' p18 NsS'model.nzcross' p19 -g8 +g11 sS'model.blocktype' p20 S'string' @@ -71,19 +71,19 @@ p22 g21 sS'model.dep_ut' p23 -g11 +g9 sS'exprs' p24 -g8 +g11 sS'gr_i' p25 -g11 +g9 sS'y' p26 -g11 +g9 sS'x' p27 -g8 +g11 sS'model' p28 g2 diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 5844b431..cdcb40ed 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -561,7 +561,7 @@ def p_modelvar_var(p): def p_modelvar_in(p): 'modelvar : IN' - p[0] = '%s1' % (p[1]) + p[0] = '%s' % (p[1]) def p_modelvar_modelvar_expression(p): 'modelvar : modelvar OPENBRACKET expression CLOSEBRACKET' @@ -1002,7 +1002,7 @@ def p_lterm_lterm_dot_var(p): def p_lterm_lterm_dot_in(p): 'lterm : lterm DOT IN' - p[0] = '%s.%s1' % (p[1], p[3]) + p[0] = '%s.%s' % (p[1], p[3]) def p_lterm_var(p): 'lterm : VAR' @@ -1239,7 +1239,7 @@ def p_termvar_termvar_dot_in(p): else: basevar = var add_object_var(basevar) - var = '%s.%s1' % (var, p[3]) + var = '%s.%s' % (var, p[3]) if var[:5] == 'this.': basevar = var[5:] else: |