diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts index d3db0a23365cf466db161da98e238a5b7886f257..ea1d6d4432aac3adccfd9043ce25ae784e076748 100755 --- a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts +++ b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts @@ -45,13 +45,13 @@ export class Graph2DComponent { //Para las funciones if (obj.conj.sets.fdom == "function(x)") { var nom = jsonCanvas.funs[0].dom; - var elemento = this.recursionfuncion(jsonCanvas.funs[0].sets, nom); - obj.conj.sets.fdom = function (x) { return eval(elemento) } + var elemento1 = this.recursionfuncion(jsonCanvas.funs[0].sets, nom); + obj.conj.sets.fdom = function (x) { return eval(elemento1) } } if (obj.conj.sets.fcod == "function(x)") { var nom = jsonCanvas.funs[0].cod; - var elemento = this.recursionfuncion(jsonCanvas.funs[0].sets, nom); - obj.conj.sets.fcod = function (x) { return (eval(elemento)) } + var elemento2 = this.recursionfuncion(jsonCanvas.funs[0].sets, nom); + obj.conj.sets.fcod = function (x) { return (eval(elemento2)) } } //para Enumerados if (obj.conj.dom == 'Numer') { @@ -476,7 +476,7 @@ export class Graph2DComponent { grafica = fun; } } - funcionString = '(' + grafica.args.join() + ',delta,hayPunto)=>{\n' + funcionString + '}'; + funcionString = '(' + grafica.args.join() + ')=>{\n' + funcionString + '}'; return funcionString; } @@ -487,9 +487,9 @@ export class Graph2DComponent { expresion = ' (' + this.generarExpresion(exp.cond) + '?' + this.generarExpresion(exp.exp1) + ':' + this.generarExpresion(exp.exp2) + ') '; } else if (exp.kind == 'bop') { if (exp.op == '==') { - expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) < delta && hayPunto() '; + expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 '; } else if (exp.op == '/=') { - expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) > delta || Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) < delta && !hayPunto() '; + expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 || Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 '; } else if (exp.op == '^') { expresion = ' Math.pow(' + this.generarExpresion(exp.exp1) + ',' + this.generarExpresion(exp.exp2) + ') '; } else {