diff --git a/Frontend Angular 4/package.json b/Frontend Angular 4/package.json
index 1b2e5fc9f05ab1e3178bd2045d85538935ccff78..b11c5d38561a3c9c626ba7bbf8e0c6cd25a8dbe0 100755
--- a/Frontend Angular 4/package.json
+++ b/Frontend Angular 4/package.json
@@ -24,7 +24,7 @@
"core-js": "^2.4.1",
"d3": "^4.12.2",
"font-awesome": "^4.7.0",
- "function-plot": "git+https://github.com/diego-rey/function-plot.git#feature/integration-domain-shape",
+ "function-plot": "git://github.com/diego-rey/function-plot.git#feature/integration-domain-shape",
"graph3D": "git://github.com/ifagian/graph3D#master",
"ionicons": "^3.0.0",
"jq-console": "^2.13.2",
diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts
index 970a385ea5a95fdc0c8f623e08d4d760b19996a0..839412fd6adb76fb0a908e0dcb92597ae55ec5ad 100755
--- a/Frontend Angular 4/src/app/shared/config.ts
+++ b/Frontend Angular 4/src/app/shared/config.ts
@@ -4,8 +4,8 @@
//export const SERVER = 'http://localhost:9090';
//export const GHCI_URL = 'ws://localhost:9090/endpoint';
-//export const SERVER = 'http://localhost:8080';
-//export const GHCI_URL = 'ws://localhost:8080/endpoint';
+// export const SERVER = 'http://localhost:9090';
+// export const GHCI_URL = 'ws://localhost:9090/endpoint';
//Configuracion dinamica pensando en servidor con ip dinamica
@@ -13,6 +13,7 @@
// export const GHCI_URL = window.location.protocol == 'http:'? 'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint';
// Google cloud platform
+
export const SERVER = 'http://35.199.110.129:9090';
export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint';
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun
index d9b05c27393b87e376a7ff90c214f571a8f615e3..fe948ef5296c5e72d63e18c556380b6557a11d1b 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/MateFun-tmp/InternationalizationHelper.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..05930f629ac22746d8801079086f69739625d02f
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..6131a2caf9b5adcfe3a7423c1e71d2ef242012fc
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.hi
new file mode 100644
index 0000000000000000000000000000000000000000..dbeebbe553b16c186e5e2a8c145f107db28a45a7
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.o
new file mode 100644
index 0000000000000000000000000000000000000000..6944c58ef5024296888bc1be4afa4612239fac0f
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/InternationalizationHelper.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..8704b2c20b82477805eeb2bf7df4983670325a69
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..025b003e352209497c7bd80d8f223c72ad186693
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.hi
new file mode 100644
index 0000000000000000000000000000000000000000..33735cac9150cd1f8608ebdb2b9f9b17e61cb4c6
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.o
new file mode 100644
index 0000000000000000000000000000000000000000..8354efae3d92eab25c8a84e375df077b0e41bbc5
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Main.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..1d66253b9d52fb5126d5c7a202b2f9949dfa97c3
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..18ca55670fbe647bca8c02913513552c0f1c36c8
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.hi
new file mode 100644
index 0000000000000000000000000000000000000000..723a98713e4ef0f9484844095ba31f2b2edac3cc
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.o
new file mode 100644
index 0000000000000000000000000000000000000000..c41dcf908c1091ee963e28106d04e5d8e4219e96
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Core.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..4e6fbec498735ed5a150748846f2c1ca9e24938c
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..8610054d46f17c3c7f1616c897351bbf38cd729d
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.hi
new file mode 100644
index 0000000000000000000000000000000000000000..e7e1f7b6182f99a6d12cc16a9cb7de933d0c2f71
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.o
new file mode 100644
index 0000000000000000000000000000000000000000..f0824b6781cd25c1b8f48636dba83a0cfeed8d1e
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/CstProp.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..1a7cff7eaecd1cb09a25f21751f0c98bf6b0b224
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..321d9fff4739a4c92143bdfb5813ed1c03156ef2
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.hi
new file mode 100644
index 0000000000000000000000000000000000000000..9eae647520237be3ca00c87b44f54f0a2a0884b3
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.o
new file mode 100644
index 0000000000000000000000000000000000000000..f8da35d436693dcee3be169ec08dc00f9519afbb
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Eval.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..11e343483ddc264588c5ffaac7c63ac4c5dd5799
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..8ecc8276ecd72b6a7187dd589796e99d1c177f8f
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.hi
new file mode 100644
index 0000000000000000000000000000000000000000..fe7dfcda7ddccda27e2af3378a7d6af16f91b7da
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.o
new file mode 100644
index 0000000000000000000000000000000000000000..c1780ffe5446f5898c45945acd9c3f6cb05cff64
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Figures.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..25c3b785e6f7a050495db76c4a7e8db3ac8c3c4a
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..60ef6c65ac29d9ce2604c5f1197a596669bcd066
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.hi
new file mode 100644
index 0000000000000000000000000000000000000000..058770c74cc597fbeac8b63c346591e5ed303d91
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.o
new file mode 100644
index 0000000000000000000000000000000000000000..82210c3bf0027ef32c7d12a7c65481076f0b1762
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Parser.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..e589466cc4d0bd5b6a397f5f752d38266aeca7fd
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..4a2034762511d38a7450570a0c95877d2cfb763a
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.hi
new file mode 100644
index 0000000000000000000000000000000000000000..6dc007d0a3d782219135784f99edcf25f767c48c
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.o
new file mode 100644
index 0000000000000000000000000000000000000000..abef0c5c1d6f7c12508171939fcf36f383c1df48
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/RenderFun.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..68515ff37568a6660c99e99084be01264e118247
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..92f436fbacd746a467a8b7e06df970814e8354db
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.hi
new file mode 100644
index 0000000000000000000000000000000000000000..f6e0591c4b1603bb20f54328925a91ec64f6588c
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.o
new file mode 100644
index 0000000000000000000000000000000000000000..8636390c5043cd7c7ca791c1a9f24ca151176328
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/ReservedNames.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..f287f43debdd8777be29a5342345295b6db9e341
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..d47fe9e5a697868866a9fc59d49149fe4c8cbb5c
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.hi
new file mode 100644
index 0000000000000000000000000000000000000000..c5290720f0673db7dae1c00eba5d784a11cfae8b
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.o
new file mode 100644
index 0000000000000000000000000000000000000000..d1cdbbc777168618a0b6cfa136d3181d78b3ae8a
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/TypeCheck.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..e772d72192fc62496e423f2cf8adfd393cf5a95c
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..f6ff5acdd1214594789f994a00eddca21a7eebfe
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.hi
new file mode 100644
index 0000000000000000000000000000000000000000..1875d6dde47ccdb7d2fb37d31b3ea51287cf3fcf
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.o
new file mode 100644
index 0000000000000000000000000000000000000000..802167f3d3b3efaae9c96214d8aa658812c66124
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/MateFun/Warning.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.dyn_hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.dyn_hi
new file mode 100644
index 0000000000000000000000000000000000000000..fca39a12cdb922cb6e4997eff3e1fc6ed696b599
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.dyn_hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.dyn_o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.dyn_o
new file mode 100644
index 0000000000000000000000000000000000000000..3cf235a0e29edea393bad9f3df3aa2df2355f9ab
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.dyn_o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.hi b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.hi
new file mode 100644
index 0000000000000000000000000000000000000000..3a8a287fc59b5adc64380a1cd885307f2d2dd8a6
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.hi differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.o b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.o
new file mode 100644
index 0000000000000000000000000000000000000000..ac5bc727e5ca94ad755f26c3ea849ee23558838c
Binary files /dev/null and b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun-tmp/Text/I18N/GetText.o differ
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFunTmp/salida.html b/Servidor JEE/src/main/java/edu/proygrado/binarios/MateFunTmp/salida.html
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
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 6f01fb8a3789c5b2c75dbee2c633e401c94b891c..92a74879632e001a9e62ec317971c9f29f066c63 100644
--- a/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java
+++ b/Servidor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java
@@ -13,7 +13,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-
+import java.util.Map;
import javax.annotation.PreDestroy;
import javax.ejb.Stateful;
import javax.inject.Inject;
@@ -232,6 +232,11 @@ public class CommandsBean {
}
this.latch = new CountDownLatch(2);
+
+
+ Map<String, String> envs = this.builder.environment();
+ envs.put("LANGUAGE", "en");
+
this.proceso = this.builder.start();
this.p_stdin = new BufferedWriter(new OutputStreamWriter(proceso.getOutputStream()));
if (this.standardConsoleThread != null && this.standardConsoleThread.isAlive()) {
@@ -298,7 +303,8 @@ public class CommandsBean {
try {
Scanner s = new Scanner(proceso.getInputStream());
latch.countDown();
- Pattern p = Pattern.compile("OUTFigura:(Figura:)*\\[\\]");
+ Pattern p = Pattern.compile("OUTFigure:(Figure:)*\\[\\]");
+ Pattern p3d = Pattern.compile("OUT3D Figure:(3D Figure:)*\\[\\]");
ArrayList<String> animacion = new ArrayList<>();
while (s.hasNextLine()) {
String result = s.nextLine();
@@ -314,16 +320,26 @@ public class CommandsBean {
nombrePrompt = "";
}
JsonObject respuestaJson = null;
- if (result.contains("CANVAS:")) {
- int index = result.indexOf("CANVAS:");
- result = result.substring(index + 7);
+ if (result.contains("FIG:")) {
+ int index = result.indexOf("FIG:");
+ result = result.substring(index + 4);
+ animacion.add(result);
+ respuestaJson = null;
+ } else if (result.contains("FIG3D:")) {
+ int index = result.indexOf("FIG3D:");
+ result = result.substring(index + 6);
animacion.add(result);
respuestaJson = null;
- } else if (result.equals("OUTFigura")) {
+ } else if (result.equals("OUTFigure")) {
respuestaJson = Json.createObjectBuilder().add("tipo", "canvas")
.add("resultado", animacion.get(0)).build();
animacion.clear();
+ } else if (result.equals("OUT3D Figure")) {
+
+ respuestaJson = Json.createObjectBuilder().add("tipo", "canvas3D")
+ .add("resultado", animacion.get(0)).build();
+ animacion.clear();
} else if (p.matcher(result).matches()) {
JsonArrayBuilder animJson = Json.createArrayBuilder();
@@ -333,12 +349,23 @@ public class CommandsBean {
respuestaJson = Json.createObjectBuilder().add("tipo", "animacion")
.add("resultado", animJson).build();
+ animacion.clear();
+ } else if (p3d.matcher(result).matches()) {
+ JsonArrayBuilder animJson = Json.createArrayBuilder();
+ for (String canvas : animacion) {
+ animJson.add(canvas);
+ }
+ respuestaJson = Json.createObjectBuilder().add("tipo", "animacion3D")
+ .add("resultado", animJson).build();
+
animacion.clear();
} else if (result.contains("GRAPH:")) {
int index = result.indexOf("GRAPH:");
result = result.substring(index + 6);
respuestaJson = Json.createObjectBuilder().add("tipo", "graph").add("resultado", result)
.build();
+ } else if (result.contains("OUTGraph")) {
+
} else {
respuestaJson = Json.createObjectBuilder().add("tipo", "salida")
.add("resultado", result).build();
diff --git a/Servidor JEE/src/main/resources/META-INF/persistence.xml b/Servidor JEE/src/main/resources/META-INF/persistence.xml
index 79c49c23ed6b00775d68c701236b61f4087696b4..a4db38c81d6b7c31f5a40d8452e0e8728689db67 100644
--- a/Servidor JEE/src/main/resources/META-INF/persistence.xml
+++ b/Servidor JEE/src/main/resources/META-INF/persistence.xml
@@ -24,8 +24,7 @@
<!-- </persistence-unit> -->
<persistence-unit name="matefunDS" transaction-type="JTA">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <jta-data-source>jdbc/azureDSjta</jta-data-source>
+ <jta-data-source>java:/matefun</jta-data-source>
<class>edu.proygrado.modelo.Alumno</class>
<class>edu.proygrado.modelo.Archivo</class>
<class>edu.proygrado.modelo.Configuracion</class>
@@ -39,7 +38,6 @@
<class>edu.proygrado.modelo.Sesion</class>
<properties>
<property name="javax.persistence.schema-generation.database.action" value="none" />
- <property name="hibernate.transaction.jta.platform" value="org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform"/>
</properties>
</persistence-unit>