change order of functions

25 files changed, 307 insertions, 307 deletions

diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index dcc94175..45e702ff 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/ABSBLK_f.sci" */
 function ABSBLK_f() {
-ABSBLK_f.prototype.get = function ABSBLK_f() {
-}
-ABSBLK_f.prototype.set = function ABSBLK_f() {
-x=arg1;
-}
 ABSBLK_f.prototype.define = function ABSBLK_f() {
 model=scicos_model();
 model.sim=list("absblk",1);
@@ -17,4 +12,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 ABSBLK_f.prototype.details = function ABSBLK_f() {
 }
+ABSBLK_f.prototype.get = function ABSBLK_f() {
+}
+ABSBLK_f.prototype.set = function ABSBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 29ad5d6c..8bfc9623 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/ABS_VALUE.sci" */
 function ABS_VALUE() {
+ABS_VALUE.prototype.define = function ABS_VALUE() {
+nu=-1;
+model=scicos_model();
+model.sim=list("absolute_value",4);
+model.in1=nu;
+model.out=nu;
+model.nzcross=nu;
+model.nmode=nu;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string([1])];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+ABS_VALUE.prototype.details = function ABS_VALUE() {
+}
 ABS_VALUE.prototype.get = function ABS_VALUE() {
 }
 ABS_VALUE.prototype.set = function ABS_VALUE() {
@@ -27,20 +43,4 @@ break
 }
 }
 }
-ABS_VALUE.prototype.define = function ABS_VALUE() {
-nu=-1;
-model=scicos_model();
-model.sim=list("absolute_value",4);
-model.in1=nu;
-model.out=nu;
-model.nzcross=nu;
-model.nmode=nu;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-ABS_VALUE.prototype.details = function ABS_VALUE() {
-}
 }
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index ec2b1ca8..3ec4e559 100644
--- a/js/NonLinear/COSBLK_f.js
+++ b/js/NonLinear/COSBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/COSBLK_f.sci" */
 function COSBLK_f() {
-COSBLK_f.prototype.get = function COSBLK_f() {
-}
-COSBLK_f.prototype.set = function COSBLK_f() {
-x=arg1;
-}
 COSBLK_f.prototype.define = function COSBLK_f() {
 in1=1;
 model=scicos_model();
@@ -18,4 +13,9 @@ x=standard_define([2,2],model,[],gr_i);
 }
 COSBLK_f.prototype.details = function COSBLK_f() {
 }
+COSBLK_f.prototype.get = function COSBLK_f() {
+}
+COSBLK_f.prototype.set = function COSBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index a60cfc0a..057c0c84 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -1,5 +1,29 @@
 /* autogenerated from "macros/NonLinear/DLRADAPT_f.sci" */
 function DLRADAPT_f() {
+DLRADAPT_f.prototype.define = function DLRADAPT_f() {
+p=[0,1];
+rn=[];
+rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
+g=[1,1];
+last_u=[];
+last_y=[0,0];
+model=scicos_model();
+model.sim="dlradp";
+model.in1=[1,1];
+model.out=1;
+model.evtin=1;
+model.dstate=[last_u,last_y];
+model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
+model.ipar=[0,2,2];
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[true,false];
+exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+DLRADAPT_f.prototype.details = function DLRADAPT_f() {
+}
 DLRADAPT_f.prototype.get = function DLRADAPT_f() {
 }
 DLRADAPT_f.prototype.set = function DLRADAPT_f() {
@@ -31,28 +55,4 @@ break
 }
 }
 }
-DLRADAPT_f.prototype.define = function DLRADAPT_f() {
-p=[0,1];
-rn=[];
-rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)];
-g=[1,1];
-last_u=[];
-last_y=[0,0];
-model=scicos_model();
-model.sim="dlradp";
-model.in1=[1,1];
-model.out=1;
-model.evtin=1;
-model.dstate=[last_u,last_y];
-model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd.slice()),g.slice()];
-model.ipar=[0,2,2];
-model.blocktype="d";
-model.firing=[];
-model.dep_ut=[true,false];
-exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-DLRADAPT_f.prototype.details = function DLRADAPT_f() {
-}
 }
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index dcb5acd5..749eedbb 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/EXPBLK_f.sci" */
 function EXPBLK_f() {
+EXPBLK_f.prototype.define = function EXPBLK_f() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim="expblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=["%e"];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EXPBLK_f.prototype.details = function EXPBLK_f() {
+}
 EXPBLK_f.prototype.get = function EXPBLK_f() {
 }
 EXPBLK_f.prototype.set = function EXPBLK_f() {
@@ -26,20 +42,4 @@ break
 }
 }
 }
