diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts index e9d12f0dbbbb52b918844ec8b9e329609f5ce7f6..e08bc381e05c54eaa2a87b92e62b1a712e96eee5 100755 --- a/Frontend Angular 4/src/app/shared/config.ts +++ b/Frontend Angular 4/src/app/shared/config.ts @@ -25,12 +25,12 @@ // export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint'; // psico -export const SERVER = 'https://matefun.math.psico.edu.uy'; -export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; +// export const SERVER = 'https://matefun.math.psico.edu.uy'; +// export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; //diego docker -// export const SERVER = 'http://localhost:8080'; -// export const GHCI_URL = 'ws://localhost:8080/endpoint'; +export const SERVER = 'http://localhost:8080'; +export const GHCI_URL = 'ws://localhost:8080/endpoint'; diff --git a/Servidor JEE/WebContent/index.html b/Servidor JEE/WebContent/index.html index 0bc59c1e8752efb74ab6854d231fb45d247c8068..b97d491ef7d89ab114f68c4eb1476fd39b8cc43d 100644 --- a/Servidor JEE/WebContent/index.html +++ b/Servidor JEE/WebContent/index.html @@ -1,4 +1,4 @@ Proyecto MateFun
\ No newline at end of file + -->
\ No newline at end of file diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun index 3b29a02164cf53d2dc50f625cb4513eb4d9bc2e3..a1d2af05002e286650db9c684ec34d1f4b076396 100755 Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun differ diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po index 179cfa2e72b914b3c39b46403d2ab4450b8b8927..709287efdb017d15be0d4a641b9baa4213443816 100644 --- a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po +++ b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po @@ -17,7 +17,7 @@ msgstr "" msgid "3D Figure" msgstr "3D Figure" -#: src/MateFun.hs:360 +#: src/MateFun.hs:355 msgid "3D Figures" msgstr "3D Figures" @@ -73,15 +73,15 @@ msgstr "Circular inclusion" msgid "Color" msgstr "Color" -#: src/MateFun.hs:361 +#: src/MateFun.hs:356 msgid "Colors" msgstr "Colors" -#: src/MateFun/Parser.hs:222 +#: src/MateFun/Parser.hs:234 msgid "Could not open file" msgstr "Could not open file" -#: src/MateFun/TypeCheck.hs:77 +#: src/MateFun/TypeCheck.hs:78 msgid "Division is a partial function, not defined in 0." msgstr "Division is a partial function, not defined in 0." @@ -89,11 +89,11 @@ msgstr "Division is a partial function, not defined in 0." msgid "Does not exist" msgstr "Does not exist" -#: src/MateFun/TypeCheck.hs:79 +#: src/MateFun/TypeCheck.hs:81 msgid "Domain intersection on function" msgstr "Domain intersection on function" -#: src/MateFun/TypeCheck.hs:78 +#: src/MateFun/TypeCheck.hs:80 msgid "Empty sequence." msgstr "Empty sequence." @@ -121,7 +121,7 @@ msgstr "Enables function usage warnings" msgid "Enables verbose mode" msgstr "Enables verbose mode" -#: src/MateFun/TypeCheck.hs:51 +#: src/MateFun/TypeCheck.hs:52 msgid "Error" msgstr "Error" @@ -129,14 +129,19 @@ msgstr "Error" msgid "Error reading command to interpretate." msgstr "Error reading command to interpretate." -#: src/MateFun/TypeCheck.hs:76 +#: src/MateFun/TypeCheck.hs:77 msgid "Evaluation steps limit exceeded." msgstr "Evaluation steps limit exceeded." -#: src/MateFun/TypeCheck.hs:72 +#: src/MateFun/TypeCheck.hs:73 msgid "Expected elements of" msgstr "Expected elements of" +#: src/MateFun/TypeCheck.hs:79 +#, fuzzy +msgid "Exponent is a partial function, not defined for negative numbers." +msgstr "Division is a partial function, not defined in 0." + #: src/MateFun.hs:48 src/MateFun.hs:97 msgid "FILE" msgstr "FILE" @@ -145,7 +150,7 @@ msgstr "FILE" msgid "Figure" msgstr "Figure" -#: src/MateFun.hs:359 +#: src/MateFun.hs:354 msgid "Figures" msgstr "Figures" @@ -157,7 +162,7 @@ msgstr "Found" msgid "Function" msgstr "Function" -#: src/MateFun.hs:374 +#: src/MateFun.hs:369 msgid "Graph" msgstr "Graph" @@ -169,20 +174,20 @@ msgstr "Gray" msgid "Green" msgstr "Green" -#: src/MateFun.hs:357 +#: src/MateFun.hs:352 msgid "Integer" msgstr "Integer" -#: src/MateFun/TypeCheck.hs:88 +#: src/MateFun/TypeCheck.hs:90 #, fuzzy msgid "Interpreter" msgstr "Interpreter Commands:" -#: src/MateFun.hs:341 +#: src/MateFun.hs:336 msgid "Interpreter Commands:" msgstr "Interpreter Commands:" -#: src/MateFun/TypeCheck.hs:73 +#: src/MateFun/TypeCheck.hs:74 msgid "Invalid index." msgstr "Invalid index." @@ -190,6 +195,10 @@ msgstr "Invalid index." msgid "Loading" msgstr "Loading" +#: src/MateFun/TypeCheck.hs:79 +msgid "Negative exponent." +msgstr "Negative exponent." + #: src/MateFun.hs:243 msgid "No File" msgstr "No File" @@ -206,11 +215,11 @@ msgstr "OUTError reading command to interpretate." msgid "On definition of" msgstr "On definition of" -#: src/MateFun/TypeCheck.hs:59 +#: src/MateFun/TypeCheck.hs:60 msgid "On set definition" msgstr "On set definition" -#: src/MateFun/TypeCheck.hs:74 +#: src/MateFun/TypeCheck.hs:75 msgid "Out of range index." msgstr "Out of range index." @@ -222,7 +231,7 @@ msgstr "PATH" msgid "Please report this error with code" msgstr "Please report this error with code" -#: src/MateFun.hs:358 +#: src/MateFun.hs:353 msgid "Real" msgstr "Real" @@ -242,7 +251,7 @@ msgstr "Sets a path PATH where to find the program to evaluate" msgid "Sets the file FILE with the program to evaluate" msgstr "Sets the file FILE with the program to evaluate" -#: src/MateFun/TypeCheck.hs:65 +#: src/MateFun/TypeCheck.hs:66 msgid "The element" msgstr "The element" @@ -254,7 +263,7 @@ msgstr "The number of arguments does not match with domain of the function" msgid "There is a chance that its value is out of the set." msgstr "There is a chance that its value is out of the set." -#: src/MateFun/TypeCheck.hs:75 +#: src/MateFun/TypeCheck.hs:76 msgid "Tuple length is not the expected" msgstr "Tuple length is not the expected" @@ -262,11 +271,11 @@ msgstr "Tuple length is not the expected" msgid "Usage" msgstr "Usage" -#: src/MateFun/TypeCheck.hs:70 +#: src/MateFun/TypeCheck.hs:71 msgid "Value" msgstr "Value" -#: src/MateFun/TypeCheck.hs:66 +#: src/MateFun/TypeCheck.hs:67 msgid "Variable" msgstr "Variable" @@ -286,7 +295,7 @@ msgstr "White" msgid "Yellow" msgstr "Yellow" -#: src/MateFun/TypeCheck.hs:77 +#: src/MateFun/TypeCheck.hs:78 msgid "Zero division." msgstr "Zero division." @@ -298,7 +307,7 @@ msgstr "against" msgid "and" msgstr "and" -#: src/MateFun/TypeCheck.hs:71 +#: src/MateFun/TypeCheck.hs:72 msgid "because the following condition is false" msgstr "because the following condition is false" @@ -306,7 +315,7 @@ msgstr "because the following condition is false" msgid "but expected" msgstr "but expected" -#: src/MateFun/TypeCheck.hs:72 +#: src/MateFun/TypeCheck.hs:73 msgid "but found" msgstr "but found" @@ -322,7 +331,7 @@ msgstr "color" msgid "color3D" msgstr "color3D" -#: src/MateFun/TypeCheck.hs:90 +#: src/MateFun/TypeCheck.hs:92 msgid "column" msgstr "column" @@ -342,11 +351,11 @@ msgstr "cylinder" msgid "depends on itself." msgstr "depends on itself." -#: src/MateFun/TypeCheck.hs:65 +#: src/MateFun/TypeCheck.hs:66 msgid "does not belong to any defined set." msgstr "does not belong to any defined set." -#: src/MateFun/TypeCheck.hs:70 +#: src/MateFun/TypeCheck.hs:71 msgid "does not belong to set" msgstr "does not belong to set" @@ -354,7 +363,7 @@ msgstr "does not belong to set" msgid "duplicate elements" msgstr "duplicate elements" -#: src/MateFun/TypeCheck.hs:80 +#: src/MateFun/TypeCheck.hs:82 msgid "evaluates true for multiple conditions on function" msgstr "evaluates true for multiple conditions on function" @@ -366,7 +375,7 @@ msgstr "exit" msgid "expression" msgstr "expression" -#: src/MateFun.hs:175 src/MateFun/Parser.hs:217 src/MateFun/TypeCheck.hs:89 +#: src/MateFun.hs:175 src/MateFun/Parser.hs:217 src/MateFun/TypeCheck.hs:91 msgid "file" msgstr "file" @@ -406,7 +415,7 @@ msgstr "intersection between conditions" msgid "is not defined." msgstr "is not defined." -#: src/MateFun/TypeCheck.hs:78 +#: src/MateFun/TypeCheck.hs:80 msgid "is partial, not defined for empty sequences." msgstr "is partial, not defined for empty sequences." @@ -422,7 +431,7 @@ msgstr "join" msgid "join3D" msgstr "join3D" -#: src/MateFun/ReservedNames.hs:34 src/MateFun/TypeCheck.hs:89 +#: src/MateFun/ReservedNames.hs:34 src/MateFun/TypeCheck.hs:91 msgid "line" msgstr "line" @@ -474,7 +483,7 @@ msgstr "plot a function R -> R" msgid "poli" msgstr "poli" -#: src/MateFun.hs:361 +#: src/MateFun.hs:356 msgid "predefined" msgstr "predefined" diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po index 4368b8f7cf44d1d97d1ea80761d82a27ebcba272..2dd8b9388f7899296a69d69a20d2b9e3ec917dc8 100644 --- a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po +++ b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po @@ -17,7 +17,7 @@ msgstr "" msgid "3D Figure" msgstr "Figura 3D" -#: src/MateFun.hs:360 +#: src/MateFun.hs:355 msgid "3D Figures" msgstr "Figuras 3D" @@ -73,15 +73,15 @@ msgstr "Inclusion Circular" msgid "Color" msgstr "Color" -#: src/MateFun.hs:361 +#: src/MateFun.hs:356 msgid "Colors" msgstr "Colors" -#: src/MateFun/Parser.hs:222 +#: src/MateFun/Parser.hs:234 msgid "Could not open file" msgstr "No se puede abrir el archivo" -#: src/MateFun/TypeCheck.hs:77 +#: src/MateFun/TypeCheck.hs:78 msgid "Division is a partial function, not defined in 0." msgstr "La division es una funcion parcial, no esta definida para 0." @@ -89,11 +89,11 @@ msgstr "La division es una funcion parcial, no esta definida para 0." msgid "Does not exist" msgstr "No existe" -#: src/MateFun/TypeCheck.hs:79 +#: src/MateFun/TypeCheck.hs:81 msgid "Domain intersection on function" msgstr "Interseccion de dominios en la funcion" -#: src/MateFun/TypeCheck.hs:78 +#: src/MateFun/TypeCheck.hs:80 msgid "Empty sequence." msgstr "Secuencia vacia" @@ -121,7 +121,7 @@ msgstr "Habilita las advertencias de uso de funciones" msgid "Enables verbose mode" msgstr "Habilita modo verboso" -#: src/MateFun/TypeCheck.hs:51 +#: src/MateFun/TypeCheck.hs:52 msgid "Error" msgstr "Error" @@ -129,14 +129,19 @@ msgstr "Error" msgid "Error reading command to interpretate." msgstr "Error al leer el comando a interpretar." -#: src/MateFun/TypeCheck.hs:76 +#: src/MateFun/TypeCheck.hs:77 msgid "Evaluation steps limit exceeded." msgstr "Se ha excedido el limite de pasos de evaluacion." -#: src/MateFun/TypeCheck.hs:72 +#: src/MateFun/TypeCheck.hs:73 msgid "Expected elements of" msgstr "Se esperan elementos de" +#: src/MateFun/TypeCheck.hs:79 +#, fuzzy +msgid "Exponent is a partial function, not defined for negative numbers." +msgstr "La division es una funcion parcial, no esta definida para 0." + #: src/MateFun.hs:48 src/MateFun.hs:97 msgid "FILE" msgstr "ARCHIVO" @@ -145,7 +150,7 @@ msgstr "ARCHIVO" msgid "Figure" msgstr "Figura" -#: src/MateFun.hs:359 +#: src/MateFun.hs:354 msgid "Figures" msgstr "Figuras" @@ -157,7 +162,7 @@ msgstr "Se encontro" msgid "Function" msgstr "Funcion" -#: src/MateFun.hs:374 +#: src/MateFun.hs:369 msgid "Graph" msgstr "Grafica" @@ -169,20 +174,20 @@ msgstr "Gris" msgid "Green" msgstr "Verde" -#: src/MateFun.hs:357 +#: src/MateFun.hs:352 msgid "Integer" msgstr "Enteros" -#: src/MateFun/TypeCheck.hs:88 +#: src/MateFun/TypeCheck.hs:90 #, fuzzy msgid "Interpreter" msgstr "Comandos del Interprete" -#: src/MateFun.hs:341 +#: src/MateFun.hs:336 msgid "Interpreter Commands:" msgstr "Comandos del Interprete" -#: src/MateFun/TypeCheck.hs:73 +#: src/MateFun/TypeCheck.hs:74 msgid "Invalid index." msgstr "Indice invalido." @@ -190,6 +195,10 @@ msgstr "Indice invalido." msgid "Loading" msgstr "Cargando" +#: src/MateFun/TypeCheck.hs:79 +msgid "Negative exponent." +msgstr "Exponente negativo." + #: src/MateFun.hs:243 msgid "No File" msgstr "Sin Archivo" @@ -206,11 +215,11 @@ msgstr "OUTError al leer el comando a interpretar" msgid "On definition of" msgstr "En la definicion de" -#: src/MateFun/TypeCheck.hs:59 +#: src/MateFun/TypeCheck.hs:60 msgid "On set definition" msgstr "En la definicion del conjunto" -#: src/MateFun/TypeCheck.hs:74 +#: src/MateFun/TypeCheck.hs:75 msgid "Out of range index." msgstr "Indice fuera de rango." @@ -222,7 +231,7 @@ msgstr "RUTA" msgid "Please report this error with code" msgstr "Por favor avisar de este error con codigo" -#: src/MateFun.hs:358 +#: src/MateFun.hs:353 msgid "Real" msgstr "Reales" @@ -242,7 +251,7 @@ msgstr "Determina una ruta donde encontrar el programa a evaluar" msgid "Sets the file FILE with the program to evaluate" msgstr "Determina el archivo ARCHIVO con el programa a evaluar" -#: src/MateFun/TypeCheck.hs:65 +#: src/MateFun/TypeCheck.hs:66 msgid "The element" msgstr "El elemento" @@ -254,7 +263,7 @@ msgstr "El numero de argumentos no coincide con el dominio de la funcion" msgid "There is a chance that its value is out of the set." msgstr "Por lo que existe la posibilidad de que su valor quede fuera del conjunto." -#: src/MateFun/TypeCheck.hs:75 +#: src/MateFun/TypeCheck.hs:76 msgid "Tuple length is not the expected" msgstr "El largo de la tupla es distinto al esperado" @@ -262,11 +271,11 @@ msgstr "El largo de la tupla es distinto al esperado" msgid "Usage" msgstr "Uso" -#: src/MateFun/TypeCheck.hs:70 +#: src/MateFun/TypeCheck.hs:71 msgid "Value" msgstr "Valor" -#: src/MateFun/TypeCheck.hs:66 +#: src/MateFun/TypeCheck.hs:67 msgid "Variable" msgstr "Variable" @@ -286,7 +295,7 @@ msgstr "Blanco" msgid "Yellow" msgstr "Amarillo" -#: src/MateFun/TypeCheck.hs:77 +#: src/MateFun/TypeCheck.hs:78 msgid "Zero division." msgstr "Division por 0" @@ -298,7 +307,7 @@ msgstr "contra" msgid "and" msgstr "y" -#: src/MateFun/TypeCheck.hs:71 +#: src/MateFun/TypeCheck.hs:72 msgid "because the following condition is false" msgstr "porque no se cumple" @@ -306,7 +315,7 @@ msgstr "porque no se cumple" msgid "but expected" msgstr "pero se esperaba" -#: src/MateFun/TypeCheck.hs:72 +#: src/MateFun/TypeCheck.hs:73 msgid "but found" msgstr "pero se encontro" @@ -322,7 +331,7 @@ msgstr "color" msgid "color3D" msgstr "color3D" -#: src/MateFun/TypeCheck.hs:90 +#: src/MateFun/TypeCheck.hs:92 msgid "column" msgstr "columna" @@ -342,11 +351,11 @@ msgstr "cilindro" msgid "depends on itself." msgstr "depende de si mismo." -#: src/MateFun/TypeCheck.hs:65 +#: src/MateFun/TypeCheck.hs:66 msgid "does not belong to any defined set." msgstr "no pertenece a ningun conjunto definido." -#: src/MateFun/TypeCheck.hs:70 +#: src/MateFun/TypeCheck.hs:71 msgid "does not belong to set" msgstr "no pertenece al conjunto" @@ -354,7 +363,7 @@ msgstr "no pertenece al conjunto" msgid "duplicate elements" msgstr "elementos duplicados" -#: src/MateFun/TypeCheck.hs:80 +#: src/MateFun/TypeCheck.hs:82 msgid "evaluates true for multiple conditions on function" msgstr "evalua en VERDADERO para multiples condiciones en la funcion" @@ -366,7 +375,7 @@ msgstr "salir" msgid "expression" msgstr "expresion" -#: src/MateFun.hs:175 src/MateFun/Parser.hs:217 src/MateFun/TypeCheck.hs:89 +#: src/MateFun.hs:175 src/MateFun/Parser.hs:217 src/MateFun/TypeCheck.hs:91 msgid "file" msgstr "archivo" @@ -406,7 +415,7 @@ msgstr "interseccion entre las condiciones" msgid "is not defined." msgstr "no esta definido" -#: src/MateFun/TypeCheck.hs:78 +#: src/MateFun/TypeCheck.hs:80 msgid "is partial, not defined for empty sequences." msgstr "es parcial, no esta definida para secuencias vacias." @@ -422,7 +431,7 @@ msgstr "juntar" msgid "join3D" msgstr "juntar3D" -#: src/MateFun/ReservedNames.hs:34 src/MateFun/TypeCheck.hs:89 +#: src/MateFun/ReservedNames.hs:34 src/MateFun/TypeCheck.hs:91 msgid "line" msgstr "linea" @@ -474,7 +483,7 @@ msgstr "grafica una funcion de R -> R" msgid "poli" msgstr "poli" -#: src/MateFun.hs:361 +#: src/MateFun.hs:356 msgid "predefined" msgstr "predefinidos" diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot index 9bf716de75fb54ebfbfa4c9f38af34d641d73831..409c8470bafe0ad529e307402be90e60591b3bf3 100644 --- a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot +++ b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/messages.pot @@ -17,7 +17,7 @@ msgstr "" msgid "3D Figure" msgstr "" -#: src/MateFun.hs:360 +#: src/MateFun.hs:355 msgid "3D Figures" msgstr "" @@ -74,15 +74,15 @@ msgstr "" msgid "Color" msgstr "" -#: src/MateFun.hs:361 +#: src/MateFun.hs:356 msgid "Colors" msgstr "" -#: src/MateFun/Parser.hs:222 +#: src/MateFun/Parser.hs:234 msgid "Could not open file" msgstr "" -#: src/MateFun/TypeCheck.hs:77 +#: src/MateFun/TypeCheck.hs:78 msgid "Division is a partial function, not defined in 0." msgstr "" @@ -90,11 +90,11 @@ msgstr "" msgid "Does not exist" msgstr "" -#: src/MateFun/TypeCheck.hs:79 +#: src/MateFun/TypeCheck.hs:81 msgid "Domain intersection on function" msgstr "" -#: src/MateFun/TypeCheck.hs:78 +#: src/MateFun/TypeCheck.hs:80 msgid "Empty sequence." msgstr "" @@ -122,7 +122,7 @@ msgstr "" msgid "Enables verbose mode" msgstr "" -#: src/MateFun/TypeCheck.hs:51 +#: src/MateFun/TypeCheck.hs:52 msgid "Error" msgstr "" @@ -130,14 +130,18 @@ msgstr "" msgid "Error reading command to interpretate." msgstr "" -#: src/MateFun/TypeCheck.hs:76 +#: src/MateFun/TypeCheck.hs:77 msgid "Evaluation steps limit exceeded." msgstr "" -#: src/MateFun/TypeCheck.hs:72 +#: src/MateFun/TypeCheck.hs:73 msgid "Expected elements of" msgstr "" +#: src/MateFun/TypeCheck.hs:79 +msgid "Exponent is a partial function, not defined for negative numbers." +msgstr "" + #: src/MateFun.hs:48 #: src/MateFun.hs:97 msgid "FILE" @@ -147,7 +151,7 @@ msgstr "" msgid "Figure" msgstr "" -#: src/MateFun.hs:359 +#: src/MateFun.hs:354 msgid "Figures" msgstr "" @@ -160,7 +164,7 @@ msgstr "" msgid "Function" msgstr "" -#: src/MateFun.hs:374 +#: src/MateFun.hs:369 msgid "Graph" msgstr "" @@ -172,19 +176,19 @@ msgstr "" msgid "Green" msgstr "" -#: src/MateFun.hs:357 +#: src/MateFun.hs:352 msgid "Integer" msgstr "" -#: src/MateFun/TypeCheck.hs:88 +#: src/MateFun/TypeCheck.hs:90 msgid "Interpreter" msgstr "" -#: src/MateFun.hs:341 +#: src/MateFun.hs:336 msgid "Interpreter Commands:" msgstr "" -#: src/MateFun/TypeCheck.hs:73 +#: src/MateFun/TypeCheck.hs:74 msgid "Invalid index." msgstr "" @@ -192,6 +196,10 @@ msgstr "" msgid "Loading" msgstr "" +#: src/MateFun/TypeCheck.hs:79 +msgid "Negative exponent." +msgstr "" + #: src/MateFun.hs:243 msgid "No File" msgstr "" @@ -208,11 +216,11 @@ msgstr "" msgid "On definition of" msgstr "" -#: src/MateFun/TypeCheck.hs:59 +#: src/MateFun/TypeCheck.hs:60 msgid "On set definition" msgstr "" -#: src/MateFun/TypeCheck.hs:74 +#: src/MateFun/TypeCheck.hs:75 msgid "Out of range index." msgstr "" @@ -225,7 +233,7 @@ msgstr "" msgid "Please report this error with code" msgstr "" -#: src/MateFun.hs:358 +#: src/MateFun.hs:353 msgid "Real" msgstr "" @@ -245,7 +253,7 @@ msgstr "" msgid "Sets the file FILE with the program to evaluate" msgstr "" -#: src/MateFun/TypeCheck.hs:65 +#: src/MateFun/TypeCheck.hs:66 msgid "The element" msgstr "" @@ -257,7 +265,7 @@ msgstr "" msgid "There is a chance that its value is out of the set." msgstr "" -#: src/MateFun/TypeCheck.hs:75 +#: src/MateFun/TypeCheck.hs:76 msgid "Tuple length is not the expected" msgstr "" @@ -265,11 +273,11 @@ msgstr "" msgid "Usage" msgstr "" -#: src/MateFun/TypeCheck.hs:70 +#: src/MateFun/TypeCheck.hs:71 msgid "Value" msgstr "" -#: src/MateFun/TypeCheck.hs:66 +#: src/MateFun/TypeCheck.hs:67 msgid "Variable" msgstr "" @@ -289,7 +297,7 @@ msgstr "" msgid "Yellow" msgstr "" -#: src/MateFun/TypeCheck.hs:77 +#: src/MateFun/TypeCheck.hs:78 msgid "Zero division." msgstr "" @@ -301,7 +309,7 @@ msgstr "" msgid "and" msgstr "" -#: src/MateFun/TypeCheck.hs:71 +#: src/MateFun/TypeCheck.hs:72 msgid "because the following condition is false" msgstr "" @@ -309,7 +317,7 @@ msgstr "" msgid "but expected" msgstr "" -#: src/MateFun/TypeCheck.hs:72 +#: src/MateFun/TypeCheck.hs:73 msgid "but found" msgstr "" @@ -325,7 +333,7 @@ msgstr "" msgid "color3D" msgstr "" -#: src/MateFun/TypeCheck.hs:90 +#: src/MateFun/TypeCheck.hs:92 msgid "column" msgstr "" @@ -345,11 +353,11 @@ msgstr "" msgid "depends on itself." msgstr "" -#: src/MateFun/TypeCheck.hs:65 +#: src/MateFun/TypeCheck.hs:66 msgid "does not belong to any defined set." msgstr "" -#: src/MateFun/TypeCheck.hs:70 +#: src/MateFun/TypeCheck.hs:71 msgid "does not belong to set" msgstr "" @@ -357,7 +365,7 @@ msgstr "" msgid "duplicate elements" msgstr "" -#: src/MateFun/TypeCheck.hs:80 +#: src/MateFun/TypeCheck.hs:82 msgid "evaluates true for multiple conditions on function" msgstr "" @@ -372,7 +380,7 @@ msgstr "" #: src/MateFun.hs:175 #: src/MateFun/Parser.hs:217 -#: src/MateFun/TypeCheck.hs:89 +#: src/MateFun/TypeCheck.hs:91 msgid "file" msgstr "" @@ -413,7 +421,7 @@ msgstr "" msgid "is not defined." msgstr "" -#: src/MateFun/TypeCheck.hs:78 +#: src/MateFun/TypeCheck.hs:80 msgid "is partial, not defined for empty sequences." msgstr "" @@ -430,7 +438,7 @@ msgid "join3D" msgstr "" #: src/MateFun/ReservedNames.hs:34 -#: src/MateFun/TypeCheck.hs:89 +#: src/MateFun/TypeCheck.hs:91 msgid "line" msgstr "" @@ -482,7 +490,7 @@ msgstr "" msgid "poli" msgstr "" -#: src/MateFun.hs:361 +#: src/MateFun.hs:356 msgid "predefined" msgstr "" diff --git a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java index ed3785c53fbb68643f44acaeb7c2c418d2842604..ae467daf346c41c7450fae9b6afc8886666a72f9 100644 --- a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java +++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java @@ -86,7 +86,6 @@ public class CommandsBean { JsonReader jsonReader = Json.createReader(new StringReader(comandos)); JsonObject comandoJson = jsonReader.readObject(); String token = comandoJson.getString("token"); - System.out.print("=======================================>" + session.getMaxIdleTimeout()); jsonReader.close(); if (!this.proceso.isAlive()) { restartProcess(this.cedula, token, session); diff --git a/generate-war.sh b/generate-war.sh new file mode 100644 index 0000000000000000000000000000000000000000..12e02fe5e508194ba8a8a706d561041f0052f882 --- /dev/null +++ b/generate-war.sh @@ -0,0 +1,7 @@ +cd Frontend\ Angular\ 4/ +ng build --prod +cd .. +cp -R Frontend\ Angular\ 4/dist/* Servidor\ JEE/WebContent/ +cd Servidor\ JEE/ +mvn package +cd ..