summaryrefslogtreecommitdiff
path: root/js/MatrixOp
diff options
context:
space:
mode:
Diffstat (limited to 'js/MatrixOp')
-rw-r--r--js/MatrixOp/CUMSUM.js4
-rw-r--r--js/MatrixOp/EXTRACT.js4
-rw-r--r--js/MatrixOp/EXTTRI.js4
-rw-r--r--js/MatrixOp/MATBKSL.js4
-rw-r--r--js/MatrixOp/MATDET.js4
-rw-r--r--js/MatrixOp/MATDIAG.js4
-rw-r--r--js/MatrixOp/MATDIV.js4
-rw-r--r--js/MatrixOp/MATEIG.js2
-rw-r--r--js/MatrixOp/MATEXPM.js4
-rw-r--r--js/MatrixOp/MATINV.js4
-rw-r--r--js/MatrixOp/MATLU.js4
-rw-r--r--js/MatrixOp/MATMAGPHI.js2
-rw-r--r--js/MatrixOp/MATMUL.js2
-rw-r--r--js/MatrixOp/MATPINV.js4
-rw-r--r--js/MatrixOp/MATRESH.js2
-rw-r--r--js/MatrixOp/MATSING.js2
-rw-r--r--js/MatrixOp/MATSUM.js4
-rw-r--r--js/MatrixOp/MATTRAN.js4
-rw-r--r--js/MatrixOp/MATZCONJ.js2
-rw-r--r--js/MatrixOp/MATZREIM.js2
-rw-r--r--js/MatrixOp/RICC.js4
-rw-r--r--js/MatrixOp/ROOTCOEF.js2
-rw-r--r--js/MatrixOp/SQRT.js4
-rw-r--r--js/MatrixOp/SUBMAT.js2
24 files changed, 39 insertions, 39 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index 0b111b2f..be176108 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -49,7 +49,7 @@ ot=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -70,7 +70,7 @@ model=scicos_model();
function_name="cumsum_m";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 5189f49a..685ee370 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -48,7 +48,7 @@ ok=None;
}
}
model.ipar=[a,b,ma,mb];
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[ma,mb];
funtyp=4;
if (ok) {
@@ -68,7 +68,7 @@ model=scicos_model();
function_name="extract";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=1;
diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js
index bcba10de..091a673f 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -46,7 +46,7 @@ ot=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -67,7 +67,7 @@ model=scicos_model();
function_name="extrilz";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index e9e4f4a7..10032568 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -27,7 +27,7 @@ it=[2,2];
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_bksl";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=[-1,-1];
+model.in1=[-1,-1];
model.in2=[-2,-3];
model.intyp=[1,1];
model.out=-2;
diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js
index a27c586b..cf408e8e 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -27,7 +27,7 @@ it=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_det";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-1;
model.intyp=1;
model.out=1;
diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js
index 8e4755b4..0c6db943 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -27,7 +27,7 @@ it=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_diag";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=1;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index 9a7fcec4..927537fd 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -27,7 +27,7 @@ it=[2,2];
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_div";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=[-1,-2];
+model.in1=[-1,-2];
model.in2=[-3,-3];
model.intyp=[1,1];
model.out=-1;
diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js
index 6f87ebc6..64df3fd7 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -68,7 +68,7 @@ model=scicos_model();
function_name="mat_vps";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-1;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js
index 3a9b117f..07ca0bc8 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -27,7 +27,7 @@ it=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_expm";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-1;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js
index 04fc617c..3d5e26ab 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -27,7 +27,7 @@ it=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_inv";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-1;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index fa4425bc..9587bbfa 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -28,7 +28,7 @@ message("Datatype is not supported");
ok=None;
}
if (ok) {
-[model,graphics,ok]=set_io(model,graphics,list([model.in,model.in2],it),list([model.out,model.out2],ot),[],[]);
+[model,graphics,ok]=set_io(model,graphics,list([model.in1,model.in2],it),list([model.out,model.out2],ot),[],[]);
}
if (ok) {
funtyp=4;
@@ -45,7 +45,7 @@ model=scicos_model();
function_name="mat_lu";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-1;
model.intyp=1;
model.out=[-1,-1];
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index ee8c394a..cf01de2b 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -51,7 +51,7 @@ model=scicos_model();
function_name="matz_abs";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=2;
model.out=[-1,-1];
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index 4b3cc4d0..62fb14df 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -136,7 +136,7 @@ break
MATMUL.prototype.define = function MATMUL() {
model=scicos_model();
model.sim=list("matmul_m",4);
-model.in=[-1,-2];
+model.in1=[-1,-2];
model.in2=[-2,-3];
model.out=-1;
model.out2=-3;
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index 29e54589..aeeefd53 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -27,7 +27,7 @@ it=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="mat_pinv";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=-2;
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index ea7fc79d..3cdf2c00 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -72,7 +72,7 @@ model=scicos_model();
function_name="mat_reshape";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js
index 789a1349..af7ed201 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -71,7 +71,7 @@ model=scicos_model();
function_name="mat_sing";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=-1;
diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js
index c85eb356..58522aa3 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -52,7 +52,7 @@ ot=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
funtyp=4;
if (ok) {
[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
@@ -72,7 +72,7 @@ model=scicos_model();
function_name="mat_sum";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=1;
diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js
index 893d48f8..dec912fc 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -31,7 +31,7 @@ it=2;
message("Datatype is not supported");
ok=None;
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -49,7 +49,7 @@ break
MATTRAN.prototype.define = function MATTRAN() {
model=scicos_model();
model.sim=list("mattran_m",4);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.out=-2;
model.out2=-1;
diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js
index d08f2f5e..8186c3dc 100644
--- a/js/MatrixOp/MATZCONJ.js
+++ b/js/MatrixOp/MATZCONJ.js
@@ -10,7 +10,7 @@ model=scicos_model();
function_name="matz_conj";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=2;
model.out=-1;
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index ba3a7deb..8ec90ce8 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -51,7 +51,7 @@ model=scicos_model();
function_name="matz_reim";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=2;
model.out=[-1,-1];
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index 876389ca..243b407b 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -15,7 +15,7 @@ while (true) {
if (!ok) {
break
}
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
it=[1,1,1];
ot=1;
@@ -36,7 +36,7 @@ model=scicos_model();
function_name="ricc_m";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=[-1,-1,-1];
+model.in1=[-1,-1,-1];
model.in2=[-1,-1,-1];
model.intyp=[1,1,1];
model.out=-1;
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index 7f24dee9..9487ba00 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -47,7 +47,7 @@ model=scicos_model();
function_name="root_coef";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=1;
model.intyp=1;
model.out=-2;
diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js
index 19ee1bbc..d63b0385 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -22,7 +22,7 @@ ok=None;
}
it=typ;
ot=typ;
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
out=[model.out,model.out2];
funtyp=4;
if (ok) {
@@ -40,7 +40,7 @@ break
SQRT.prototype.define = function SQRT() {
model=scicos_model();
model.sim=list("mat_sqrt",4);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.outtyp=1;
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index de8fdf66..31b92337 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -68,7 +68,7 @@ model=scicos_model();
function_name="submat";
funtyp=4;
model.sim=list(function_name,funtyp);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.out=-1;