Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matefun
Frontend
Commits
ccab01a5
Commit
ccab01a5
authored
Mar 14, 2019
by
Leonel Rosano Montero
Browse files
Soluciona error del /= y Naturales como primitivos
parent
4aac596a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
View file @
ccab01a5
...
...
@@ -715,7 +715,7 @@ export class Graph2DComponent {
if
(
exp
.
op
==
'
==
'
)
{
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
)
+
'
))
=
= 0
|| Math.abs((
'
+
this
.
generarExpresion
(
exp
.
exp1
)
+
'
) - (
'
+
this
.
generarExpresion
(
exp
.
exp2
)
+
'
)) == 0
'
;
expresion
=
'
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
{
...
...
@@ -786,9 +786,9 @@ export class Graph2DComponent {
}
else
if
(
grf
.
cod
==
'
Z
'
)
{
dominio
+=
"
\"
baseCod
\"
:
\"
Z
\"
,
\"
cod
\"
:
\"
Z
\"
,
"
;
setf
+=
"
\"
fcod
\"
:
\"
Z
\"
"
;
}
else
if
(
grf
.
cod
==
'
N
'
)
{
dominio
+=
"
\"
baseCod
\"
:
\"
N
\"
,
\"
cod
\"
:
\"
N
\"
,
"
;
setf
+=
"
\"
fcod
\"
:
\"
N
\"
"
;
//
} else if (grf.cod == 'N') {
//
dominio += "\"baseCod\": \"N\", \"cod\": \"N\" ,";
//
setf += "\"fcod\": \"N\"";
}
else
{
var
nom
=
grf
.
cod
;
if
(
Array
.
isArray
(
grf
.
sets
[
0
][
nom
]))
{
...
...
@@ -825,8 +825,8 @@ export class Graph2DComponent {
domin
+=
"
\"
radio
\"
: 0.3,
\"
baseDom
\"
:
\"
R
\"
,
\"
dom
\"
:
\"
Func
\"
"
;
}
else
if
(
sets
[
0
][
nom
].
set
==
'
Z
'
)
{
domin
+=
"
\"
radio
\"
: 2,
\"
baseDom
\"
:
\"
Z
\"
,
\"
dom
\"
:
\"
Func
\"
"
;
}
else
if
(
sets
[
0
][
nom
].
set
==
'
N
'
)
{
domin
+=
"
\"
radio
\"
: 2,
\"
baseDom
\"
:
\"
N
\"
,
\"
dom
\"
:
\"
Func
\"
"
;
//
} else if (sets[0][nom].set == 'N') {
//
domin += "\"radio\": 2, \"baseDom\": \"N\", \"dom\": \"Func\"";
}
else
{
var
nombre
=
sets
[
0
][
nom
].
set
;
domin
=
this
.
recursivoDom
(
sets
,
nombre
);
...
...
@@ -841,8 +841,8 @@ export class Graph2DComponent {
coodo
+=
"
\"
baseCod
\"
:
\"
R
\"
,
\"
cod
\"
:
\"
Func
\"
,
"
;
}
else
if
(
sets
[
0
][
nom
].
set
==
'
Z
'
)
{
coodo
+=
"
\"
baseCod
\"
:
\"
Z
\"
,
\"
cod
\"
:
\"
Func
\"
,
"
;
}
else
if
(
sets
[
0
][
nom
].
set
==
'
N
'
)
{
coodo
+=
"
\"
baseCod
\"
:
\"
N
\"
,
\"
cod
\"
:
\"
Func
\"
,
"
;
//
} else if (sets[0][nom].set == 'N') {
//
coodo += "\"baseCod\": \"N\", \"cod\": \"Func\",";
}
else
{
var
nombre
=
sets
[
0
][
nom
].
set
;
coodo
+=
this
.
recursivoDom
(
sets
,
nombre
);
...
...
@@ -858,7 +858,7 @@ export class Graph2DComponent {
if
(
exp
.
op
==
'
==
'
)
{
expresion
=
'
Math.abs((
'
+
this
.
generarF
(
exp
.
exp1
)
+
'
) - (
'
+
this
.
generarF
(
exp
.
exp2
)
+
'
)) == 0
'
;
}
else
if
(
exp
.
op
==
'
/=
'
)
{
expresion
=
'
Math.abs((
'
+
this
.
generarF
(
exp
.
exp1
)
+
'
) - (
'
+
this
.
generarF
(
exp
.
exp2
)
+
'
))
=
= 0
|| Math.abs((
'
+
this
.
generarF
(
exp
.
exp1
)
+
'
) - (
'
+
this
.
generarF
(
exp
.
exp2
)
+
'
)) == 0
'
;
expresion
=
'
Math.abs((
'
+
this
.
generarF
(
exp
.
exp1
)
+
'
) - (
'
+
this
.
generarF
(
exp
.
exp2
)
+
'
))
!
= 0
'
;
}
else
if
(
exp
.
op
==
'
^
'
)
{
expresion
=
'
Math.pow(
'
+
this
.
generarF
(
exp
.
exp1
)
+
'
,
'
+
this
.
generarF
(
exp
.
exp2
)
+
'
)
'
;
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment