From 860880f473ef970c668de5c66f7da3e0c5cc7a65 Mon Sep 17 00:00:00 2001
From: leonelrosano <leonelrosano@gmail.com>
Date: Wed, 7 Aug 2019 00:16:06 -0300
Subject: [PATCH] arreglo de bugs funciones R
---
.DS_Store | Bin 8196 -> 8196 bytes
.../plotter/graph2D/graph2D.component.ts | 27 ++++++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 3d225e777d994250b663bfcf8d49bf3e11bf03c0..cf3e079f90b868d3d663a2b52808748cdda90249 100644
GIT binary patch
literal 8196
zcmeHMTWl0n82-OfV79|$TG7^Z!Ic69thfcrO`+RuOSlyZTWGnK*_{z4PG{=Q?3Plh
zee;6x$#}sS(Fcv<qmX!w@j)d%7?F63Jov(+K4{dK82rziSwah##s>pBCz<ojod5sN
z<?DCm>^~(UWQs-;Q5_K}d<oQ4uC7spU0hd{im+u0BRHPOCzBj9C`qkXc}EQq0}%re
z0}%re0}%r^0t0+zi=tfT+?Up<ju?m-_+K(0-VaH>1g1kAl^DD_xC&AL#!7Au3g2@c
z5X2-yOouosF$m>8W%htD6k&=18P4{kaA!=1I4V(w6J$6c92sGTf?#xxO9t+Qw8W^6
z7>F3SngNl!*U)+@kjt6-mHE3vhp0$4>1<2V^4y>|kh9$!`=8AX*p}y~QeUHDQsv|+
zQx&C3shVE3KYQ36%=)@t^fG#3uXyUx{lmHNzT0)}%lCS2mt_w2X|vi~$JZ^#ECj)p
zVY17<9?LP@!HipU3@_*>D-DVgQ(}Eu-SF_z=H|xa(iN*m8k55-SEd@1%a^Sf8Hp*i
z^PARgJlH>UbokiF!_Uk0B7A4i%yH{KG10{vUf#~}^hHM#V$1eQZIZ2ucgt*jS7s|#
zrK;288#Zp*yrr{G(~6$C!?bnZDw*xNZ+d;&OpmGCn0KA7f>~mkdh)Ja?048wo!9Mr
zk)6#}+s;}?rFXvI+IE-gS-#~uyL)}}h%aoSqcNu5J)T?e+k(z|E$&}>)rc{+4TxZG
zms#)_W3f{+Y7=+OUwrTK)$7{M&(x}GZkeU3d-%`b_|^lKS=c#f8UEqjx|cT{!*UMw
zlq}E6*=Dz+_nXy7#9~2I-R<#sZ!u>*RJ8mdtzJ=r*4cC7>OO;4(dinZH$ywENdLKW
z;_<!0(pE6JHo|}f4RN*G<27k|=y-Rds&+rfI?=pvs8o|0-)ZYP)7Ffb9H)7O8t*B|
zC25<(#x?h;@!q`K-_J|&s?iuWx1{6o17hSYy60~jFdd%Nr{VDJJgeQp)@m4HPD*|H
z$cKTL>eCAYq<RTN0Ri>tlzi62!8V&xl%Y*@fCgxYj?**r61_#I=?r~DpV3$JJzb<9
z>1X<texu(3RACyXV+Lw54-3$Mg=oTBtV0VnpcC8Bh3(jbKIq6H4;uyeD58W%@F*U~
z6F82i@gh#*WxRq@cn9y{eSCmV@CDA{OPt3AT*OcK1%JvpR+RV0*76!8;u7OT<sQBq
zDo$Qo?ukI|i*8uCe>+2J{MOrQlk*oZS+;6z=CVe{sbY+9uheQFP^rK`nPue#ia5_Z
z;f};?_0IA}8NY#cvX;#wiV&nWReH}&%u`r{ni4#!4T(iD-Y6QRwIOkjqG%P;mP#y*
z@!rrTNn5kJQsG^oO_tU*>isd^Ct9Vnwy3QNZwGCPw6?43V`9f@G;v-3t*Xz`Ir@PW
z{RdsbWL9$xD>=z3UV>GDiZf_K2ez`3w_^vou^$I;kku@-+z$r>7{XB;!w4(-F;?_(
zJc+09ES|#&yuiwS6|doSyn#1y8fWl!sPK>RIljS#ahmQNr|F9m)pRLaaBSB(#QtJ`
zOrtD++%8awEdIdl28ZG%>Y$GD*)VpTo8f7aoMfHI|2wY#{r_fIN;Joafrx>B$N(za
zv+WrUF8>Y~-;c<(lYAZIOBCTZDlrJ*DoDo}gLItn@;?muKFO{kCLQ9aL~h~ouYU;8
UuK9B}I{%~de{910A3y*90=%4aEC2ui
delta 1205
zcmeH_TS!zv7{}+o-p<j{9amlLw3ZU)CBxm#EVXn^u}o>rv<rc{>p8*Vddah{m6ARf
zMI{-B?qT&%BtC_gF7{LekwG^hEPSz`rwAgtU_#>_Ujl=AZ(cs;`+v*~zu)vadL8{v
zgxsneHzGuvGpA|U?37@$<zyzUvD>r>wy(ge`itG(7B?Y=F?Xxiqx!7YH!uVRhlGX+
zVt53Nls0cE+geWRn91)^I-IROPfN49Q)yFq)dr&Xr?YldsZzWypU1D1xO|GrAPz;v
zTar^Uva)kGZkjZ*Xj4oqrCP2j1DTp^N&?l6n5^BjTJ;=Km`e}?GpjNwt#0%*%S;vZ
zj@3q`8n4T(c$q8;fuXfIRNCd&uV>{8&AeDD?QUpkYEqhg>O!xeP?Bn8{+<e#>T|X#
z&5Fz(3;H3&%Oq)!Y~*2)EGx1g2rC@z{n|2fO1DS^l1S{NgjA4v(ndN-A30C1kr6UR
zZj*=PDS1t%$p`X@d?DY+ck%-UL?9ATFd_jdNJSdbVMhT9;XoO-p%U9sg}tbU8x4@r
z1QqS@qXRuShT}MalQ@F`T)|ZgT5t#VFpm3pglBk;7kG)cc#n_xj9G2kyc|F0Mb3L`
zUGR2kac`E=d2xUCmb#d?sVH4moH;%zC4IGh-G(A<Wn2yS)fJc5KvOLdA{!MZ6P8Fz
zEvc4FL12c!hGto8A{WVm^emg^2wWKp(bHU-FLJ3YSWgS6L*VXMsGcU$5>aI2Zyh`#
zugDDNKMR6T&OU~7Pv*?CkQ-oLj1rW>$+=fy2Wn7@I=DFdMtC{<797AqbfOD~add%y
zAI{<&F5n_A<2r8S;U)$#gb|EljQhBY2bjPlrZ7VS%K*LdFY?>MyWu%=I8OKE4~Hdu
Q4c6>&W&g?j8@ctr0F>Jsq5uE@
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 ce7ad9d4..ef96a556 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
@@ -1016,6 +1016,7 @@ createListFunction = function (graph) {
arrayFunction.push(funcionString);
var funcionString = '';
}
+ console.log(arrayFunction[0])
return arrayFunction;
}
@@ -1168,19 +1169,41 @@ generateFunctionAndExp = function (exp,graph,namefun6) {
aux7[0]= aux27;
aux7[1] = aux17;
myList.push(aux7);
- }else{
+
+ }else if (exp.args[0].kind == 'app'){
+ var aux101 = [];
+ var aux1101 = exp.fun+'('+ exp.args.map(e => this.generarExpresion(e)).join() +')';
+ var aux2101 = 'N'
+ aux101[0]= aux2101;
+ aux101[1] = aux1101;
+ myList.push(aux101);
+
+
+ }else if(((exp.args[0].kind == 'cnd' || exp.args[0].kind == 'bop') && (exp.args[0].exp1.kind == 'app' || exp.args[0].exp2.kind == 'app' )) || (exp.args[0].kind == 'uop' && exp.args[0].exp.kind == 'app') ){
+ var aux102 = [];
+ var aux1102 = exp.fun+'('+ exp.args.map(e => this.generarExpresion(e)).join() +')';
+ var aux2102 = 'N'
+ aux102[0]= aux2102;
+ aux102[1] = aux1102;
+ myList.push(aux102);
+ }else{
+
if(!namefun6.includes(exp.fun)){
+
+
var ListnameFNew = namefun6;
ListnameFNew.push(exp.fun);
for (var fun5 of graph.funs){
if(fun5.fun == exp.fun){
+ fun5.bdy.args = exp.args;
myList = this.generateFunctionAndExp(fun5.bdy,graph,ListnameFNew);
}
}
}else{
+
var aux76 = [];
aux76[0] = 'N';
- aux76[1] = exp.fun;
+ aux76[1] = exp.fun + "("+exp.args.map(e => this.generarExpresion(e)).join()+")";
myList.push(aux76);
}
}
--
GitLab