summaryrefslogtreecommitdiff
path: root/js/Misc/CONSTRAINT2_c.js
diff options
context:
space:
mode:
authorSunil Shetye2018-06-18 23:41:23 +0530
committerSunil Shetye2018-06-19 10:31:46 +0530
commit1170404c7650cb531534b308f103c9b6abd50d14 (patch)
treea6a61ae2a9a3592440483906ce6c7254b3243553 /js/Misc/CONSTRAINT2_c.js
parentcd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (diff)
downloadsci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.gz
sci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.bz2
sci2js-1170404c7650cb531534b308f103c9b6abd50d14.zip
handle multiple rows
Diffstat (limited to 'js/Misc/CONSTRAINT2_c.js')
-rw-r--r--js/Misc/CONSTRAINT2_c.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index a67461e1..cdbb42d8 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -7,8 +7,8 @@ id=[0];
model=scicos_model();
model.sim=list("constraint_c",10004);
model.in1=1;
-model.out=[1,1];
-model.state=[x0,xd0];
+model.out=[[1],[1]];
+model.state=[[x0],[xd0]];
model.ipar=id;
model.blocktype="c";
model.dep_ut=[false,true];
@@ -27,7 +27,7 @@ exprs=graphics.exprs;
model=arg1.model;
while (true) {
ask_again=false;
-[ok,x0,xd0,id,exprs]=scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,x0,xd0,id,exprs]=scicos_getvalue("Set Constraint block parameters",[["Initial guess values of states x"],["Initial guess values of derivative x\'"],["Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"]],list("vec",-1,"vec",-1,"vec",-1),exprs);
if (!ok) {
break;
}
@@ -49,7 +49,7 @@ if ((!ask_again)) {
for (i=1;i<=N;i+=1) {
if (!((id[i-1]==0)||(id[i-1]==1))) {
ask_again=true;
-x_message(["Id(i) must be either","0 when x\'(i) is not present in the feedback","1: when x\'(i) is present in the feedback"]);
+x_message([["Id(i) must be either"],["0 when x\'(i) is not present in the feedback"],["1: when x\'(i) is present in the feedback"]]);
break;
}
if ((id[i-1]==0)) {
@@ -59,8 +59,8 @@ id[i-1]=-1;
}
if (!ask_again) {
graphics.exprs=exprs;
-model.state=[x0,xd0];
-model.out=[N,N];
+model.state=[[x0],[xd0]];
+model.out=[[N],[N]];
model.in1=N;
model.ipar=id;
x.graphics=graphics;