identify the job blocks

1 files changed, 47 insertions, 278 deletions

diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index 9166b76f..8b17f02e 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -1,278 +1,47 @@
-LexToken(EOL,'\n',1,10)
-LexToken(EOL,'\n',1,13)
-LexToken(EOL,'\n',1,73)
-LexToken(EOL,'\n',1,76)
-LexToken(EOL,'\n',1,148)
-LexToken(EOL,'\n',1,220)
-LexToken(EOL,'\n',1,289)
-LexToken(EOL,'\n',1,328)
-LexToken(EOL,'\n',1,331)
-LexToken(EOL,'\n',1,398)
-LexToken(EOL,'\n',1,464)
-LexToken(EOL,'\n',1,529)
-LexToken(EOL,'\n',1,577)
-LexToken(EOL,'\n',1,580)
-LexToken(EOL,'\n',1,649)
-LexToken(EOL,'\n',1,712)
-LexToken(EOL,'\n',1,794)
-LexToken(EOL,'\n',1,797)
-LexToken(EOL,'\n',1,828)
-LexToken(EOL,'\n',1,831)
-LexToken(EOL,'\n',1,832)
-LexToken(FUNCTION,'function',1,833)
-LexToken(OPENSQBRACKET,'[',1,842)
-LexToken(VAR,'x',1,843)
-LexToken(COMMA,',',1,844)
-LexToken(VAR,'y',1,845)
-LexToken(COMMA,',',1,846)
-LexToken(VAR,'typ',1,847)
-LexToken(CLOSESQBRACKET,']',1,850)
-LexToken(ASSIGNMENT,'=',1,851)
-LexToken(VAR,'LOGBLK_f',1,852)
-LexToken(OPENBRACKET,'(',1,860)
-LexToken(VAR,'job',1,861)
-LexToken(COMMA,',',1,864)
-LexToken(VAR,'arg1',1,865)
-LexToken(COMMA,',',1,869)
-LexToken(VAR,'arg2',1,870)
-LexToken(CLOSEBRACKET,')',1,874)
-LexToken(EOL,'\n',1,875)
-LexToken(VAR,'x',1,880)
-LexToken(ASSIGNMENT,'=',1,881)
-LexToken(OPENSQBRACKET,'[',1,882)
-LexToken(CLOSESQBRACKET,']',1,883)
-LexToken(EOL,'\n',1,884)
-LexToken(VAR,'y',1,890)
-LexToken(ASSIGNMENT,'=',1,891)
-LexToken(OPENSQBRACKET,'[',1,892)
-LexToken(CLOSESQBRACKET,']',1,893)
-LexToken(EOL,'\n',1,894)
-LexToken(VAR,'typ',1,900)
-LexToken(ASSIGNMENT,'=',1,903)
-LexToken(OPENSQBRACKET,'[',1,904)
-LexToken(CLOSESQBRACKET,']',1,905)
-LexToken(EOL,'\n',1,906)
-LexToken(SELECT,'select',1,912)
-LexToken(VAR,'job',1,919)
-LexToken(EOL,'\n',1,922)
-LexToken(CASE,'case',1,927)
-LexToken(DQSTRING,'"set"',1,936)
-LexToken(THEN,'then',1,938)
-LexToken(EOL,'\n',1,942)
-LexToken(VAR,'x',1,951)
-LexToken(ASSIGNMENT,'=',1,952)
-LexToken(VAR,'arg1',1,953)
-LexToken(EOL,'\n',1,957)
-LexToken(VAR,'graphics',1,967)
-LexToken(ASSIGNMENT,'=',1,975)
-LexToken(VAR,'arg1',1,976)
-LexToken(DOT,'.',1,980)
-LexToken(VAR,'graphics',1,981)
-LexToken(EOL,'\n',1,989)
-LexToken(VAR,'exprs',1,999)
-LexToken(ASSIGNMENT,'=',1,1004)
-LexToken(VAR,'graphics',1,1005)
-LexToken(DOT,'.',1,1013)
-LexToken(VAR,'exprs',1,1014)
-LexToken(EOL,'\n',1,1019)
-LexToken(VAR,'model',1,1028)
-LexToken(ASSIGNMENT,'=',1,1033)
-LexToken(VAR,'arg1',1,1034)
-LexToken(DOT,'.',1,1038)
-LexToken(VAR,'model',1,1039)
-LexToken(EOL,'\n',1,1044)
-LexToken(IF,'if',1,1054)
-LexToken(VAR,'size',1,1057)
-LexToken(OPENBRACKET,'(',1,1061)
-LexToken(VAR,'exprs',1,1062)
-LexToken(COMMA,',',1,1067)
-LexToken(DQSTRING,'"*"',1,1070)
-LexToken(CLOSEBRACKET,')',1,1071)
-LexToken(COMPARISON,'==',1,1072)
-LexToken(NUMBER,'2',1,1074)
-LexToken(THEN,'then',1,1076)
-LexToken(EOL,'\n',1,1080)
-LexToken(VAR,'exprs',1,1093)
-LexToken(ASSIGNMENT,'=',1,1098)
-LexToken(VAR,'exprs',1,1099)
-LexToken(OPENBRACKET,'(',1,1104)
-LexToken(NUMBER,'2',1,1105)
-LexToken(CLOSEBRACKET,')',1,1106)
-LexToken(EOL,'\n',1,1107)
-LexToken(END,'end',1,1117)
-LexToken(EOL,'\n',1,1136)
-LexToken(WHILE,'while',1,1145)
-LexToken(PREVAR_BOOLEAN,'%t',1,1151)
-LexToken(DO,'do',1,1154)
-LexToken(EOL,'\n',1,1156)
-LexToken(OPENSQBRACKET,'[',1,1169)
-LexToken(VAR,'ok',1,1170)
-LexToken(COMMA,',',1,1172)
-LexToken(VAR,'a',1,1173)
-LexToken(COMMA,',',1,1174)
-LexToken(VAR,'exprs',1,1175)
-LexToken(CLOSESQBRACKET,']',1,1180)
-LexToken(ASSIGNMENT,'=',1,1181)
-LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,1182)
-LexToken(OPENBRACKET,'(',1,1197)
-LexToken(DQSTRING,'"Set log block parameters"',1,1223)
-LexToken(COMMA,',',1,1224)
-LexToken(DQSTRING,'"Basis (>1)"',1,1251)
-LexToken(COMMA,',',1,1252)
-LexToken(VAR,'list',1,1253)
-LexToken(OPENBRACKET,'(',1,1257)
-LexToken(DQSTRING,'"vec"',1,1262)
-LexToken(COMMA,',',1,1263)
-LexToken(NUMBER,'1',1,1264)
-LexToken(CLOSEBRACKET,')',1,1265)
-LexToken(COMMA,',',1,1266)
-LexToken(VAR,'exprs',1,1267)
-LexToken(CLOSEBRACKET,')',1,1272)
-LexToken(EOL,'\n',1,1273)
-LexToken(IF,'if',1,1286)
-LexToken(NOT,'~',1,1289)
-LexToken(VAR,'ok',1,1290)
-LexToken(THEN,'then',1,1293)
-LexToken(EOL,'\n',1,1297)
-LexToken(BREAK,'break',1,1314)
-LexToken(EOL,'\n',1,1319)
-LexToken(END,'end',1,1333)
-LexToken(EOL,'\n',1,1336)
-LexToken(IF,'if',1,1349)
-LexToken(VAR,'a',1,1352)
-LexToken(COMPARISON,'<=',1,1353)
-LexToken(NUMBER,'1',1,1355)
-LexToken(THEN,'then',1,1357)
-LexToken(EOL,'\n',1,1361)
-LexToken(VAR,'message',1,1378)
-LexToken(OPENBRACKET,'(',1,1385)
-LexToken(DQSTRING,'"Basis must be larger than 1"',1,1414)
-LexToken(CLOSEBRACKET,')',1,1415)
-LexToken(EOL,'\n',1,1416)
-LexToken(ELSE,'else',1,1429)
-LexToken(EOL,'\n',1,1433)
-LexToken(IF,'if',1,1450)
-LexToken(VAR,'ok',1,1453)
-LexToken(THEN,'then',1,1456)
-LexToken(EOL,'\n',1,1460)
-LexToken(VAR,'graphics',1,1481)
-LexToken(DOT,'.',1,1489)
-LexToken(VAR,'exprs',1,1490)
-LexToken(ASSIGNMENT,'=',1,1495)
-LexToken(VAR,'exprs',1,1496)
-LexToken(EOL,'\n',1,1501)
-LexToken(VAR,'model',1,1522)
-LexToken(DOT,'.',1,1527)
-LexToken(VAR,'rpar',1,1528)
-LexToken(ASSIGNMENT,'=',1,1532)
-LexToken(VAR,'a',1,1533)
-LexToken(EOL,'\n',1,1534)
-LexToken(VAR,'x',1,1555)
-LexToken(DOT,'.',1,1556)
-LexToken(VAR,'graphics',1,1557)
-LexToken(ASSIGNMENT,'=',1,1565)
-LexToken(VAR,'graphics',1,1566)
-LexToken(EOL,'\n',1,1574)
-LexToken(VAR,'x',1,1596)
-LexToken(DOT,'.',1,1597)
-LexToken(VAR,'model',1,1598)
-LexToken(ASSIGNMENT,'=',1,1603)
-LexToken(VAR,'model',1,1604)
-LexToken(EOL,'\n',1,1609)
-LexToken(BREAK,'break',1,1630)
-LexToken(EOL,'\n',1,1635)
-LexToken(END,'end',1,1652)
-LexToken(EOL,'\n',1,1655)
-LexToken(END,'end',1,1668)
-LexToken(EOL,'\n',1,1671)
-LexToken(END,'end',1,1680)
-LexToken(EOL,'\n',1,1683)
-LexToken(CASE,'case',1,1688)
-LexToken(DQSTRING,'"define"',1,1700)
-LexToken(THEN,'then',1,1702)
-LexToken(EOL,'\n',1,1706)
-LexToken(VAR,'in',1,1715)
-LexToken(ASSIGNMENT,'=',1,1717)
-LexToken(NUMBER,'1',1,1718)
-LexToken(EOL,'\n',1,1719)
-LexToken(VAR,'a',1,1728)
-LexToken(ASSIGNMENT,'=',1,1729)
-LexToken(PREVAR,'%e',1,1730)
-LexToken(EOL,'\n',1,1732)
-LexToken(VAR,'model',1,1741)
-LexToken(ASSIGNMENT,'=',1,1746)
-LexToken(SCICOS_MODEL,'scicos_model',1,1747)
-LexToken(OPENBRACKET,'(',1,1759)
-LexToken(CLOSEBRACKET,')',1,1760)
-LexToken(EOL,'\n',1,1761)
-LexToken(VAR,'model',1,1770)
-LexToken(DOT,'.',1,1775)
-LexToken(VAR,'sim',1,1776)
-LexToken(ASSIGNMENT,'=',1,1779)
-LexToken(DQSTRING,'"logblk"',1,1787)
-LexToken(EOL,'\n',1,1788)
-LexToken(VAR,'model',1,1797)
-LexToken(DOT,'.',1,1802)
-LexToken(VAR,'in',1,1803)
-LexToken(ASSIGNMENT,'=',1,1805)
-LexToken(ADDITION,'-',1,1806)
-LexToken(NUMBER,'1',1,1807)
-LexToken(EOL,'\n',1,1808)
-LexToken(VAR,'model',1,1817)
-LexToken(DOT,'.',1,1822)
-LexToken(VAR,'out',1,1823)
-LexToken(ASSIGNMENT,'=',1,1826)
-LexToken(ADDITION,'-',1,1827)
-LexToken(NUMBER,'1',1,1828)
-LexToken(EOL,'\n',1,1829)
-LexToken(VAR,'model',1,1838)
-LexToken(DOT,'.',1,1843)
-LexToken(VAR,'rpar',1,1844)
-LexToken(ASSIGNMENT,'=',1,1848)
-LexToken(VAR,'a',1,1849)
-LexToken(EOL,'\n',1,1850)
-LexToken(VAR,'model',1,1859)
-LexToken(DOT,'.',1,1864)
-LexToken(VAR,'blocktype',1,1865)
-LexToken(ASSIGNMENT,'=',1,1874)
-LexToken(DQSTRING,'"c"',1,1877)
-LexToken(EOL,'\n',1,1878)
-LexToken(VAR,'model',1,1887)
-LexToken(DOT,'.',1,1892)
-LexToken(VAR,'dep_ut',1,1893)
-LexToken(ASSIGNMENT,'=',1,1899)
-LexToken(OPENSQBRACKET,'[',1,1900)
-LexToken(PREVAR_BOOLEAN,'%t',1,1901)
-LexToken(PREVAR_BOOLEAN,'%f',1,1904)
-LexToken(CLOSESQBRACKET,']',1,1906)
-LexToken(EOL,'\n',1,1907)
-LexToken(EOL,'\n',1,1908)
-LexToken(VAR,'exprs',1,1917)
-LexToken(ASSIGNMENT,'=',1,1922)
-LexToken(DQSTRING,'"%e"',1,1926)
-LexToken(EOL,'\n',1,1927)
-LexToken(VAR,'gr_i',1,1936)
-LexToken(ASSIGNMENT,'=',1,1940)
-LexToken(OPENSQBRACKET,'[',1,1941)
-LexToken(CLOSESQBRACKET,']',1,1942)
-LexToken(EOL,'\n',1,1943)
-LexToken(VAR,'x',1,1952)
-LexToken(ASSIGNMENT,'=',1,1953)
-LexToken(VAR,'standard_define',1,1954)
-LexToken(OPENBRACKET,'(',1,1969)
-LexToken(OPENSQBRACKET,'[',1,1970)
-LexToken(NUMBER,'2',1,1971)
-LexToken(NUMBER,'2',1,1973)
-LexToken(CLOSESQBRACKET,']',1,1974)
-LexToken(COMMA,',',1,1975)
-LexToken(VAR,'model',1,1976)
-LexToken(COMMA,',',1,1981)
-LexToken(VAR,'exprs',1,1982)
-LexToken(COMMA,',',1,1987)
-LexToken(VAR,'gr_i',1,1988)
-LexToken(CLOSEBRACKET,')',1,1992)
-LexToken(EOL,'\n',1,1993)
-LexToken(END,'end',1,1998)
-LexToken(EOL,'\n',1,2001)
-LexToken(ENDFUNCTION,'endfunction',1,2002)
-LexToken(EOL,'\n',1,2013)
+/* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */
+function LOGBLK_f() {
+LOGBLK_f.prototype.get = function LOGBLK_f() {
+}
+LOGBLK_f.prototype.set = function LOGBLK_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+if (size(exprs,"*")==2) {
+exprs=exprs(2);
+}
+while (true) {
+[ok,a,exprs]=scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),exprs);
+if (!ok) {
+break
+}
+if (a<=1) {
+message("Basis must be larger than 1");
+} else {
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=a;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+LOGBLK_f.prototype.define = function LOGBLK_f() {
+in1=1;
+a=%e;
+model=scicos_model();
+model.sim="logblk";
+model.in=-1;
+model.out=-1;
+model.rpar=a;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs="%e";
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+LOGBLK_f.prototype.details = function LOGBLK_f() {
+}
+}