summaryrefslogtreecommitdiff
path: root/js/MatrixOp
diff options
context:
space:
mode:
Diffstat (limited to 'js/MatrixOp')
-rw-r--r--js/MatrixOp/MATCATH.js2
-rw-r--r--js/MatrixOp/MATCATV.js2
-rw-r--r--js/MatrixOp/MATMUL.js4
-rw-r--r--js/MatrixOp/MATRESH.js6
-rw-r--r--js/MatrixOp/SUBMAT.js6
5 files changed, 10 insertions, 10 deletions
diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js
index 930bba26..830403aa 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -34,7 +34,7 @@ model=arg1.model;
graphics=arg1.graphics;
label=graphics.exprs;
if (size(label,"*")>1) {
-label="size(evstr("+label(2)+"),\'*\')";
+label="size(evstr("+label[2-1]+"),\'*\')";
}
while (true) {
[ok,nin,lab]=scicos_getvalue("Set MATCATH block parameters",["Number of input"],list("vec",1),label);
diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js
index 9d22c7cd..3d8cfe3f 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -35,7 +35,7 @@ model=arg1.model;
graphics=arg1.graphics;
label=graphics.exprs;
if (size(label,"*")>1) {
-label="size(evstr("+label(2)+"),\'*\')";
+label="size(evstr("+label[2-1]+"),\'*\')";
}
while (true) {
[ok,nin,lab]=scicos_getvalue("Set MATCATV block parameters",["Number od inputs"],list("vec",1),label);
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index 623748a7..2d525127 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -121,8 +121,8 @@ model.sim=list("matmul_ui8e",4);
}
}
}
-kmin=TABMIN(dtype);
-kmax=TABMAX(dtype);
+kmin=TABMIN[dtype-1];
+kmax=TABMAX[dtype-1];
it=dtype*ones(1,2);
ot=dtype;
if (rule==1) {
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index eacbd0a0..7136c644 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -52,15 +52,15 @@ message("input must have at least one element");
ok=false;
}
if (ok) {
-if (((out(1)>(l1(1)*l1(2))))) {
+if (((out[1-1]>(l1[1-1]*l1[2-1])))) {
message("the first dimension of the output is too big");
ok=false;
}
-if (((out(2)>(l1(1)*l1(2))))) {
+if (((out[2-1]>(l1[1-1]*l1[2-1])))) {
message("the second dimension of the output is too big");
ok=false;
}
-if ((((out(2)*out(1))>(l1(1)*l1(2))))) {
+if ((((out[2-1]*out[1-1])>(l1[1-1]*l1[2-1])))) {
message("the dimensions of the output are too big");
ok=false;
}
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index 30a9cd1a..ff35a0fd 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -65,16 +65,16 @@ if (d<c) {
message("ending column must be greater than starting column");
ok=false;
}
-if (b>inp(1)) {
+if (b>inp[1-1]) {
message("index of ending row is out of range");
ok=false;
}
-if (d>inp(2)) {
+if (d>inp[2-1]) {
message("index of ending column is out of range");
ok=false;
}
model.ipar=[[a],[b],[c],[d]];
-in1=[inp(1),inp(2)];
+in1=[inp[1-1],inp[2-1]];
out=[(b-a)+1,(d-c)+1];
funtyp=4;
label=exprs;