summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
authorSunil Shetye2018-06-18 17:30:31 +0530
committerSunil Shetye2018-06-18 20:30:18 +0530
commitcd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (patch)
tree56407047bba37f94b7b5f00890b4385cefa502fd /js/NonLinear
parent0fd33c776a03e3b9ad2267e4f3fbb2c7bcbbb92a (diff)
downloadsci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.tar.gz
sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.tar.bz2
sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.zip
use format string
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/ABS_VALUE.js4
-rw-r--r--js/NonLinear/DLRADAPT_f.js4
-rw-r--r--js/NonLinear/EXPBLK_f.js4
-rw-r--r--js/NonLinear/EXPBLK_m.js4
-rw-r--r--js/NonLinear/INTRP2BLK_f.js4
-rw-r--r--js/NonLinear/INTRPLBLK_f.js4
-rw-r--r--js/NonLinear/LOGBLK_f.js4
-rw-r--r--js/NonLinear/LOOKUP_f.js4
-rw-r--r--js/NonLinear/MAXMIN.js4
-rw-r--r--js/NonLinear/POWBLK_f.js4
-rw-r--r--js/NonLinear/PRODUCT.js4
-rw-r--r--js/NonLinear/QUANT_f.js4
-rw-r--r--js/NonLinear/SATURATION.js4
-rw-r--r--js/NonLinear/SAT_f.js4
-rw-r--r--js/NonLinear/SIGNUM.js4
15 files changed, 30 insertions, 30 deletions
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 8bfc9623..193b6ed5 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -26,7 +26,7 @@ model=arg1.model;
while (true) {
[ok,zcr,exprs]=scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs);
if (!ok) {
-break
+break;
}
graphics.exprs=exprs;
if (ok) {
@@ -39,7 +39,7 @@ model.nzcross=0;
}
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 057c0c84..e562b3ab 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -34,7 +34,7 @@ model=arg1.model;
while (true) {
[ok,p,rn,rd,g,last_u,last_y,exprs]=scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs);
if (!ok) {
-break
+break;
}
m=size(rn,2);
[npt,n]=size(rd);
@@ -51,7 +51,7 @@ model.ipar=ipar;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index 749eedbb..1422f9dc 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -29,7 +29,7 @@ exprs=exprs[2-1];
while (true) {
[ok,a,exprs]=scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs);
if (!ok) {
-break
+break;
}
if (or(a<=0)) {
message("a^u : a must be positive");
@@ -38,7 +38,7 @@ graphics.exprs=exprs;
model.rpar=a;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index 04c4b463..b7334c03 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -33,7 +33,7 @@ exprs=exprs[2-1];
while (true) {
[ok,a,exprs]=scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs);
if (!ok) {
-break
+break;
}
if (or(a<=0)) {
message("a^u : a must be positive");
@@ -42,7 +42,7 @@ graphics.exprs=exprs;
model.rpar=a;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index c4ea614f..0096ef52 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -28,7 +28,7 @@ model=arg1.model;
while (true) {
[ok,a,b,c,exprs]=scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs);
if (!ok) {
-break
+break;
}
if (size(a,"*")!=size(c,"c")||size(b,"*")!=size(c,"r")) {
message("incompatible dimension");
@@ -41,7 +41,7 @@ model.rpar=[a.slice(),b.slice(),c.slice()];
model.ipar=[size(a,"*"),size(b,"*")];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 778a7750..15660af6 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -26,7 +26,7 @@ model=arg1.model;
while (true) {
[ok,a,b,exprs]=scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),exprs);
if (!ok) {
-break
+break;
}
if (size(a,"*")!=size(b,"*")) {
message("X and Y must have the same size");
@@ -38,7 +38,7 @@ graphics.exprs=exprs;
model.rpar=[a.slice(),b.slice()];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index 0beef08f..d48306b6 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -29,7 +29,7 @@ exprs=exprs[2-1];
while (true) {
[ok,a,exprs]=scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),exprs);
if (!ok) {
-break
+break;
}
if (a<=1) {
message("Basis must be larger than 1");
@@ -39,7 +39,7 @@ graphics.exprs=exprs;
model.rpar=a;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 7fe2bc8a..42d6e2b5 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -32,7 +32,7 @@ if (!or(fun=="do_eval")) {
ok=true;
}
if (!ok) {
-break
+break;
}
n=size(xx,"*");
if (or(xx.slice(2-1,n)-xx.slice(1-1,n-1)<=0)) {
@@ -43,7 +43,7 @@ if (ok) {
model.rpar=[xx.slice(),yy.slice()];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index d63f92fc..1a58b4ac 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -25,7 +25,7 @@ model=arg1.model;
while (true) {
[ok,mm,nin,zcr,exprs]=scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (zcr!=0) {
zcr=-1;
@@ -61,7 +61,7 @@ graphics.style="MAXMIN;displayedLabel="+label;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index b06b150e..9112cd55 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -29,7 +29,7 @@ exprs=exprs[2-1];
while (true) {
[ok,a,exprs]=scicos_getvalue("Set u^a block parameters","to the power of",list("vec",1),exprs);
if (!ok) {
-break
+break;
}
graphics.exprs=exprs;
if (a==int(a)) {
@@ -42,7 +42,7 @@ model.ipar=[];
model.firing=[];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 4f9b4538..2b0b4a60 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -25,7 +25,7 @@ exprs=graphics.exprs;
while (true) {
[ok,sgn,exprs]=scicos_getvalue([" Set multiplication block parameters","(multiplication is set with + 1, division with -1)",""],"Number of inputs or sign vector",list("vec",-1),exprs);
if (!ok) {
-break
+break;
}
sgn=sgn.slice();
if (size(sgn,1)==1) {
@@ -58,7 +58,7 @@ model.ipar=sgn;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index 89be5a6c..397ebc71 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -27,7 +27,7 @@ model=arg1.model;
while (true) {
[ok,pas,meth,exprs]=scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (meth<1||meth>4) {
message("Quantization Type must be from 1 to 4");
@@ -48,7 +48,7 @@ model.sim="qzcel";
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index ca72873f..42378033 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -29,7 +29,7 @@ model=arg1.model;
while (true) {
[ok,maxp,minp,zeroc,exprs]=scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (maxp<=minp) {
message("Upper limit must be > Lower limit");
@@ -46,7 +46,7 @@ model.nmode=0;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index 418fedee..7a1c05eb 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -29,7 +29,7 @@ model=arg1.model;
while (true) {
[ok,minp,maxp,pente,exprs]=scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (maxp<=0) {
message("Max must be strictly positive");
@@ -42,7 +42,7 @@ model.firing=[];
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 6fc8359c..c1fe4761 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -26,7 +26,7 @@ model=arg1.model;
while (true) {
[ok,zcr,exprs]=scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs);
if (!ok) {
-break
+break;
}
graphics.exprs=exprs;
if (ok) {
@@ -39,7 +39,7 @@ model.nzcross=0;
}
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}