diff options
Diffstat (limited to 'js')
333 files changed, 2348 insertions, 260 deletions
diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/CLKFROM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/CLKGOTO.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/DEMUX.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/DEMUX_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/ESELECT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/EXTRACTOR.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/FROM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/FROMMO.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/GOTO.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/GOTOMO.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/GotoTagVisibility.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/ISELECT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/ISELECT_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/MUX.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/MUX_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/M_SWITCH.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/NRMSOM_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/RELAY_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/SELECT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/SELECT_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle new file mode 100644 index 00000000..ad17cc4d --- /dev/null +++ b/js/Branching/SELF_SWITCH.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'stateOpen' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/SWITCH2.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/SWITCH2_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Branching/SWITCH_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/CCS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/CVS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Capacitor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/ConstantVoltage.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/CurrentSensor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Diode.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Ground.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Gyrator.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/IdealTransformer.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Inductor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/MOTOR.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/NMOS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/NPN.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/OpAmp.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/PMOS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/PNP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/PotentialSensor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Resistor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/SineVoltage.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/Switch.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/VVsourceAC.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/VariableResistor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/VoltageSensor.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Electrical/VsourceAC.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/ANDBLK.pickle b/js/Events/ANDBLK.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/ANDBLK.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/ANDLOG_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/CLKSOMV_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/CLKSOM_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/CLKSPLIT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/END_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/EVTDLY_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/EVTDLY_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/EVTGEN_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/EVTVARDLY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/HALT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/IFTHEL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index 1abf339a..8c13e714 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -84,8 +84,8 @@ newpar=list(); spath=list("model","rpar","objs",path); xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (or(xxn!=xx)) { -arg1[spath-1]=xxn; +if (or(this.xxn!=xx)) { +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; } x=arg1; diff --git a/js/Events/MCLOCK_f.pickle b/js/Events/MCLOCK_f.pickle new file mode 100644 index 00000000..349c1dad --- /dev/null +++ b/js/Events/MCLOCK_f.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'xxn' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/MFCLCK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 3e0299cb..c2853cdd 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -41,10 +41,10 @@ message("The |Offset| must be less than the Frequency"); ok=false; } if (ok) { -[m,den,off,count,m1,fir,frequ,offset,ok]=mfrequ_clk[frequ-1][offset-1]; +[m,den,off,count,m1,fir,frequ,offset,ok]=mfrequ_clk(frequ,offset); } if (ok) { -model.opar=list(m,double[den-1],off,count); +model.opar=list(m,double(den),off,count); mn=(2^size(m1,"*"))-1; [model,graphics,ok]=set_io(model,graphics,list(),list(),1,ones(mn,1)); if (mn>3) { diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle new file mode 100644 index 00000000..7d80f6e5 --- /dev/null +++ b/js/Events/M_freq.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'of' +p2 +aS'fr' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/VirtualCLK0.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index e66605dc..8a3d608a 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -173,7 +173,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Events/freq_div.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Hydraulics/Bache.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Hydraulics/Flowmeter.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Hydraulics/PerteDP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Hydraulics/PuitsP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Hydraulics/SourceP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Hydraulics/VanneReglante.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 0e1fd5ee..8b4d4858 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -9,7 +9,7 @@ model.out=1; model.out2=1; model.intyp=3; model.outtyp=3; -model.opar=list(int32[0-1]); +model.opar=list(int32(0)); model.blocktype="c"; model.dep_ut=[true,false]; exprs=[[sci2exp(3)],[sci2exp(0)]]; @@ -31,7 +31,7 @@ if (!ok) { break; } in1=[model.in1,model.in2]; -if (floor[bit-1]!=bit) { +if (floor(bit)!=bit) { block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter: %5.1f."),gettext("Index of Bit"),bit),gettext("Must be integer.")); ok=false; } else if ((Datatype==3)||(Datatype==6)) { @@ -39,9 +39,9 @@ if (bit>31||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 31]")); ok=false; } else { -bit=uint32[bit-1]; +bit=uint32(bit); n=(2^32-1)-2^bit; -n=uint32[n-1]; +n=uint32(n); model.sim=list("bit_clear_32",4); } } else if ((Datatype==4)||(Datatype==7)) { @@ -49,9 +49,9 @@ if (bit>15||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 15]")); ok=false; } else { -bit=uint16[bit-1]; +bit=uint16(bit); n=(2^16-1)-2^bit; -n=uint16[n-1]; +n=uint16(n); model.sim=list("bit_clear_16",4); } } else if ((Datatype==5)||(Datatype==8)) { @@ -59,9 +59,9 @@ if (bit>7||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 7]")); ok=false; } else { -bit=uint8[bit-1]; +bit=uint8(bit); n=(2^8-1)-2^bit; -n=uint8[n-1]; +n=uint8(n); model.sim=list("bit_clear_8",4); } } else { diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/BITCLEAR.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index c530967f..e3318fbe 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -9,7 +9,7 @@ model.out=1; model.out2=1; model.intyp=3; model.outtyp=3; -model.opar=list(uint32[0-1]); +model.opar=list(uint32(0)); model.blocktype="c"; model.dep_ut=[true,false]; exprs=[[sci2exp(3)],[sci2exp(0)]]; @@ -31,7 +31,7 @@ if (!ok) { break; } in1=[model.in1,model.in2]; -if (floor[bit-1]!=bit) { +if (floor(bit)!=bit) { block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter: %5.1f."),gettext("Index of Bit"),bit),gettext("Must be integer.")); ok=false; } @@ -40,27 +40,27 @@ if (bit>31||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 31]")); ok=false; } -bit=uint32[bit-1]; +bit=uint32(bit); n=2^bit; -n=uint32[n-1]; +n=uint32(n); model.sim=list("bit_set_32",4); } else if ((Datatype==4)||(Datatype==7)) { if (bit>15||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 15]")); ok=false; } -bit=uint16[bit-1]; +bit=uint16(bit); n=2^bit; -n=uint16[n-1]; +n=uint16(n); model.sim=list("bit_set_16",4); } else if ((Datatype==5)||(Datatype==8)) { if (bit>7||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 7]")); ok=false; } -bit=uint8[bit-1]; +bit=uint8(bit); n=2^bit; -n=uint8[n-1]; +n=uint8(n); model.sim=list("bit_set_8",4); } else { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),Datatype),msprintf(gettext("Must be in the interval %s."),"[3, 8]")); diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/BITSET.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/CONVERT.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index e2ac2535..dcf097e3 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -2,7 +2,7 @@ function DFLIPFLOP() { DFLIPFLOP.prototype.define = function DFLIPFLOP() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[[20],[20]],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8[0-1]),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[[20],[20]],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[239.98293,378.2166],sz=[60,60],flip=true,theta=0,exprs=[["1"],["1"]],pin=29,pout=[],pein=22,peout=[[16],[44]],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[[1],[1]],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=1,nmode=1,equations=list()),doc=list()); scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=[["2"],["1"],["5"],["0"]],pin=[[11],[39]],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[["E"],["E"]],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[[-1],[-1]],in2=[[-2],[-2]],intyp=[[5],[5]],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[[1],[0]],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=33,pein=42,peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 5dd1929c..00832d76 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -2,7 +2,7 @@ function DLATCH() { DLATCH.prototype.define = function DLATCH() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[[20],[20]],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8[0-1]),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[[20],[20]],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[233.37693,320.30536],sz=[60,60],flip=true,theta=0,exprs=[["0"],["1"]],pin=13,pout=[],pein=[],peout=[[6],[0]],gr_i=list([["txt=[\'If in>0\';\' \';\' then else\'];"],["xstringb(orig(1),orig(2),txt,sz(1),sz(2),\'fill\');"]],8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[[1],[1]],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=1,nmode=1,equations=list()),doc=list()); scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=[["2"],["1"],["5"],["0"]],pin=[[15],[7]],pout=5,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit=[["E"],["E"]],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[[-1],[-1]],in2=[[-2],[-2]],intyp=[[5],[5]],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[[1],[0]],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=9,pein=6,peout=[],gr_i=list("xstringb(orig(1),orig(2),\'S/H\',sz(1),sz(2),\'fill\')",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/DLATCH.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/INTMUL.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 69a012c4..1b2b9379 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -2,7 +2,7 @@ function JKFLIPFLOP() { JKFLIPFLOP.prototype.define = function JKFLIPFLOP() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[[0.0001],[0.000001],[1.000e-10],[100001],[0],[0],[0]],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=false,theta=0,exprs=[["int8(0)"],["1"]],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8[0-1]),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=false,theta=0,exprs=[["int8(0)"],["1"]],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[[0.0001],[0.000001],[1.000e-10],[100001],[0],[0],[0]],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); scs_m_1.objs[1-1]=scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="-1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=-1,opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=1,nmode=0,equations=list()),doc=list()); scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=[["0"],["0"]],pin=3,pout=[],pein=[],peout=[[7],[0]],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[[1],[1]],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); @@ -12,7 +12,7 @@ scs_m_1.objs[5-1]=scicos_link(xx=[[260.01488],[280.01488]],yy=[[277.1131],[277.1 scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[7-1]=scicos_link(xx=[[408.28869],[408.28869]],yy=[[241.39881],[211.39881]],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[6,1,1]); scs_m.objs[2-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[292.52452,323.54888],sz=[60,40],flip=true,theta=0,exprs=[],pin=14,pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[3-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=true,theta=0,exprs=[["[0;1;1;1;0;0;1;0]"],["0"]],pin=[[5],[16],[18]],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=[["E"],["E"],["E"]],out_implicit="E"),model=scicos_model(sim=list("logic",4),in1=[[1],[1],[1]],in2=[[1],[1],[1]],intyp=[[5],[5],[5]],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8[[[0],[1],[1],[1],[0],[0],[1],[0]]-1]),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[3-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=true,theta=0,exprs=[["[0;1;1;1;0;0;1;0]"],["0"]],pin=[[5],[16],[18]],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=[["E"],["E"],["E"]],out_implicit="E"),model=scicos_model(sim=list("logic",4),in1=[[1],[1],[1]],in2=[[1],[1],[1]],intyp=[[5],[5],[5]],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([[0],[1],[1],[1],[0],[0],[1],[0]])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[4-1]=scicos_link(xx=[[351.36756],[368.82793],[368.82793]],yy=[[222.52782],[222.52782],[223.06473]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]); scs_m.objs[5-1]=scicos_link(xx=[[291.39818],[274.18235],[274.18235],[294.2247]],yy=[[281.584],[281.584],[232.52782],[232.52782]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); scs_m.objs[6-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,243.45067],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=11,pout=[[7],[20]],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[["E"],["E"],["E"]]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[[-1],[-1],[-1]],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); @@ -70,9 +70,9 @@ if (!ok) { break; } if (init<=0) { -init=int8[0-1]; +init=int8(0); } else if (init>0) { -init=int8[1-1]; +init=int8(1); } if (ok) { xx.graphics.exprs[1-1]=exprs0; diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index aa41eb6e..06861382 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -11,7 +11,7 @@ model.out2=1; model.evtin=1; model.intyp=[5,5]; model.outtyp=5; -model.opar=list(int8[mat-1]); +model.opar=list(int8(mat)); model.blocktype="c"; model.firing=false; model.dep_ut=[true,false]; @@ -34,8 +34,8 @@ if (!ok) { break; } nout=size(mat,2); -nin=(log[size(mat,1)-1]/log[2-1]); -u1=floor[nin-1]; +nin=(log(size(mat,1))/log(2)); +u1=floor(nin); if ((u1!=nin)) { block_parameter_error(msprintf(gettext("Wrong size for \'%s\' parameter: %d."),gettext("Truth Table"),size(mat,1)),gettext("Number of rows must be a power of two.")); ok=false; @@ -55,7 +55,7 @@ ot=5*ones(1,nout); } if (ok) { graphics.exprs=exprs; -mat=int8[mat-1]; +mat=int8(mat); model.opar=list(mat); x.graphics=graphics; x.model=model; diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/LOGIC.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/SHIFT.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 4f2b33df..485eefad 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -2,8 +2,8 @@ function SRFLIPFLOP() { SRFLIPFLOP.prototype.define = function SRFLIPFLOP() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[[0.0001],[0.000001],[1.000e-10],[100001],[0],[0],[0]],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=[["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]"],["1"]],pin=[[4],[10],[12]],pout=[[3],[8]],pein=[],peout=[],gr_i=[],id="",in_implicit=[["E"],["E"],["E"]],out_implicit=[["E"],["E"]]),model=scicos_model(sim=list("logic",4),in1=[[1],[1],[1]],in2=[[1],[1],[1]],intyp=[[5],[5],[5]],out=[[1],[1]],out2=[[1],[1]],outtyp=[[5],[5]],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8[[[0,1],[1,0],[1,0],[1,0],[0,1],[0,1],[0,0],[0,0]]-1]),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=[["int8(0)"],["1"]],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8[0-1]),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=[["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]"],["1"]],pin=[[4],[10],[12]],pout=[[3],[8]],pein=[],peout=[],gr_i=[],id="",in_implicit=[["E"],["E"],["E"]],out_implicit=[["E"],["E"]]),model=scicos_model(sim=list("logic",4),in1=[[1],[1],[1]],in2=[[1],[1],[1]],intyp=[[5],[5],[5]],out=[[1],[1]],out2=[[1],[1]],outtyp=[[5],[5]],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([[0,1],[1,0],[1,0],[1,0],[0,1],[0,1],[0,0],[0,0]])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=[["int8(0)"],["1"]],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[3-1]=scicos_link(xx=[[347.07543],[363.03733],[363.03733]],yy=[[228.11733],[228.11733],[248.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]); scs_m.objs[4-1]=scicos_link(xx=[[290.6659],[272.104],[272.104],[289.93257]],yy=[[274.25067],[274.25067],[231.45067],[231.45067]],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]); scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[[6],[14]],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[["E"],["E"],["E"]]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[[-1],[-1],[-1]],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); @@ -54,9 +54,9 @@ if (!ok) { break; } if (init<=0) { -init=int8[0-1]; +init=int8(0); } else if (init>0) { -init=int8[1-1]; +init=int8(1); } if (ok) { xx.graphics.exprs[1-1]=exprs0; diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/BIGSOM_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/CLINDUMMY_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index cc4cbc8a..dcebbfb5 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -29,7 +29,7 @@ exprs=graphics.exprs; model=arg1.model; x0=model.state; rpar=model.rpar; -ns=prod[size(x0)-1]; +ns=prod(size(x0)); nin=1; nout=1; PREVAR_scicos_context=PREVAR_scicos_context; @@ -39,12 +39,12 @@ while (true) { if (!ok) { break; } -if (degree[num-1]>degree[den-1]) { +if (degree(num)>degree(den)) { message("Transfer function must be proper or strictly proper."); ok=false; } if (ok) { -H=cont_frm[num-1][den-1]; +H=cont_frm(num,den); [A,B,C,D]=H.slice(2-1,5); graphics.exprs=exprs; [ns1,ns1]=size(A); diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/CLR.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 010c4839..3b87cba3 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -29,7 +29,7 @@ exprs=graphics.exprs; model=arg1.model; x0=model.state; rpar=model.rpar; -ns=prod[size(x0)-1]; +ns=prod(size(x0)); nin=1; nout=1; PREVAR_scicos_context=PREVAR_scicos_context; @@ -39,12 +39,12 @@ while (true) { if (!ok) { break; } -if (degree[num-1]>degree[den-1]) { +if (degree(num)>degree(den)) { message("Transfer must be proper or strictly proper"); ok=false; } if (ok) { -H=cont_frm[num-1][den-1]; +H=cont_frm(num,den); [A,B,C,D]=H.slice(2-1,5); graphics.exprs=exprs; [ns1,ns1]=size(A); diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/CLR_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index b330992b..1bd13689 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -57,7 +57,7 @@ okD=false; } } if (ms!=ns||!okD) { -message(_["Matrix A is not square or D has wrong dimension"-1]); +message(_("Matrix A is not square or D has wrong dimension")); } else { [model,graphics,ok]=check_io(model,graphics,in1,out,[],[]); if (ok) { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/CLSS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/CLSS_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DELAYV_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 66f2ca4b..8ae0eca2 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -95,7 +95,7 @@ if (!ok) { break; } mess=[]; -if (prod[size(z0)-1]<1) { +if (prod(size(z0))<1) { mess=[[mess],["Register length must be at least 1"],[" "]]; ok=false; } diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DELAY_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DERIV.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DIFF_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index dbbe1b83..8f0cc456 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -29,7 +29,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; x0=model.dstate; -ns=prod[size(x0)-1]; +ns=prod(size(x0)); PREVAR_scicos_context=PREVAR_scicos_context; PREVAR_scicos_context.z=%z; while (true) { @@ -37,12 +37,12 @@ while (true) { if (!ok) { break; } -if (degree[num-1]>degree[den-1]) { +if (degree(num)>degree(den)) { message("Transfer function must be proper"); ok=false; } if (ok) { -H=cont_frm[num-1][den-1]; +H=cont_frm(num,den); [A,B,C,D]=H.slice(2-1,5); graphics.exprs=exprs; [ns1,ns1]=size(A); diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DLR.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 15c876f2..e3ad64c9 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -29,7 +29,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; x0=model.dstate; -ns=prod[size(x0)-1]; +ns=prod(size(x0)); PREVAR_scicos_context=PREVAR_scicos_context; PREVAR_scicos_context.z=%z; while (true) { @@ -37,12 +37,12 @@ while (true) { if (!ok) { break; } -if (degree[num-1]>degree[den-1]) { +if (degree(num)>degree(den)) { message("Transfer must be proper"); ok=false; } if (ok) { -H=cont_frm[num-1][den-1]; +H=cont_frm(num,den); [A,B,C,D]=H.slice(2-1,5); graphics.exprs=exprs; [ns1,ns1]=size(A); diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DLR_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 0bd4f00d..eacdb24b 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -56,7 +56,7 @@ okD=false; } } if (ms!=ns||!okD) { -message(_["Matrix A is not square or D has wrong dimension"-1]); +message(_("Matrix A is not square or D has wrong dimension")); } else { [model,graphics,ok]=check_io(model,graphics,in1,out,1,[]); if (ok) { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DLSS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DLSS_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 915b26ed..e404c6cc 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -41,8 +41,8 @@ in1=out; model.sim=list("dollar4_m",4); model.odstate=list(a); model.dstate=[]; -if (type[(a)==1-1]) { -if (isreal[a-1]) { +if (this.type[(a)==1-1]) { +if (isreal(a)) { it=1; ot=1; if ((size(a,1)==1||size(a,2)==1)) { diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle new file mode 100644 index 00000000..0ac03d7f --- /dev/null +++ b/js/Linear/DOLLAR.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'type' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/DOLLAR_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 6f1a5aea..e322d911 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -41,8 +41,8 @@ in1=out; model.sim=list("dollar4_m",4); model.odstate=list(a); model.dstate=[]; -if ((type[a-1]==1)) { -if (isreal[a-1]) { +if ((this.type[a-1]==1)) { +if (isreal(a)) { it=1; ot=1; if ((size(a,1)==1||size(a,2)==1)) { diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle new file mode 100644 index 00000000..0ac03d7f --- /dev/null +++ b/js/Linear/DOLLAR_m.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'type' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 4fe4b974..2f188149 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -40,7 +40,7 @@ if (gain==[]) { message("Gain must have at least one element"); } else { if (typeof(gain)=="constant") { -if (isreal[gain-1]) { +if (isreal(gain)) { it=1; ot=1; model.sim=list("gainblk",4); diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/GAINBLK.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/GAINBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/GAIN_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/INTEGRAL.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/INTEGRAL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index b22c1b54..d18b4af5 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -32,7 +32,7 @@ while (true) { if (!ok) { break; } -if (isreal[x0-1]) { +if (isreal(x0)) { Datatype=1; } else { Datatype=2; diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/INTEGRAL_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/PID.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index afd5dc08..ce6d6c13 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -31,34 +31,34 @@ while (true) { if (!ok) { break; } -if (prod[size(z0)-1]<1) { +if (prod(size(z0))<1) { message("Register length must be at least 1"); ok=false; } if (it==1) { model.sim=list("delay4",4); -z0=double[z0-1]; +z0=double(z0); model.dstate=z0; model.odstate=list(); } else { if (it==3) { model.sim=list("delay4_i32",4); -z0=int32[z0-1]; +z0=int32(z0); } else if (it==4) { model.sim=list("delay4_i16",4); -z0=int16[z0-1]; +z0=int16(z0); } else if (it==5) { model.sim=list("delay4_i8",4); -z0=int8[z0-1]; +z0=int8(z0); } else if (it==6) { model.sim=list("delay4_ui32",4); -z0=uint32[z0-1]; +z0=uint32(z0); } else if (it==7) { model.sim=list("delay4_ui16",4); -z0=uint16[z0-1]; +z0=uint16(z0); } else if (it==8) { model.sim=list("delay4_ui8",4); -z0=uint8[z0-1]; +z0=uint8(z0); } else { message("Datatype is not supported"); ok=false; diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/REGISTER.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index f64e177e..786d8d1a 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -28,7 +28,7 @@ while (true) { if (!ok) { break; } -if (prod[size(z0)-1]<1) { +if (prod(size(z0))<1) { message("Register length must be at least 1"); ok=false; } diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/REGISTER_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/SAMPHOLD.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/SAMPHOLD_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/SOM_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/SUMMATION.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/SUM_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/TCLSS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/TCLSS_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/TIME_DELAY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/CUMSUM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/EXTRACT.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/EXTTRI.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATBKSL.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATCATH.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATCATV.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATDET.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATDIAG.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATDIV.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATEIG.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATEXPM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATINV.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATLU.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATMUL.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATPINV.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATRESH.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATSING.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATSUM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATTRAN.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATZCONJ.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/MATZREIM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/RICC.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/SQRT.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/MatrixOp/SUBMAT.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 32a3a3e9..284a982b 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -2,15 +2,15 @@ function AUTOMAT() { AUTOMAT.prototype.define = function AUTOMAT() { NMode=2; -Minitial=1; +this.Minitial=1; NX=1; -X0=[0.0]; -XP=[[1],[1]]; +this.X0=[0.0]; +this.XP=[[1],[1]]; C1=[2]; C2=[1]; -exprs=[[string(NMode)],[string(Minitial)],[string(NX)],[sci2exp(X0)],[sci2exp(XP)],[sci2exp(C1)],[sci2exp(C2)]]; -ipar=[[NMode],[Minitial],[NX],[XP],[C1],[C2]]; -rpar=[X0]; +exprs=[[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]]; +ipar=[[NMode],[this.Minitial],[NX],[this.XP],[C1],[C2]]; +rpar=[this.X0]; model=scicos_model(); model.sim=list("automat",10004); model.in1=[[2*NX+1],[2*NX+1]]; @@ -52,7 +52,7 @@ VEC=VEC+","+"\'mat\',[-1,1]"; } GTV="[ok,NMode,Minitial,NX,X0,XP,"+CX+",exprs]=scicos_getvalue(\'Set Finite state machine model\', [\'Number (finite-state) Modes\';\'Initial Mode\';\'Number of continuous-time states\';\'Continuous-time states intial values\';\'Xproperties of continuous-time states in each Mode\';"+MSG+"], list(\'vec\',1,\'vec\',1,\'vec\',1,\'mat\',[-1,-1],\'mat\',[-1,-1],"+VEC+"),exprs)"; execstr(GTV); -if (!ok) { +if (!this.ok) { break; } NMode_old=size(exprs,"*")-5; @@ -65,11 +65,11 @@ if ((NMode_old<NMode)) { exprs.slice(NMode_old+6-1,NMode+5)=exprs[NMode_old+4-1]; ModifEncore=true; } -if ((NX!=size(X0,"*"))) { +if ((NX!=size(this.X0,"*"))) { messagebox("the size of intial continuous-time states should be NX="+string(NX),"modal","error"); ModifEncore=true; } -[rXP,cXP]=size(XP); +[rXP,cXP]=size(this.XP); if (cXP!=NX) { messagebox("Xproperty matrix is not valid: it should have NX="+string(NX)+" columns","modal","error"); ModifEncore=true; @@ -78,13 +78,13 @@ messagebox("Xproperty matrix is not valid: it should have NMode="+string(NMode)+ ModifEncore=true; } else if ((rXP==1)) { for (i=1;i<=NMode-1;i+=1) { -XP=[[XP],[XP[1-1].slice()]]; +this.XP=[[this.XP],[this.XP[1-1].slice()]]; } } if ((NMode_old==NMode)&&(!ModifEncore)) { -XP=matrix(transpose(XP),NMode*NX,1); -ipar=[[NMode],[Minitial],[NX],[XP]]; -rpar=matrix(X0,NX,1); +this.XP=matrix(transpose(this.XP),NMode*NX,1); +ipar=[[NMode],[this.Minitial],[NX],[this.XP]]; +rpar=matrix(this.X0,NX,1); INP=ones(NMode,1); if (NX>0) { OUT=[[2],[2*NX]]; @@ -115,8 +115,8 @@ ModifEncore=true; } } if (!ModifEncore) { -[model,graphics,ok]=check_io(model,graphics,INP,OUT,[],[1]); -if (!ok) { +[model,graphics,this.ok]=check_io(model,graphics,INP,OUT,[],[1]); +if (!this.ok) { break; } model.nzcross=nzcross; diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle new file mode 100644 index 00000000..4c7386e3 --- /dev/null +++ b/js/Misc/AUTOMAT.pickle @@ -0,0 +1,15 @@ +c__builtin__ +set +p0 +((lp1 +S'X0' +p2 +aS'ok' +p3 +aS'XP' +p4 +aS'Minitial' +p5 +atp6 +Rp7 +.
\ No newline at end of file diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BACKLASH.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BOUNCE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BOUNCEXY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/BPLATFORM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 78bd0696..8e3eb3ad 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -87,12 +87,12 @@ dep_ut=[depu,dept]; if (funam==" ") { break; } -if (model.sim[1-1]!=funam||sign[size(model.state,"*")-1]!=sign[nx-1]||sign[size(model.dstate,"*")-1]!=sign[nz-1]||model.nzcross!=ng||sign[size(model.evtout,"*")-1]!=sign[nevout-1]) { +if (model.sim[1-1]!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=ng||sign(size(model.evtout,"*"))!=sign(nevout)) { tt=[]; } tt=label[2-1]; while (true) { -[ok,tt,cancel]=CFORTR2[funam-1][tt-1]; +[ok,tt,cancel]=CFORTR2(funam,tt); if (!ok) { if (cancel) { break; diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/CBLOCK.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index bdd0232f..f375d946 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -69,7 +69,7 @@ dep_ut=[depu,dept]; if (funam==" ") { break; } -if (model.sim[1-1]!=funam||sign[size(model.state,"*")-1]!=sign[nx-1]||sign[size(model.dstate,"*")-1]!=sign[nz-1]||model.nzcross!=nzcr||sign[size(model.evtout,"*")-1]!=sign[nevout-1]) { +if (model.sim[1-1]!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=nzcr||sign(size(model.evtout,"*"))!=sign(nevout)) { tt=[]; } tt=label[2-1]; @@ -77,7 +77,7 @@ tt=label[2-1]; } if (ok) { while (true) { -[ok,tt,cancel]=CC4[funam-1][tt-1]; +[ok,tt,cancel]=this.CC4[funam-1][tt-1]; if (!ok) { if (cancel) { break; diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle new file mode 100644 index 00000000..96223756 --- /dev/null +++ b/js/Misc/CBLOCK4.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'CC4' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/CONSTRAINT_c.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/DEADBAND.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 9aa7813d..8b2bf634 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -19,13 +19,13 @@ exprs=graphics.exprs; textmp=exprs[2-1]; ok=true; while (1==1) { -[txt]=dialog[[["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]]-1][textmp-1]; +[txt]=this.dialog[[["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]]-1][textmp-1]; if (txt!=[]) { tt=["block=debug_scicos(block,flag)"]; if (execstr("deff(tt,txt)","errcatch")==0) { warnMode=warning("query"); warning("off"); -save(TMPDIR+"/debug_scicos",debug_scicos); +save(this.TMPDIR+"/debug_scicos",this.debug_scicos); warning(warnMode); exprs[2-1]=txt; if ((scicos_debug()!=2&&scicos_debug()!=3)) { diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle new file mode 100644 index 00000000..0f09469f --- /dev/null +++ b/js/Misc/DEBUG.pickle @@ -0,0 +1,13 @@ +c__builtin__ +set +p0 +((lp1 +S'debug_scicos' +p2 +aS'TMPDIR' +p3 +aS'dialog' +p4 +atp5 +Rp6 +.
\ No newline at end of file diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js index 4186fc9f..fdc690a8 100644 --- a/js/Misc/DEBUG_SCICOS.js +++ b/js/Misc/DEBUG_SCICOS.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/Misc/DEBUG_SCICOS.sci" */ function DEBUG_SCICOS() { DEBUG_SCICOS.prototype.define = function DEBUG_SCICOS() { -x=DEBUG["define"-1]; +x=DEBUG("define"); } DEBUG_SCICOS.prototype.details = function DEBUG_SCICOS() { } @@ -9,6 +9,6 @@ x=DEBUG["define"-1]; } DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { arg1.gui="DEBUG"; -[x,y,typ]=DEBUG["set"-1][arg1-1]; +[x,y,typ]=DEBUG("set",arg1); } } diff --git a/js/Misc/DEBUG_SCICOS.pickle b/js/Misc/DEBUG_SCICOS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/DEBUG_SCICOS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/DIFF_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 857c2199..00dad0ab 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -7,7 +7,7 @@ function DSUPER() { DSUPER.prototype.get = function DSUPER() { } DSUPER.prototype.set = function DSUPER() { -y=needcompile; +y=this.needcompile; typ=list(); graphics=arg1.graphics; if ((length(graphics.exprs)==0)) { @@ -36,12 +36,12 @@ tt=tt+",scicos_context."+exprs0[i-1]; ss=graphics.exprs[2-1][3-1]; scicos_context=PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); -if (ok) { +if (this.ok) { x=arg1; PREVAR_scicos_context=scicos_context; sblock=x.model.rpar; -[sblock,%w,needcompile2,ok]=do_eval(sblock,list(),scicos_context); -y=max(2,needcompile,needcompile2); +[sblock,%w,needcompile2,this.ok]=do_eval(sblock,list(),scicos_context); +y=max(2,this.needcompile,needcompile2); x.graphics.exprs[1-1]=exprs; x.model.rpar=sblock; } else { diff --git a/js/Misc/DSUPER.pickle b/js/Misc/DSUPER.pickle new file mode 100644 index 00000000..44fb8b06 --- /dev/null +++ b/js/Misc/DSUPER.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'needcompile' +p2 +aS'ok' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 0d85569d..e8cbd733 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -8,7 +8,7 @@ model.in1=1; model.out=1; model.dstate=0; model.nzcross=1; -model.ipar=sign[edge-1]; +model.ipar=sign(edge); model.blocktype="c"; model.dep_ut=[true,false]; exprs=[string(edge)]; @@ -29,7 +29,7 @@ while (true) { if (!ok) { break; } -model.ipar=sign[edge-1]; +model.ipar=sign(edge); graphics.exprs=exprs; x.graphics=graphics; x.model=model; diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/EDGETRIGGER.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index bb2418b5..aebcc2d2 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -2,7 +2,7 @@ function EDGE_TRIGGER() { EDGE_TRIGGER.prototype.define = function EDGE_TRIGGER() { scs_m_1=scicos_diagram(); -scs_m_1.objs[1-1]=EDGETRIGGER["define"-1]; +scs_m_1.objs[1-1]=this.EDGETRIGGER["define"-1]; scs_m_1.objs[2-1]=IFTHEL_f("define"); scs_m_1.objs[3-1]=IN_f("define"); scs_m_1.objs[4-1]=CLKOUTV_f("define"); @@ -105,9 +105,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (diffobjs(xxn,xx)) { +if (diffobjs(this.xxn,xx)) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)) { @@ -130,7 +130,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -145,7 +145,7 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; y=max(y,needcompile); } diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle new file mode 100644 index 00000000..78b2b289 --- /dev/null +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'EDGETRIGGER' +p2 +aS'xxn' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 65bd7268..6fa4b1ab 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -33,9 +33,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (!isequalbitwise[xxn-1][xx-1]) { +if (!this.isequalbitwise[this.xxn-1][xx-1]) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) { @@ -58,7 +58,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -73,7 +73,7 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; y=max(y,needcompile); } diff --git a/js/Misc/ENDBLK.pickle b/js/Misc/ENDBLK.pickle new file mode 100644 index 00000000..794658bf --- /dev/null +++ b/js/Misc/ENDBLK.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'xxn' +p2 +aS'isequalbitwise' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle new file mode 100644 index 00000000..2d95f3ab --- /dev/null +++ b/js/Misc/EXPRESSION.pickle @@ -0,0 +1,13 @@ +c__builtin__ +set +p0 +((lp1 +S'getfield' +p2 +aS'PREVAR_foo' +p3 +aS'PREVAR_scicos_context' +p4 +atp5 +Rp6 +.
\ No newline at end of file diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/Extract_Activation.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index c4c750b3..6083d128 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -14,7 +14,7 @@ model.nzcross=nzz; model.nmode=1; model.blocktype="c"; model.dep_ut=[true,false]; -exprs=[[string(rpar)],[string(sign[nzz-1])]]; +exprs=[[string(rpar)],[string(sign(nzz))]]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/HYSTHERESIS.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/IMPSPLIT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/LOGICAL_OP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 4d5f6201..f4d2b319 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -1,35 +1,35 @@ /* autogenerated from "macros/Misc/MBLOCK.sci" */ function MBLOCK() { MBLOCK.prototype.define = function MBLOCK() { -in1=["u1"]; -intype=["I"]; -out=[["y1"],["y2"]]; -outtype=[["I"],["E"]]; +this.in1=["u1"]; +this.intype=["I"]; +this.out=[["y1"],["y2"]]; +this.outtype=[["I"],["E"]]; param=[["R"],["L"]]; paramv=list(0.1,.0001); pprop=[[0],[0]]; nameF="generic"; -exprs=tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(in1.slice()),sci2exp(intype.slice()),sci2exp(out.slice()),sci2exp(outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); +exprs=tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); model=scicos_model(); model.blocktype="c"; model.dep_ut=[false,true]; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { +for (i=1;i<=lstsize(paramv);i+=1) { model.rpar=[[model.rpar],[paramv[i-1].slice()]]; } mo=modelica(); mo.model=nameF; mo.parameters=list(param,paramv); model.sim=list(mo.model,30004); -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; model.in1=ones(size(mo.inputs,"r"),1); model.out=ones(size(mo.outputs,"r"),1); model.equations=mo; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); -x.graphics.in_implicit=intype; -x.graphics.out_implicit=outtype; +x.graphics.in_implicit=this.intype; +x.graphics.out_implicit=this.outtype; } MBLOCK.prototype.details = function MBLOCK() { } @@ -40,7 +40,7 @@ x=arg1; model=arg1.model; graphics=arg1.graphics; exprs=graphics.exprs; -if (type[exprs-1]==15) { +if (this.type[exprs-1]==15) { paramv=list(); pprop=[]; for (i=1;i<=size(model.rpar,"*");i+=1) { @@ -62,7 +62,7 @@ messagebox("Error in evaluation of variables.","modal","error"); ok=false; } if (ok) { -for (i=1;i<=size(in1,"*");i+=1) { +for (i=1;i<=size(this.in1,"*");i+=1) { r=false; ierr=execstr("r=validvar(in(i))","errcatch"); if (!r) { @@ -71,11 +71,11 @@ break; } } if (!ok) { -messagebox([["Invalid variable name for the input "+string(i)+"."],["\""+in1[i-1]+"\""],["Please choose another variable name."]],"modal","error"); +messagebox([["Invalid variable name for the input "+string(i)+"."],["\""+this.in1[i-1]+"\""],["Please choose another variable name."]],"modal","error"); } } if (ok) { -for (i=1;i<=size(out,"*");i+=1) { +for (i=1;i<=size(this.out,"*");i+=1) { r=false; ierr=execstr("r=validvar(out(i))","errcatch"); if (!r) { @@ -84,7 +84,7 @@ break; } } if (!ok) { -messagebox([["Invalid variable name for the output "+string(i)+"."],["\""+out[i-1]+"\""],["Please choose another variable name."]],"modal","error"); +messagebox([["Invalid variable name for the output "+string(i)+"."],["\""+this.out[i-1]+"\""],["Please choose another variable name."]],"modal","error"); } } if (ok) { @@ -102,8 +102,8 @@ messagebox([["Invalid variable name for the parameter "+string(i)+"."],["\""+par } } if (ok) { -for (i=1;i<=size(intype,"*");i+=1) { -if (intype[i-1]!="E"&&intype[i-1]!="I") { +for (i=1;i<=size(this.intype,"*");i+=1) { +if (this.intype[i-1]!="E"&&this.intype[i-1]!="I") { messagebox("Input type should be \'E\' or \'I\'!","modal","error"); ok=false; break; @@ -111,8 +111,8 @@ break; } } if (ok) { -for (i=1;i<=size(outtype,"*");i+=1) { -if (outtype[i-1]!="E"&&outtype[i-1]!="I") { +for (i=1;i<=size(this.outtype,"*");i+=1) { +if (this.outtype[i-1]!="E"&&this.outtype[i-1]!="I") { messagebox("Output type should be \'E\' or \'I\'!","modal","error"); ok=false; break; @@ -120,13 +120,13 @@ break; } } if (ok) { -if (or(size(intype)!=size(in1))) { +if (or(size(this.intype)!=size(this.in1))) { messagebox("Input variables are not well defined!","modal","error"); ok=false; } } if (ok) { -if (or(size(outtype)!=size(out))) { +if (or(size(this.outtype)!=size(this.out))) { messagebox("Output variables are not well defined!","modal","error"); ok=false; } @@ -145,34 +145,34 @@ ok=false; } } if (ok) { -if (funam=="") { +if (this.funam=="") { messagebox("The filename is not defined!","modal","error"); ok=false; } } if (ok) { -[dirF,nameF,extF]=fileparts(funam); +[dirF,nameF,extF]=fileparts(this.funam); if ((extF!=""&&extF!=".mo")||(dirF!=""&&extF!=".mo")) { messagebox("Filename extention should be \'.mo \' !","modal","error"); ok=false; } } if (ok) { -intypex=find(intype=="I"); -outtypex=find(outtype=="I"); -[model,graphics,ok]=set_io(model,graphics,list([ones(in1),ones(in1)],ones(in1)),list([ones(out),ones(out)],ones(out)),[],[],intypex,outtypex); +intypex=find(this.intype=="I"); +outtypex=find(this.outtype=="I"); +[model,graphics,ok]=set_io(model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); } if (ok) { Tparam_lab=evstr(Tparam); Tparam_sz=size(Tparam_lab,"*"); -if (Tparam_sz>lstsize[lab_2-1]) { -for (i=1;i<=(Tparam_sz-lstsize[lab_2-1]);i+=1) { +if (Tparam_sz>lstsize(lab_2)) { +for (i=1;i<=(Tparam_sz-lstsize(lab_2));i+=1) { lab_2[$+1-1]="0"; } -} else if (Tparam_sz<lstsize[lab_2-1]) { +} else if (Tparam_sz<lstsize(lab_2)) { lab_2_tmp=list(); if (Tparam_sz!=0) { -for (i=1;i<=(lstsize[lab_2-1]-Tparam_sz);i+=1) { +for (i=1;i<=(lstsize(lab_2)-Tparam_sz);i+=1) { lab_2_tmp[i-1]=lab_2[i-1]; } } @@ -210,8 +210,8 @@ execstr("paramv("+string(i)+")=%v"+string(i)); } } if (ok) { -if (extF==".mo"&&fileinfo(funam)!=[]) { -tt=mgetl(funam); +if (extF==".mo"&&fileinfo(this.funam)!=[]) { +tt=mgetl(this.funam); } else { tt=exprs.funtxt; mo=model.equations; @@ -219,7 +219,7 @@ if (mo.model!=nameF) { tt=[]; } } -[ok,tt]=MODCOM(funam,tt,in1,out,param,paramv,pprop); +[ok,tt]=MODCOM(this.funam,tt,this.in1,this.out,param,paramv,pprop); if (!ok) { break; } @@ -227,8 +227,8 @@ break; if (ok) { mo=modelica(); mo.model=nameF; -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; if (max(pprop)>0) { mo.parameters=list(transpose(param),paramv,transpose(pprop)); } else { @@ -236,10 +236,10 @@ mo.parameters=list(transpose(param),paramv); } model.equations=mo; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { +for (i=1;i<=lstsize(paramv);i+=1) { model.rpar=[[model.rpar],[paramv[i-1].slice()]]; } -model.sim[1-1]=funam; +model.sim[1-1]=this.funam; exprs.in1=lab_1[1-1]; exprs.intype=lab_1[2-1]; exprs.out=lab_1[3-1]; @@ -247,8 +247,8 @@ exprs.outtype=lab_1[4-1]; exprs.param=lab_1[5-1]; exprs.paramv=list(); if (Tparam_sz!=0) { -if (type[lab_2-1]==15) { -for (i=1;i<=lstsize[lab_2-1];i+=1) { +if (this.type[lab_2-1]==15) { +for (i=1;i<=lstsize(lab_2);i+=1) { exprs.paramv[i-1]=lab_2[i-1]; } } else { @@ -262,8 +262,8 @@ exprs.nameF=lab_1[7-1]; exprs.funtxt=tt; x.model=model; graphics.gr_i[1-1][1-1]="txt=[\'Modelica\';\' "+nameF+" \'];"; -graphics.in_implicit=intype; -graphics.out_implicit=outtype; +graphics.in_implicit=this.intype; +graphics.out_implicit=this.outtype; graphics.exprs=exprs; x.graphics=graphics; break; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle new file mode 100644 index 00000000..6ed6ac8b --- /dev/null +++ b/js/Misc/MBLOCK.pickle @@ -0,0 +1,19 @@ +c__builtin__ +set +p0 +((lp1 +S'intype' +p2 +aS'in1' +p3 +aS'outtype' +p4 +aS'funam' +p5 +aS'type' +p6 +aS'out' +p7 +atp8 +Rp9 +.
\ No newline at end of file diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/MEMORY_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 83ed4ff3..2342fd37 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -1,35 +1,35 @@ /* autogenerated from "macros/Misc/MPBLOCK.sci" */ function MPBLOCK() { MPBLOCK.prototype.define = function MPBLOCK() { -in1=["u"]; -intype=["I"]; -out=[["y1"],["y2"]]; -outtype=[["I"],["I"]]; +this.in1=["u"]; +this.intype=["I"]; +this.out=[["y1"],["y2"]]; +this.outtype=[["I"],["I"]]; param=[]; paramv=list(); pprop=[]; nameF="myModel"; -exprs=tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(in1.slice()),sci2exp(intype.slice()),sci2exp(out.slice()),sci2exp(outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); +exprs=tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); model=scicos_model(); model.blocktype="c"; model.dep_ut=[true,true]; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { +for (i=1;i<=lstsize(paramv);i+=1) { model.rpar=[[model.rpar],[paramv[i-1].slice()]]; } mo=modelica(); mo.model=nameF; mo.parameters=list(param,paramv); model.sim=list(mo.model,10004); -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; model.in1=ones(size(mo.inputs,"r"),1); model.out=ones(size(mo.outputs,"r"),1); model.equations=mo; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); -x.graphics.in_implicit=intype; -x.graphics.out_implicit=outtype; +x.graphics.in_implicit=this.intype; +x.graphics.out_implicit=this.outtype; } MPBLOCK.prototype.details = function MPBLOCK() { } @@ -40,7 +40,7 @@ x=arg1; model=arg1.model; graphics=arg1.graphics; exprs=graphics.exprs; -if (type[exprs-1]==15) { +if (this.type[exprs-1]==15) { paramv=list(); pprop=[]; for (i=1;i<=size(model.rpar,"*");i+=1) { @@ -62,7 +62,7 @@ x_message("Error in evaluation of variables."); ok=false; } if (ok) { -for (i=1;i<=size(in1,"*");i+=1) { +for (i=1;i<=size(this.in1,"*");i+=1) { r=false; ierr=execstr("r=validvar(in(i))","errcatch"); if (!r) { @@ -71,11 +71,11 @@ break; } } if (!ok) { -x_message([["Invalid variable name for the input "+string(i)+"."],["\""+in1[i-1]+"\""],["Please choose another variable name."]]); +x_message([["Invalid variable name for the input "+string(i)+"."],["\""+this.in1[i-1]+"\""],["Please choose another variable name."]]); } } if (ok) { -for (i=1;i<=size(out,"*");i+=1) { +for (i=1;i<=size(this.out,"*");i+=1) { r=false; ierr=execstr("r=validvar(out(i))","errcatch"); if (!r) { @@ -84,7 +84,7 @@ break; } } if (!ok) { -x_message([["Invalid variable name for the output "+string(i)+"."],["\""+out[i-1]+"\""],["Please choose another variable name."]]); +x_message([["Invalid variable name for the output "+string(i)+"."],["\""+this.out[i-1]+"\""],["Please choose another variable name."]]); } } if (ok) { @@ -102,8 +102,8 @@ x_message([["Invalid variable name for the parameter "+string(i)+"."],["\""+para } } if (ok) { -for (i=1;i<=size(intype,"*");i+=1) { -if (intype[i-1]!="E"&&intype[i-1]!="I") { +for (i=1;i<=size(this.intype,"*");i+=1) { +if (this.intype[i-1]!="E"&&this.intype[i-1]!="I") { x_message("Input type should be \'E\' or \'I\'!"); ok=false; break; @@ -111,8 +111,8 @@ break; } } if (ok) { -for (i=1;i<=size(outtype,"*");i+=1) { -if (outtype[i-1]!="E"&&outtype[i-1]!="I") { +for (i=1;i<=size(this.outtype,"*");i+=1) { +if (this.outtype[i-1]!="E"&&this.outtype[i-1]!="I") { x_message("Output type should be \'E\' or \'I\'!"); ok=false; break; @@ -120,13 +120,13 @@ break; } } if (ok) { -if (or(size(intype)!=size(in1))) { +if (or(size(this.intype)!=size(this.in1))) { x_message("Input variables are not well defined!"); ok=false; } } if (ok) { -if (or(size(outtype)!=size(out))) { +if (or(size(this.outtype)!=size(this.out))) { x_message("Output variables are not well defined!"); ok=false; } @@ -145,31 +145,31 @@ ok=false; } } if (ok) { -if (funam=="") { +if (this.funam=="") { x_message("The model name is not defined!"); ok=false; } } if (ok) { -[dirF,nameF,extF]=fileparts(funam); +[dirF,nameF,extF]=fileparts(this.funam); if ((extF!="")||(dirF!="")) { x_message("Invalid model name!"); ok=false; } } if (ok) { -intypex=find(intype=="I"); -outtypex=find(outtype=="I"); -[model,graphics,ok]=set_io(model,graphics,list([ones(in1),ones(in1)],ones(in1)),list([ones(out),ones(out)],ones(out)),[],[],intypex,outtypex); +intypex=find(this.intype=="I"); +outtypex=find(this.outtype=="I"); +[model,graphics,ok]=set_io(model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); } if (ok) { Tparam_lab=evstr(Tparam); Tparam_sz=size(Tparam_lab,"*"); -if (Tparam_sz>lstsize[lab_2-1]) { -for (i=1;i<=(Tparam_sz-lstsize[lab_2-1]);i+=1) { +if (Tparam_sz>lstsize(lab_2)) { +for (i=1;i<=(Tparam_sz-lstsize(lab_2));i+=1) { lab_2[$+1-1]="0"; } -} else if (Tparam_sz<lstsize[lab_2-1]) { +} else if (Tparam_sz<lstsize(lab_2)) { lab_2_tmp=list(); if (Tparam_sz!=0) { for (i=1;i<=Tparam_sz;i+=1) { @@ -217,8 +217,8 @@ execstr("paramv("+string(i)+")=%v"+string(i)); if (ok) { mo=modelica(); mo.model=nameF; -mo.inputs=in1; -mo.outputs=out; +mo.inputs=this.in1; +mo.outputs=this.out; if (pprop!=[]) { if (max(pprop)>0) { mo.parameters=list(transpose(param),paramv,transpose(pprop)); @@ -228,10 +228,10 @@ mo.parameters=list(transpose(param),paramv); } model.equations=mo; model.rpar=[]; -for (i=1;i<=lstsize[paramv-1];i+=1) { -model.rpar=[[model.rpar],[double[paramv[i-1].slice()-1]]]; +for (i=1;i<=lstsize(paramv);i+=1) { +model.rpar=[[model.rpar],[double(paramv[i-1].slice())]]; } -model.sim[1-1]=funam; +model.sim[1-1]=this.funam; exprs.in1=lab_1[1-1]; exprs.intype=lab_1[2-1]; exprs.out=lab_1[3-1]; @@ -239,8 +239,8 @@ exprs.outtype=lab_1[4-1]; exprs.param=lab_1[5-1]; exprs.paramv=list(); if (Tparam_sz!=0) { -if (type[lab_2-1]==15) { -for (i=1;i<=lstsize[lab_2-1];i+=1) { +if (this.type[lab_2-1]==15) { +for (i=1;i<=lstsize(lab_2);i+=1) { exprs.paramv[i-1]=lab_2[i-1]; } } else { @@ -254,8 +254,8 @@ exprs.nameF=lab_1[7-1]; exprs.funtxt=""; x.model=model; graphics.gr_i[1-1][1-1]="txt=[\' "+nameF+" \'];"; -graphics.in_implicit=intype; -graphics.out_implicit=outtype; +graphics.in_implicit=this.intype; +graphics.out_implicit=this.outtype; graphics.exprs=exprs; x.graphics=graphics; break; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle new file mode 100644 index 00000000..6ed6ac8b --- /dev/null +++ b/js/Misc/MPBLOCK.pickle @@ -0,0 +1,19 @@ +c__builtin__ +set +p0 +((lp1 +S'intype' +p2 +aS'in1' +p3 +aS'outtype' +p4 +aS'funam' +p5 +aS'type' +p6 +aS'out' +p7 +atp8 +Rp9 +.
\ No newline at end of file diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/PAL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/RATELIMITER.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/RELATIONALOP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/SPLIT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/SUPER_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/TEXT_f.pickle b/js/Misc/TEXT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/TEXT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/c_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/fortran_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index d7e4b6f0..1d1f2889 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -21,7 +21,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; x=arg1; model=x.model; -[ok,mac,exprs]=genfunc[exprs-1]; +[ok,mac,exprs]=this.genfunc[exprs-1]; if (ok) { model.sim=mac; graphics.exprs=exprs; diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle new file mode 100644 index 00000000..492b549b --- /dev/null +++ b/js/Misc/func_block.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'genfunc' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/generic_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/generic_block2.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 54eee1ef..ec554743 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -52,11 +52,11 @@ message("vector event links not supported"); ok=false; } } -if (type[opar-1]!=15) { +if (this.type[opar-1]!=15) { message("object parameter must be a list"); ok=false; } -if (type[oz-1]!=15) { +if (this.type[oz-1]!=15) { message("discrete object state must be a list"); ok=false; } diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle new file mode 100644 index 00000000..0ac03d7f --- /dev/null +++ b/js/Misc/generic_block3.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'type' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 4938c66f..12da9da6 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -50,7 +50,7 @@ exprs[1-1]=lab; xx=xx.slice(); z=z.slice(); rpar=rpar.slice(); -nrp=prod[size(rpar)-1]; +nrp=prod(size(rpar)); i=int(i.slice()); ni=size(i,1); o=int(o.slice()); diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/scifunc_block.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index aaf8724f..e9d6bd44 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -54,7 +54,7 @@ z=z.slice(); rpar=rpar.slice(); it=ones(1,size(i,1)); ot=ones(1,size(o,1)); -nrp=prod[size(rpar)-1]; +nrp=prod(size(rpar)); ni=size(i,1); no=size(o,1); ci=int(ci.slice()); diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Misc/scifunc_block_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/ABSBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/ABS_VALUE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/COSBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/EXPBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/EXPBLK_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/FSV_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/INVBLK.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/INVBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/LOGBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 1bd80e3d..9576a841 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -64,12 +64,12 @@ if (!((nx==nz)&&(ny==mz))) { x_message("incompatible size of x and y"); Ask_again=true; } -[ok]=test_increasing[xx-1]; +[ok]=test_increasing(xx); if ((!ok)) { x_message("Row input values must be monotonically increasing"); Ask_again=true; } -[ok]=test_increasing[yy-1]; +[ok]=test_increasing(yy); if ((!ok)) { x_message("Column input values must be monotonically increasing"); Ask_again=true; diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle new file mode 100644 index 00000000..e8e2a47d --- /dev/null +++ b/js/NonLinear/LOOKUP2D.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'order' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle new file mode 100644 index 00000000..8cef5b52 --- /dev/null +++ b/js/NonLinear/LOOKUP_c.pickle @@ -0,0 +1,19 @@ +c__builtin__ +set +p0 +((lp1 +S'rparin' +p2 +aS'ixy' +p3 +aS'iparin' +p4 +aS'argn' +p5 +aS'xy' +p6 +aS'curwin' +p7 +atp8 +Rp9 +.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/LOOKUP_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/MAXMIN.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/MAX_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/MIN_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/POWBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/PRODUCT.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/PROD_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/QUANT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/SATURATION.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/SAT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/SIGNUM.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/SINBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/TANBLK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/NonLinear/TrigFun.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index c9e5ed5e..a1d143a4 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -31,7 +31,7 @@ if (ok) { return; } } else { -if (exists["%scicos_context"-1]) { +if (exists("%scicos_context")) { [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,CI,CI1,CLa_type,CLa_exp,CLb_type,CLb_exp,oper,a1,b1,a2,b2,a3,b3,a4,b4,a5,b5,a6,b6,a7,b7,k,mesures,params_pde]=setvalue_IHM_EDP(params_pde); } } @@ -75,7 +75,7 @@ delta=evstr(a4)^2-4*evstr(a1)*evstr(a2); if ((delta==[])) { delta=0; } -type_meth=arbre_decision[delta-1]; +type_meth=this.arbre_decision[delta-1]; } [flag_type,rdnom,DF_type,tt]=translate(CI,CI1,CLa_type,CLa_exp,CLb_type,CLb_exp,oper,type_meth,degre,a_domaine,b_domaine,Nbr_maillage,a1,b1,a2,b2,a3,b3,a4,b4,a5,b5,a6,b6,a7,b7,rdnom,mesures); Nbr=Nbr_maillage; @@ -114,7 +114,7 @@ model.state=zeros(2*Nbr_maillage,1); } } } -[ok1]=CFORTREDP[rdnom-1][tt-1]; +[ok1]=CFORTREDP(rdnom,tt); if (!ok1) { break; } diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle new file mode 100644 index 00000000..fb271fe8 --- /dev/null +++ b/js/PDE/PDE.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'arbre_decision' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/AFFICH_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/BARXY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CANIMXY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CANIMXY3D.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CFSCOPE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle new file mode 100644 index 00000000..b563ade6 --- /dev/null +++ b/js/Sinks/CLKOUTV_f.pickle @@ -0,0 +1,17 @@ +c__builtin__ +set +p0 +((lp1 +S'diag' +p2 +aS'type' +p3 +aS'options' +p4 +aS'default_color' +p5 +aS'standard_origin' +p6 +atp7 +Rp8 +.
\ No newline at end of file diff --git a/js/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CLKOUT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 3b35dd9c..422c1443 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -3,7 +3,7 @@ function CMAT3D() { CMAT3D.prototype.define = function CMAT3D() { cmin=0; cmax=100; -colormap=jetcolormap[25-1]; +colormap=this.jetcolormap[25-1]; size_c=25; x=-1; y=-1; diff --git a/js/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle new file mode 100644 index 00000000..80ec981b --- /dev/null +++ b/js/Sinks/CMAT3D.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'jetcolormap' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 135bbb8d..eaa522ba 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -4,7 +4,7 @@ function CMATVIEW() { cmin=0; cmax=100; size_c=25; -colormap=jetcolormap[size_c-1]; +colormap=this.jetcolormap[size_c-1]; alpha_c=0.24; beta_c=1; model=scicos_model(); @@ -45,7 +45,7 @@ message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { size_c=size(colormap.slice(),1); -sol=inv[[[cmin,1],[cmax,1]]-1]*[[1],[size_c/3]]; +sol=inv([[cmin,1],[cmax,1]])*[[1],[size_c/3]]; alpha_c=sol[1-1]; beta_c=sol[2-1]; ipar=[[cmin],[cmax],[size_c]]; diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle new file mode 100644 index 00000000..80ec981b --- /dev/null +++ b/js/Sinks/CMATVIEW.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'jetcolormap' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CMSCOPE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CSCOPE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CSCOPXY.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/CSCOPXY3D.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/OUTIMPL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/OUT_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 90a642d5..59701dd5 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -14,7 +14,7 @@ model.out=[]; model.evtin=[1]; model.evtout=[]; model.rpar=[]; -model.ipar=[[nz],[length(varnam)],[transpose(ascii[varnam-1])]]; +model.ipar=[[nz],[length(varnam)],[transpose(this.ascii[varnam-1])]]; model.blocktype="d"; model.firing=[]; model.dep_ut=[false,false]; @@ -54,7 +54,7 @@ model.blocktype="x"; } else { model.blocktype="d"; } -model.ipar=[[nz],[length(varnam)],[transpose(ascii[varnam-1])]]; +model.ipar=[[nz],[length(varnam)],[transpose(this.ascii[varnam-1])]]; graphics.exprs=exprs; x.graphics=graphics; x.model=model; diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle new file mode 100644 index 00000000..78d6aa96 --- /dev/null +++ b/js/Sinks/TOWS_c.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'ascii' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sinks/TRASH_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index df2897ef..85b4c901 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -12,7 +12,7 @@ model.sim="writef"; model.in1=in1; model.evtin=1; model.dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]]; -model.ipar=[[length(fname)],[length(frmt)],[0],[N],[_str2code[fname-1]],[_str2code[frmt-1]]]; +model.ipar=[[length(fname)],[length(frmt)],[0],[N],[this._str2code[fname-1]],[this._str2code[frmt-1]]]; model.blocktype="d"; model.dep_ut=[true,false]; exprs=[[sci2exp(in1)],[fname],[frmt],[string(N)]]; @@ -25,8 +25,8 @@ x=standard_define([3,2],model,exprs,gr_i); } WFILE_f.prototype.set = function WFILE_f() { warnobsolete("WRITEC_f","6.0.0"); -warnMessage=msprintf(_["Feature %s is obsolete."-1],"WFILE_f"); -warnAdvise=msprintf(_["Please use %s instead."-1],"WRITEC_f"); +warnMessage=msprintf(_("Feature %s is obsolete."),"WFILE_f"); +warnAdvise=msprintf(_("Please use %s instead."),"WRITEC_f"); warnXcosMessage=msprintf("%s %s",warnMessage,warnAdvise); warnBlockByUID(arg1.model.label,warnXcosMessage); x=arg1; @@ -57,7 +57,7 @@ block_parameter_error(gettext("Wrong value for \'Output File Name\' parameter"), ok=false; } else if (fileparts(fname1)!="") { [pa,fn,ex]=fileparts(fname1); -if (!isdir[pa-1]) { +if (!this.isdir[pa-1]) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa)); ok=false; } @@ -72,8 +72,8 @@ block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."), ok=false; } if (ok) { -ipar=[[length(fname1)],[length(frmt1)],[0],[N],[_str2code[fname1-1]],[_str2code[frmt1-1]]]; -if (prod[size(dstate)-1]!=(nin+1)*N+2) { +ipar=[[length(fname1)],[length(frmt1)],[0],[N],[this._str2code[fname1-1]],[this._str2code[frmt1-1]]]; +if (prod(size(dstate))!=(nin+1)*N+2) { dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]]; } model.in1=nin; diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle new file mode 100644 index 00000000..c7024ed7 --- /dev/null +++ b/js/Sinks/WFILE_f.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'isdir' +p2 +aS'_str2code' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index c91a58ae..b4bbafec 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -13,7 +13,7 @@ model.sim=list("writeau",2); model.in1=in1; model.evtin=1; model.dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]]; -model.ipar=[[length(fname)],[_str2code[frmt-1]],[N],[swap],[_str2code[fname-1]]]; +model.ipar=[[length(fname)],[this._str2code[frmt-1]],[N],[swap],[this._str2code[fname-1]]]; model.blocktype="d"; model.dep_ut=[true,false]; exprs=[string(N),string(swap)]; @@ -40,7 +40,7 @@ break; nin=1; fname1="/dev/audio"; frmt1="uc "; -if (alreadyran&&(N!=ipar[5-1])) { +if (this.alreadyran&&(N!=ipar[5-1])) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); ok=false; } else if (N<1) { @@ -52,8 +52,8 @@ block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."), ok=false; } if (ok) { -ipar=[[length(fname1)],[_str2code[frmt1-1]],[N],[swap],[_str2code[fname1-1]]]; -if (prod[size(dstate)-1]!=(nin+1)*N+2) { +ipar=[[length(fname1)],[this._str2code[frmt1-1]],[N],[swap],[this._str2code[fname1-1]]]; +if (prod(size(dstate))!=(nin+1)*N+2) { dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]]; } model.in1=1; diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle new file mode 100644 index 00000000..62a7fafc --- /dev/null +++ b/js/Sinks/WRITEAU_f.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'_str2code' +p2 +aS'alreadyran' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 581d3f02..baaa2687 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -13,7 +13,7 @@ model.sim=list("writec",2); model.in1=in1; model.evtin=1; model.dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]]; -model.ipar=[[length(fname)],[_str2code[frmt-1]],[N],[swap],[_str2code[fname-1]]]; +model.ipar=[[length(fname)],[this._str2code[frmt-1]],[N],[swap],[this._str2code[fname-1]]]; model.blocktype="d"; model.dep_ut=[true,false]; exprs=[[sci2exp(in1)],[fname],[frmt],[string(N),string(swap)]]; @@ -47,17 +47,17 @@ fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll", if (and(frmt1!=fmts)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("Valid formats are: "+strcat(fmts,", "))); ok=false; -} else if (alreadyran&&fname1!=fname) { +} else if (this.alreadyran&&fname1!=fname) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running"),gettext("Input Format")),gettext("End current simulation first.")); ok=false; -} else if (alreadyran&&N!=ipar[5-1]) { +} else if (this.alreadyran&&N!=ipar[5-1]) { block_parameter_error(msprintf(gettext("You cannot modify \'Buffer Size\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); ok=false; } else if (fname1=="") { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),gettext("You must provide a filename.")); } else if (fileparts(fname1)!="") { [pa,fn,ex]=fileparts(fname1); -if (!isdir[pa-1]) { +if (!this.isdir[pa-1]) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa)); ok=false; } @@ -73,8 +73,8 @@ ok=false; } frmt1=part(frmt1,1,3); if (ok) { -ipar=[[length(fname1)],[_str2code[frmt1-1]],[N],[swap],[_str2code[fname1-1]]]; -if (prod[size(dstate)-1]!=(nin+1)*N+2) { +ipar=[[length(fname1)],[this._str2code[frmt1-1]],[N],[swap],[this._str2code[fname1-1]]]; +if (prod(size(dstate))!=(nin+1)*N+2) { dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]]; } model.in1=nin; diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle new file mode 100644 index 00000000..80ba7661 --- /dev/null +++ b/js/Sinks/WRITEC_f.pickle @@ -0,0 +1,13 @@ +c__builtin__ +set +p0 +((lp1 +S'isdir' +p2 +aS'_str2code' +p3 +aS'alreadyran' +p4 +atp5 +Rp6 +.
\ No newline at end of file diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/CLKINV_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/CLKIN_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 598ed817..c7e6c608 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/Sources/CLOCK_c.sci" */ function CLOCK_c() { CLOCK_c.prototype.define = function CLOCK_c() { -evtdly=EVTDLY_c["define"-1]; +evtdly=this.EVTDLY_c["define"-1]; evtdly.graphics.orig=[320,232]; evtdly.graphics.sz=[40,40]; evtdly.graphics.flip=true; diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle new file mode 100644 index 00000000..50891984 --- /dev/null +++ b/js/Sources/CLOCK_c.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'EVTDLY_c' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/CLOCK_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/CONST.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/CONST_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index e234d175..14c15e6c 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -36,8 +36,8 @@ block_parameter_error(msprintf(gettext("Wrong size for \'%s\' parameter"),gettex } else { model.sim=list("cstblk4_m",4); model.opar=list(C); -if ((type[C-1]==1)) { -if (isreal[C-1]) { +if ((this.type[C-1]==1)) { +if (isreal(C)) { ot=1; } else { ot=2; diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle new file mode 100644 index 00000000..0ac03d7f --- /dev/null +++ b/js/Sources/CONST_m.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'type' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle new file mode 100644 index 00000000..8cef5b52 --- /dev/null +++ b/js/Sources/CURVE_c.pickle @@ -0,0 +1,19 @@ +c__builtin__ +set +p0 +((lp1 +S'rparin' +p2 +aS'ixy' +p3 +aS'iparin' +p4 +aS'argn' +p5 +aS'xy' +p6 +aS'curwin' +p7 +atp8 +Rp9 +.
\ No newline at end of file diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/CURV_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/Counter.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index d7ac7b2a..7cf0658f 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -35,9 +35,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (!isequalbitwise[xxn-1][xx-1]) { +if (!this.isequalbitwise[this.xxn-1][xx-1]) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) { @@ -60,7 +60,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -75,7 +75,7 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; y=max(y,needcompile); } diff --git a/js/Sources/FROMWSB.pickle b/js/Sources/FROMWSB.pickle new file mode 100644 index 00000000..794658bf --- /dev/null +++ b/js/Sources/FROMWSB.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'xxn' +p2 +aS'isequalbitwise' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index a166ca27..df7373cf 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -10,7 +10,7 @@ model.sim=list("fromws_c",4); model.out=-1; model.out2=-2; model.outtyp=-1; -model.ipar=[[length(varnam)],[_str2code[varnam-1]],[Method],[ZC],[OutEnd]]; +model.ipar=[[length(varnam)],[this._str2code[varnam-1]],[Method],[ZC],[OutEnd]]; model.evtin=[1]; model.evtout=[1]; model.firing=[0]; @@ -53,7 +53,7 @@ message([["Invalid variable name."],["Please choose another variable name."]]); ok=false; } if (ok) { -model.ipar=[[length(varnam)],[_str2code[varnam-1]],[Method],[ZC],[OutEnd]]; +model.ipar=[[length(varnam)],[this._str2code[varnam-1]],[Method],[ZC],[OutEnd]]; [model,graphics,ok]=set_io(model,graphics,list(),list([-1,-2],-1),1,1); if (ok) { graphics.exprs=exprs; diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle new file mode 100644 index 00000000..3efc5bbe --- /dev/null +++ b/js/Sources/FROMWS_c.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'_str2code' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/GENSIN_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/GENSQR_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 040f40c4..e9884602 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -54,7 +54,7 @@ x=standard_define([3,2],model,exprs,gr_i); GEN_SQR.prototype.get = function GEN_SQR() { } GEN_SQR.prototype.set = function GEN_SQR() { -y=needcompile; +y=this.needcompile; arg1.model.ipar=1; typ=list(); graphics=arg1.graphics; @@ -77,7 +77,7 @@ sblock=x.model.rpar; if (ierr==0) { [sblock,%w,needcompile2,ok]=do_eval(sblock,list()); if (ok) { -y=max(2,needcompile,needcompile2); +y=max(2,this.needcompile,needcompile2); x.graphics.exprs=exprs; x.model.rpar=sblock; break; diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle new file mode 100644 index 00000000..1922e519 --- /dev/null +++ b/js/Sources/GEN_SQR.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'needcompile' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/Ground_g.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/INIMPL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 8e7695cb..b81e3518 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -30,17 +30,17 @@ if (size(exprs,"*")==1) { exprs=[[exprs[1-1]],["[-1 -2]"],["-1"]]; } while (true) { -[ok,prt,otsz,ot,exprs]=getvalue(_["Set Input block parameters"-1],[[_["Port number"-1]],[_["Outport size ([-1 -2] for inherit)"-1]],[_["Outport Type (-1 for inherit)"-1]]],list("vec",1,"vec",-1,"vec",1),exprs); +[ok,prt,otsz,ot,exprs]=getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),exprs); if (!ok) { break; } prt=int(prt); if (prt<=0) { -message(_["Port number must be a positive integer"-1]); +message(_("Port number must be a positive integer")); } else if (!isequal(size(otsz,"*"),2)) { -message(_["Outport Size must be a 2 elements vector"-1]); +message(_("Outport Size must be a 2 elements vector")); } else if (((ot<1||ot>9)&&(ot!=-1))) { -message(_["Outport type must be a number between 1 and 9, or -1 for inheritance."-1]); +message(_("Outport type must be a number between 1 and 9, or -1 for inheritance.")); } else { if (model.ipar!=prt) { needcompile=4; diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/IN_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/Modulo_Count.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 12f227e4..0f216f21 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -49,7 +49,7 @@ x=standard_define([3,2],model,exprs,gr_i); PULSE_SC.prototype.get = function PULSE_SC() { } PULSE_SC.prototype.set = function PULSE_SC() { -y=needcompile; +y=this.needcompile; arg1.model.ipar=1; typ=list(); graphics=arg1.graphics; @@ -72,7 +72,7 @@ sblock=x.model.rpar; if (ierr==0) { [sblock,%w,needcompile2,ok]=do_eval(sblock,list()); if (ok) { -y=max(2,needcompile,needcompile2); +y=max(2,this.needcompile,needcompile2); x.graphics.exprs=exprs; x.model.rpar=sblock; break; diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle new file mode 100644 index 00000000..1922e519 --- /dev/null +++ b/js/Sources/PULSE_SC.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'needcompile' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/RAMP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/RAND_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/RAND_m.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index cf1be0d7..95ce25c3 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -17,7 +17,7 @@ model.sim=list("readau",2); model.out=nout; model.evtin=1; model.dstate=[[1],[1],[lunit],[zeros(N*M,1)]]; -model.ipar=[[length(fname)],[_str2code[frmt-1]],[ievt],[N],[M],[swap],[offset],[_str2code[fname-1]],[tmask],[outmask]]; +model.ipar=[[length(fname)],[this._str2code[frmt-1]],[ievt],[N],[M],[swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]]; model.blocktype="d"; model.dep_ut=[false,false]; exprs=[[fname],[string(N)],[string(swap)]]; @@ -52,13 +52,13 @@ break; } fname1=stripblanks(fname1); frmt1=stripblanks(frmt1); -if (alreadyran&&fname1!=fname) { +if (this.alreadyran&&fname1!=fname) { block_parameter_error(gettext("Simulation running !!! You cannot modify Input file name"),gettext("End current simulation first.")); } else if (fname1=="") { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Input File Name")),gettext("You must provide a filename.")); } else if (N<1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer size"),N),msprintf(gettext("Must be greater than %d."),1)); -} else if (alreadyran&&(N!=ipar[6-1])) { +} else if (this.alreadyran&&(N!=ipar[6-1])) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running."),gettext("Buffer Size")),gettext("End current simulation first.")); } else if (swap!=0&&swap!=1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); @@ -66,8 +66,8 @@ block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."), [model,graphics,ok]=check_io(model,graphics,[],1,1,[]); frmt1=part(frmt1,1,3); if (ok) { -ipar=[[length(fname1)],[_str2code[frmt1-1]],[0],[N],[M],[swap],[offset,_str2code[fname1-1]],[tmask1,outmask.slice()]]; -if (prod[size(dstate)-1]!=(N*M)+3) { +ipar=[[length(fname1)],[this._str2code[frmt1-1]],[0],[N],[M],[swap],[offset,this._str2code[fname1-1]],[tmask1,outmask.slice()]]; +if (prod(size(dstate))!=(N*M)+3) { dstate=[[-1],[-1],[lunit],[zeros(N*M,1)]]; } model.dstate=dstate; diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle new file mode 100644 index 00000000..62a7fafc --- /dev/null +++ b/js/Sources/READAU_f.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'_str2code' +p2 +aS'alreadyran' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 778d4051..35f1168f 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -13,14 +13,14 @@ offset=1; outmask=1; ievt=0; nout=size(outmask,"*"); -ipar=[[length(fname)],[_str2code[frmt-1]],[ievt],[N],[M],[swap],[offset],[_str2code[fname-1]],[tmask],[outmask]]; +ipar=[[length(fname)],[this._str2code[frmt-1]],[ievt],[N],[M],[swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]]; model=scicos_model(); model.sim=list("readc",2); model.out=nout; model.evtin=1; model.evtout=[]; model.dstate=[[1],[1],[lunit],[zeros(N*M,1)]]; -model.ipar=[[length(fname)],[_str2code[frmt-1]],[ievt],[N],[M],[swap],[offset],[_str2code[fname-1]],[tmask],[outmask]]; +model.ipar=[[length(fname)],[this._str2code[frmt-1]],[ievt],[N],[M],[swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]]; model.blocktype="d"; model.firing=-1; model.dep_ut=[false,false]; @@ -54,15 +54,15 @@ fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"]; nout=size(outmask,"*"); -if (prod[size(tmask1)-1]>1) { +if (prod(size(tmask1))>1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Time Record Selection")),gettext("Must be a scalar or an empty matrix.")); } else if (and(frmt1!=fmts)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("Valid formats are: "+strcat(fmts,", "))); -} else if (alreadyran&&fname1!=fname) { +} else if (this.alreadyran&&fname1!=fname) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running"),gettext("Input File Name")),gettext("End current simulation first.")); -} else if (N!=ipar[6-1]&&alreadyran) { +} else if (N!=ipar[6-1]&&this.alreadyran) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); -} else if (alreadyran&&size(tmask1)!=size(tmask)) { +} else if (this.alreadyran&&size(tmask1)!=size(tmask)) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running."),gettext("Time Record Selection")),gettext("End current simulation first.")); } else if (fname1=="") { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Input File Name")),gettext("You must provide a file name.")); @@ -100,8 +100,8 @@ model.firing=-1; } else { model.firing=0; } -ipar=[[length(fname1)],[_str2code[frmt1-1]],[ievt],[N],[M],[swap],[offset],[_str2code[fname1-1]],[tmask1],[outmask.slice()]]; -if (prod[size(dstate)-1]!=(N*M)+3) { +ipar=[[length(fname1)],[this._str2code[frmt1-1]],[ievt],[N],[M],[swap],[offset],[this._str2code[fname1-1]],[tmask1],[outmask.slice()]]; +if (prod(size(dstate))!=(N*M)+3) { dstate=[[-1],[-1],[lunit],[zeros(N*M,1)]]; } model.dstate=dstate; diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle new file mode 100644 index 00000000..62a7fafc --- /dev/null +++ b/js/Sources/READC_f.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'_str2code' +p2 +aS'alreadyran' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index a9fd24e6..b06b943e 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -10,14 +10,14 @@ N=2; rpar=[]; tmask=0; outmask=1; -ipar=[[length(fname)],[length(frmt)],[0],[N],[_str2code[fname-1]],[_str2code[frmt-1]],[tmask],[outmask]]; +ipar=[[length(fname)],[length(frmt)],[0],[N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[outmask]]; dstate=[[1],[1],[lunit],[zeros((nout)*N,1)]]; model=scicos_model(); model.sim="readf"; model.out=nout; model.evtin=1; model.dstate=dstate; -model.ipar=[[length(fname)],[length(frmt)],[0],[N],[_str2code[fname-1]],[_str2code[frmt-1]],[tmask],[outmask]]; +model.ipar=[[length(fname)],[length(frmt)],[0],[N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[outmask]]; model.blocktype="d"; model.dep_ut=[false,false]; exprs=[[sci2exp([])],[sci2exp(outmask)],[fname],[frmt],[string(N)],[sci2exp(out)]]; @@ -53,7 +53,7 @@ break; fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); nout=size(outmask,"*"); -if (prod[size(tmask1)-1]>1) { +if (prod(size(tmask1))>1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Time Record Selection"),strcat(string(tmask1.slice())," ")),gettext("Empty matrix or scalar expected.")); } else if (tmask1!=[]&&tmask1<1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d"),gettext("Time Record Selection"),tmask1),gettext("Strictly positive integer expected.")); @@ -89,8 +89,8 @@ model.firing=[]; } else { model.firing=0; } -ipar=[[length(fname1)],[length(frmt1)],[ievt],[N],[_str2code[fname1-1]],[_str2code[frmt1-1]],[tmask1],[outmask.slice()]]; -if (prod[size(dstate)-1]!=(nout+ievt)*N+3) { +ipar=[[length(fname1)],[length(frmt1)],[ievt],[N],[this._str2code[fname1-1]],[this._str2code[frmt1-1]],[tmask1],[outmask.slice()]]; +if (prod(size(dstate))!=(nout+ievt)*N+3) { dstate=[[-1],[-1],[lunit],[zeros((nout+ievt)*N,1)]]; } model.dstate=dstate; diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle new file mode 100644 index 00000000..3efc5bbe --- /dev/null +++ b/js/Sources/RFILE_f.pickle @@ -0,0 +1,9 @@ +c__builtin__ +set +p0 +((lp1 +S'_str2code' +p2 +atp3 +Rp4 +.
\ No newline at end of file diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/SAWTOOTH_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/STEP.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 3865ec88..a417a68c 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -2,7 +2,7 @@ function STEP_FUNCTION() { STEP_FUNCTION.prototype.define = function STEP_FUNCTION() { scs_m_1=scicos_diagram(); -scs_m_1.objs[1-1]=STEP["define"-1]; +scs_m_1.objs[1-1]=this.STEP["define"-1]; scs_m_1.objs[2-1]=OUT_f("define"); scs_m_1.objs[3-1]=scicos_link(); scs_m_1.objs[4-1]=scicos_link(); @@ -74,9 +74,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (diffobjs(xxn,xx)) { +if (diffobjs(this.xxn,xx)) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)) { @@ -96,7 +96,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -111,7 +111,7 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; } } diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle new file mode 100644 index 00000000..8ecebb29 --- /dev/null +++ b/js/Sources/STEP_FUNCTION.pickle @@ -0,0 +1,11 @@ +c__builtin__ +set +p0 +((lp1 +S'STEP' +p2 +aS'xxn' +p3 +atp4 +Rp5 +.
\ No newline at end of file diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/SampleCLK.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index b2c05ea8..47782cfb 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -28,7 +28,7 @@ break; } } newpar=list(); -y=0; +this.y=0; for (path in ppath) { np=size(path,"*"); spath=list(); @@ -40,9 +40,9 @@ spath[$+1-1]=path[k-1]; } xx=arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); -if (diffobjs(xxn,xx)) { +if (diffobjs(this.xxn,xx)) { model=xx.model; -model_n=xxn.model; +model_n=this.xxn.model; if (!is_modelica_block(xx)) { modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label); if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) { @@ -65,7 +65,7 @@ needcompile=4; if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) { needcompile=4; } -if (prod[size(model_n.sim)-1]>1) { +if (prod(size(model_n.sim))>1) { if (model_n.sim[2-1]>1000) { if (model.sim[1-1]!=model_n.sim[1-1]) { needcompile=4; @@ -80,9 +80,9 @@ if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outpu needcompile=4; } } -arg1[spath-1]=xxn; +arg1[spath-1]=this.xxn; newpar[size(newpar)+1-1]=path; -y=max(y,needcompile); +this.y=max(this.y,needcompile); } } x=arg1; diff --git a/js/Sources/Sigbuilder.pickle b/js/Sources/Sigbuilder.pickle new file mode 100644 index 00000000..52400405 --- /dev/null +++ b/js/Sources/Sigbuilder.pickle @@ -0,0 +1,17 @@ +c__builtin__ +set +p0 +((lp1 +S'y' +p2 +aS'order' +p3 +aS'ORDER2' +p4 +aS'xxn' +p5 +aS'N' +p6 +atp7 +Rp8 +.
\ No newline at end of file diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/TIME_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Sources/TKSCALE.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Threshold/GENERAL_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Threshold/NEGTOPOS_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Threshold/POSTONEG_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle new file mode 100644 index 00000000..154645d8 --- /dev/null +++ b/js/Threshold/ZCROSS_f.pickle @@ -0,0 +1,7 @@ +c__builtin__ +set +p0 +((lp1 +tp2 +Rp3 +.
\ No newline at end of file |