-EXPBLK_f.prototype.define = function EXPBLK_f() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim="expblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=["%e"];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EXPBLK_f.prototype.details = function EXPBLK_f() {
-}
 }
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index c46e07b8..04c4b463 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -1,5 +1,25 @@
 /* autogenerated from "macros/NonLinear/EXPBLK_m.sci" */
 function EXPBLK_m() {
+EXPBLK_m.prototype.define = function EXPBLK_m() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim=list("expblk_m",4);
+model.in1=-1;
+model.in2=-2;
+model.out=-1;
+model.out2=-2;
+model.intyp=1;
+model.outtyp=1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=["%e"];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+EXPBLK_m.prototype.details = function EXPBLK_m() {
+}
 EXPBLK_m.prototype.get = function EXPBLK_m() {
 }
 EXPBLK_m.prototype.set = function EXPBLK_m() {
@@ -26,24 +46,4 @@ break
 }
 }
 }
-EXPBLK_m.prototype.define = function EXPBLK_m() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim=list("expblk_m",4);
-model.in1=-1;
-model.in2=-2;
-model.out=-1;
-model.out2=-2;
-model.intyp=1;
-model.outtyp=1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=["%e"];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-EXPBLK_m.prototype.details = function EXPBLK_m() {
-}
 }
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index 84dc35d6..afe7dc7f 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/FSV_f.sci" */
 function FSV_f() {
-FSV_f.prototype.get = function FSV_f() {
-}
-FSV_f.prototype.set = function FSV_f() {
-x=arg1;
-}
 FSV_f.prototype.define = function FSV_f() {
 in1=1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 FSV_f.prototype.details = function FSV_f() {
 }
+FSV_f.prototype.get = function FSV_f() {
+}
+FSV_f.prototype.set = function FSV_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index f37934d5..c4ea614f 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -1,5 +1,23 @@
 /* autogenerated from "macros/NonLinear/INTRP2BLK_f.sci" */
 function INTRP2BLK_f() {
+INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
+a=[0,1];
+b=[0,1];
+c=[0,1,1,2];
+model=scicos_model();
+model.sim=list("intrp2",1);
+model.in1=[1,1];
+model.out=1;
+model.rpar=[a,b,c.slice()];
+model.ipar=[2,2];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
+}
 INTRP2BLK_f.prototype.get = function INTRP2BLK_f() {
 }
 INTRP2BLK_f.prototype.set = function INTRP2BLK_f() {
@@ -28,22 +46,4 @@ break
 }
 }
 }
-INTRP2BLK_f.prototype.define = function INTRP2BLK_f() {
-a=[0,1];
-b=[0,1];
-c=[0,1,1,2];
-model=scicos_model();
-model.sim=list("intrp2",1);
-model.in1=[1,1];
-model.out=1;
-model.rpar=[a,b,c.slice()];
-model.ipar=[2,2];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))];
-gr_i=[];
-x=standard_define([3,2],model,exprs,gr_i);
-}
-INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
-}
 }
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 9d766fc0..778a7750 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/INTRPLBLK_f.sci" */
 function INTRPLBLK_f() {
+INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
+a=[0,1];
+b=[0,1];
+model=scicos_model();
+model.sim="intrpl";
+model.in1=1;
+model.out=1;
+model.rpar=[a,b];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
+}
 INTRPLBLK_f.prototype.get = function INTRPLBLK_f() {
 }
 INTRPLBLK_f.prototype.set = function INTRPLBLK_f() {
@@ -27,20 +43,4 @@ break
 }
 }
 }
-INTRPLBLK_f.prototype.define = function INTRPLBLK_f() {
-a=[0,1];
-b=[0,1];
-model=scicos_model();
-model.sim="intrpl";
-model.in1=1;
-model.out=1;
-model.rpar=[a,b];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
-}
 }
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index 9bddbbba..f8cd77f8 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/INVBLK.sci" */
 function INVBLK() {
-INVBLK.prototype.get = function INVBLK() {
-}
-INVBLK.prototype.set = function INVBLK() {
-x=arg1;
-}
 INVBLK.prototype.define = function INVBLK() {
 in1=-1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 INVBLK.prototype.details = function INVBLK() {
 }
+INVBLK.prototype.get = function INVBLK() {
+}
+INVBLK.prototype.set = function INVBLK() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index e0f55c5a..448e087e 100644
--- a/js/NonLinear/INVBLK_f.js
+++ b/js/NonLinear/INVBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/INVBLK_f.sci" */
 function INVBLK_f() {
-INVBLK_f.prototype.get = function INVBLK_f() {
-}
-INVBLK_f.prototype.set = function INVBLK_f() {
-x=arg1;
-}
 INVBLK_f.prototype.define = function INVBLK_f() {
 in1=-1;
 model=scicos_model();
@@ -19,4 +14,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 INVBLK_f.prototype.details = function INVBLK_f() {
 }
+INVBLK_f.prototype.get = function INVBLK_f() {
+}
+INVBLK_f.prototype.set = function INVBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index ce6a47d2..0beef08f 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */
 function LOGBLK_f() {
+LOGBLK_f.prototype.define = function LOGBLK_f() {
+in1=1;
+a=math.E;
+model=scicos_model();
+model.sim="logblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs="%e";
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+LOGBLK_f.prototype.details = function LOGBLK_f() {
+}
 LOGBLK_f.prototype.get = function LOGBLK_f() {
 }
 LOGBLK_f.prototype.set = function LOGBLK_f() {
@@ -28,20 +44,4 @@ break
 }
 }
 }
-LOGBLK_f.prototype.define = function LOGBLK_f() {
-in1=1;
-a=math.E;
-model=scicos_model();
-model.sim="logblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs="%e";
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-LOGBLK_f.prototype.details = function LOGBLK_f() {
-}
 }
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 86816ddc..7fe2bc8a 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -1,5 +1,18 @@
 /* autogenerated from "macros/NonLinear/LOOKUP_f.sci" */
 function LOOKUP_f() {
+LOOKUP_f.prototype.define = function LOOKUP_f() {
+model=scicos_model();
+model.sim="lookup";
+model.in1=1;
+model.out=1;
+model.rpar=[-2,-1,1,2,-1,1,-1,1];
+model.blocktype="c";
+model.dep_ut=[true,false];
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+LOOKUP_f.prototype.details = function LOOKUP_f() {
+}
 LOOKUP_f.prototype.get = function LOOKUP_f() {
 }
 LOOKUP_f.prototype.set = function LOOKUP_f() {
@@ -34,17 +47,4 @@ break
 }
 }
 }
-LOOKUP_f.prototype.define = function LOOKUP_f() {
-model=scicos_model();
-model.sim="lookup";
-model.in1=1;
-model.out=1;
-model.rpar=[-2,-1,1,2,-1,1,-1,1];
-model.blocktype="c";
-model.dep_ut=[true,false];
-gr_i=[];
-x=standard_define([2,2],model,[],gr_i);
-}
-LOOKUP_f.prototype.details = function LOOKUP_f() {
-}
 }
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index aea7b9e6..d63f92fc 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/NonLinear/MAXMIN.sci" */
 function MAXMIN() {
+MAXMIN.prototype.define = function MAXMIN() {
+model=scicos_model();
+model.sim=list("minmax",4);
+model.out=1;
+model.in1=-1;
+model.blocktype="c";
+model.dep_ut=[true,false];
+model.ipar=0;
+exprs=[string(transpose([2,1,1]))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+x.graphics.style="MAXMIN;displayedLabel=MAX";
+}
+MAXMIN.prototype.details = function MAXMIN() {
+}
 MAXMIN.prototype.get = function MAXMIN() {
 }
 MAXMIN.prototype.set = function MAXMIN() {
@@ -50,19 +65,4 @@ break
 }
 }
 }
-MAXMIN.prototype.define = function MAXMIN() {
-model=scicos_model();
-model.sim=list("minmax",4);
-model.out=1;
-model.in1=-1;
-model.blocktype="c";
-model.dep_ut=[true,false];
-model.ipar=0;
-exprs=[string(transpose([2,1,1]))];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-x.graphics.style="MAXMIN;displayedLabel=MAX";
-}
-MAXMIN.prototype.details = function MAXMIN() {
-}
 }
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index f774e2a5..fe056aeb 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/MAX_f.sci" */
 function MAX_f() {
-MAX_f.prototype.get = function MAX_f() {
-}
-MAX_f.prototype.set = function MAX_f() {
-x=arg1;
-}
 MAX_f.prototype.define = function MAX_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +15,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 MAX_f.prototype.details = function MAX_f() {
 }
+MAX_f.prototype.get = function MAX_f() {
+}
+MAX_f.prototype.set = function MAX_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index d25fa771..cddd8668 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/MIN_f.sci" */
 function MIN_f() {
-MIN_f.prototype.get = function MIN_f() {
-}
-MIN_f.prototype.set = function MIN_f() {
-x=arg1;
-}
 MIN_f.prototype.define = function MIN_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +15,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 MIN_f.prototype.details = function MIN_f() {
 }
+MIN_f.prototype.get = function MIN_f() {
+}
+MIN_f.prototype.set = function MIN_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index 939decb4..b06b150e 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/POWBLK_f.sci" */
 function POWBLK_f() {
+POWBLK_f.prototype.define = function POWBLK_f() {
+in1=1;
+a=1.5;
+model=scicos_model();
+model.sim="powblk";
+model.in1=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=string(a);
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+POWBLK_f.prototype.details = function POWBLK_f() {
+}
 POWBLK_f.prototype.get = function POWBLK_f() {
 }
 POWBLK_f.prototype.set = function POWBLK_f() {
@@ -29,20 +45,4 @@ x.model=model;
 break
 }
 }
-POWBLK_f.prototype.define = function POWBLK_f() {
-in1=1;
-a=1.5;
-model=scicos_model();
-model.sim="powblk";
-model.in1=-1;
-model.out=-1;
-model.rpar=a;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=string(a);
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-POWBLK_f.prototype.details = function POWBLK_f() {
-}
 }
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 6e03bfb9..4f9b4538 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -1,5 +1,20 @@
 /* autogenerated from "macros/NonLinear/PRODUCT.sci" */
 function PRODUCT() {
+PRODUCT.prototype.define = function PRODUCT() {
+sgn=[1,-1];
+model=scicos_model();
+model.sim=list("product",4);
+model.in1=[-1,-1];
+model.out=-1;
+model.ipar=sgn;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=sci2exp(sgn);
+gr_i=[];
+x=standard_define([2,3],model,exprs,gr_i);
+}
+PRODUCT.prototype.details = function PRODUCT() {
+}
 PRODUCT.prototype.get = function PRODUCT() {
 }
 PRODUCT.prototype.set = function PRODUCT() {
@@ -47,19 +62,4 @@ break
 }
 }
 }
-PRODUCT.prototype.define = function PRODUCT() {
-sgn=[1,-1];
-model=scicos_model();
-model.sim=list("product",4);
-model.in1=[-1,-1];
-model.out=-1;
-model.ipar=sgn;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=sci2exp(sgn);
-gr_i=[];
-x=standard_define([2,3],model,exprs,gr_i);
-}
-PRODUCT.prototype.details = function PRODUCT() {
-}
 }
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index fadb14e9..609799fb 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/PROD_f.sci" */
 function PROD_f() {
-PROD_f.prototype.get = function PROD_f() {
-}
-PROD_f.prototype.set = function PROD_f() {
-x=arg1;
-}
 PROD_f.prototype.define = function PROD_f() {
 model=scicos_model();
 model.sim=list("prod",2);
@@ -16,4 +11,9 @@ x=standard_define([1,1],model,[],[]);
 }
 PROD_f.prototype.details = function PROD_f() {
 }
+PROD_f.prototype.get = function PROD_f() {
+}
+PROD_f.prototype.set = function PROD_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index e7c99640..89be5a6c 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -1,5 +1,22 @@
 /* autogenerated from "macros/NonLinear/QUANT_f.sci" */
 function QUANT_f() {
+QUANT_f.prototype.define = function QUANT_f() {
+pas=0.1;
+meth=1;
+model=scicos_model();
+model.sim="qzrnd";
+model.in1=-1;
+model.out=-1;
+model.rpar=pas;
+model.ipar=meth;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(pas),string(meth)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+QUANT_f.prototype.details = function QUANT_f() {
+}
 QUANT_f.prototype.get = function QUANT_f() {
 }
 QUANT_f.prototype.set = function QUANT_f() {
@@ -35,21 +52,4 @@ break
 }
 }
 }
-QUANT_f.prototype.define = function QUANT_f() {
-pas=0.1;
-meth=1;
-model=scicos_model();
-model.sim="qzrnd";
-model.in1=-1;
-model.out=-1;
-model.rpar=pas;
-model.ipar=meth;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(pas),string(meth)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-QUANT_f.prototype.details = function QUANT_f() {
-}
 }
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index 19c2390a..ca72873f 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/NonLinear/SATURATION.sci" */
 function SATURATION() {
+SATURATION.prototype.define = function SATURATION() {
+minp=-1;
+maxp=1;
+rpar=[maxp,minp];
+model=scicos_model();
+model.sim=list("satur",4);
+model.in1=1;
+model.nzcross=2;
+model.nmode=1;
+model.out=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(maxp),string(minp),string(model.nmode)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SATURATION.prototype.details = function SATURATION() {
+}
 SATURATION.prototype.get = function SATURATION() {
 }
 SATURATION.prototype.set = function SATURATION() {
@@ -31,23 +50,4 @@ break
 }
 }
 }
-SATURATION.prototype.define = function SATURATION() {
-minp=-1;
-maxp=1;
-rpar=[maxp,minp];
-model=scicos_model();
-model.sim=list("satur",4);
-model.in1=1;
-model.nzcross=2;
-model.nmode=1;
-model.out=1;
-model.rpar=rpar;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(maxp),string(minp),string(model.nmode)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SATURATION.prototype.details = function SATURATION() {
-}
 }
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index fe8ead9c..418fedee 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -1,5 +1,24 @@
 /* autogenerated from "macros/NonLinear/SAT_f.sci" */
 function SAT_f() {
+SAT_f.prototype.define = function SAT_f() {
+minp=-1;
+maxp=1;
+slope=1;
+rpar=[minp,maxp,slope];
+model=scicos_model();
+model.sim=list("lusat",1);
+model.in1=1;
+model.nzcross=2;
+model.out=1;
+model.rpar=[minp,maxp,slope];
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string(minp),string(maxp),string(slope)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SAT_f.prototype.details = function SAT_f() {
+}
 SAT_f.prototype.get = function SAT_f() {
 }
 SAT_f.prototype.set = function SAT_f() {
@@ -27,23 +46,4 @@ break
 }
 }
 }
-SAT_f.prototype.define = function SAT_f() {
-minp=-1;
-maxp=1;
-slope=1;
-rpar=[minp,maxp,slope];
-model=scicos_model();
-model.sim=list("lusat",1);
-model.in1=1;
-model.nzcross=2;
-model.out=1;
-model.rpar=[minp,maxp,slope];
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string(minp),string(maxp),string(slope)];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SAT_f.prototype.details = function SAT_f() {
-}
 }
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 4fab41aa..6fc8359c 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -1,5 +1,21 @@
 /* autogenerated from "macros/NonLinear/SIGNUM.sci" */
 function SIGNUM() {
+SIGNUM.prototype.define = function SIGNUM() {
+nu=-1;
+model=scicos_model();
+model.sim=list("signum",4);
+model.in1=nu;
+model.out=nu;
+model.nzcross=nu;
+model.nmode=nu;
+model.blocktype="c";
+model.dep_ut=[true,false];
+exprs=[string([1])];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+SIGNUM.prototype.details = function SIGNUM() {
+}
 SIGNUM.prototype.get = function SIGNUM() {
 }
 SIGNUM.prototype.set = function SIGNUM() {
@@ -27,20 +43,4 @@ break
 }
 }
 }
-SIGNUM.prototype.define = function SIGNUM() {
-nu=-1;
-model=scicos_model();
-model.sim=list("signum",4);
-model.in1=nu;
-model.out=nu;
-model.nzcross=nu;
-model.nmode=nu;
-model.blocktype="c";
-model.dep_ut=[true,false];
-exprs=[string([1])];
-gr_i=[];
-x=standard_define([2,2],model,exprs,gr_i);
-}
-SIGNUM.prototype.details = function SIGNUM() {
-}
 }
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index 5a3f206a..e8d272a8 100644
--- a/js/NonLinear/SINBLK_f.js
+++ b/js/NonLinear/SINBLK_f.js
@@ -1,10 +1,5 @@
 /* autogenerated from "macros/NonLinear/SINBLK_f.sci" */
 function SINBLK_f() {
-SINBLK_f.prototype.get = function SINBLK_f() {
-}
-SINBLK_f.prototype.set = function SINBLK_f() {
-x=arg1;
-}
 SINBLK_f.prototype.define = function SINBLK_f() {
 model=scicos_model();
 model.sim="sinblk";
@@ -18,4 +13,9 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 SINBLK_f.prototype.details = function SINBLK_f() {
 }
+SINBLK_f.prototype.get = function SINBLK_f() {
+}
+SINBLK_f.prototype.set = function SINBLK_f() {
+x=arg1;
+}
 }
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index 4ea8dede..dc7ec656 100644
--- a/js/NonLinear/TANBLK_f.js
+++ b/js/NonLinear/TANBLK_f.js
@@ -1,11 +1,5 @@
 /* autogenerated from "macros/NonLinear/TANBLK_f.sci" */
 function TANBLK_f() {
-TANBLK_f.prototype.get = function TANBLK_f() {
-}
-TANBLK_f.prototype.set = function TANBLK_f() {
-x=arg1;
-x.model.firing=[];
-}
 TANBLK_f.prototype.define = function TANBLK_f() {
 in1=-1;
 model=scicos_model();
@@ -20,4 +14,10 @@ x=standard_define([2,2],model,exprs,gr_i);
 }
 TANBLK_f.prototype.details = function TANBLK_f() {
 }
+TANBLK_f.prototype.get = function TANBLK_f() {
+}
+TANBLK_f.prototype.set = function TANBLK_f() {
+x=arg1;
+x.model.firing=[];
+}
 }