Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
graph_drawing
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Taddeüs Kroes
graph_drawing
Commits
f9709555
Commit
f9709555
authored
Feb 27, 2012
by
Taddeus Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed powers parent parentheses.
parent
1911c3fe
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
line.py
line.py
+7
-4
tests/test_line.py
tests/test_line.py
+8
-1
No files found.
line.py
View file @
f9709555
...
@@ -140,10 +140,13 @@ def generate_line(root):
...
@@ -140,10 +140,13 @@ def generate_line(root):
# (-a) ^ b
# (-a) ^ b
if
op
==
'^'
and
not
i
:
if
op
==
'^'
and
not
i
:
exp
=
'('
+
exp
+
')'
exp
=
'('
+
exp
+
')'
elif
child_pred
<
node_pred
\
elif
child_pred
<
node_pred
:
or
(
i
and
child_pred
==
node_pred
\
exp
=
'('
+
exp
+
')'
and
(
op
!=
child
.
title
()
\
elif
child_pred
==
node_pred
:
or
(
op
==
'+'
and
child
[
1
].
negated
))):
if
i
and
(
op
!=
child
.
title
()
\
or
(
op
==
'+'
and
child
[
1
].
negated
)):
exp
=
'('
+
exp
+
')'
elif
not
i
and
op
==
'^'
:
exp
=
'('
+
exp
+
')'
exp
=
'('
+
exp
+
')'
e
.
append
(
exp
)
e
.
append
(
exp
)
...
...
tests/test_line.py
View file @
f9709555
...
@@ -26,11 +26,18 @@ class TestLine(unittest.TestCase):
...
@@ -26,11 +26,18 @@ class TestLine(unittest.TestCase):
self
.
assertEquals
(
generate_line
(
times
),
'(1 + 2)(1 + 2)'
)
self
.
assertEquals
(
generate_line
(
times
),
'(1 + 2)(1 + 2)'
)
def
test_parentheses_equal_precedence_right
(
self
):
def
test_parentheses_equal_precedence_right
(
self
):
l0
,
l1
,
l2
=
L
(
1
),
L
(
2
),
L
(
3
)
l0
,
l1
,
l2
,
l3
=
L
(
1
),
L
(
2
),
L
(
3
),
L
(
4
)
plus
=
N
(
'+'
,
l1
,
l2
)
plus
=
N
(
'+'
,
l1
,
l2
)
minus
=
N
(
'-'
,
l0
,
plus
)
minus
=
N
(
'-'
,
l0
,
plus
)
self
.
assertEquals
(
generate_line
(
minus
),
'1 - (2 + 3)'
)
self
.
assertEquals
(
generate_line
(
minus
),
'1 - (2 + 3)'
)
power
=
N
(
'^'
,
l0
,
N
(
'^'
,
l1
,
l2
))
self
.
assertEquals
(
generate_line
(
power
),
'1 ^ 2 ^ 3'
)
power
=
N
(
'^'
,
N
(
'^'
,
l0
,
l1
),
l2
)
self
.
assertEquals
(
generate_line
(
power
),
'(1 ^ 2) ^ 3'
)
power
=
N
(
'^'
,
l0
,
N
(
'^'
,
N
(
'^'
,
l1
,
l2
),
l3
))
self
.
assertEquals
(
generate_line
(
power
),
'1 ^ (2 ^ 3) ^ 4'
)
def
test_parentheses_equal_precedence_left
(
self
):
def
test_parentheses_equal_precedence_left
(
self
):
a
,
b
,
c
,
d
=
L
(
'a'
),
L
(
'b'
),
L
(
'c'
),
L
(
'd'
)
a
,
b
,
c
,
d
=
L
(
'a'
),
L
(
'b'
),
L
(
'c'
),
L
(
'd'
)
exp
=
N
(
'*'
,
N
(
'/'
,
N
(
'*'
,
a
,
b
),
c
),
d
)
exp
=
N
(
'*'
,
N
(
'/'
,
N
(
'*'
,
a
,
b
),
c
),
d
)
...
...
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