Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
trs
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
trs
Commits
7d186db7
Commit
7d186db7
authored
Jan 24, 2012
by
Taddeus Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented use of Scope class in multiply_numerics.
parent
d1eb149c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
14 deletions
+25
-14
src/rules/numerics.py
src/rules/numerics.py
+9
-10
tests/test_rules_numerics.py
tests/test_rules_numerics.py
+16
-4
No files found.
src/rules/numerics.py
View file @
7d186db7
...
@@ -147,13 +147,12 @@ def multiply_numerics(root, args):
...
@@ -147,13 +147,12 @@ def multiply_numerics(root, args):
else
:
else
:
substitution
=
-
Leaf
(
-
value
)
substitution
=
-
Leaf
(
-
value
)
for
n
in
Scope
(
root
):
scope
=
Scope
(
root
)
if
hash
(
n
)
==
hash
(
n0
):
# Replace the left node with the new expression
# Replace the left node with the new expression
scope
.
append
(
substitution
)
scope
.
remove
(
n0
,
substitution
)
#scope.append(n)
elif
hash
(
n
)
!=
hash
(
n1
):
# Remove the right node
# Remove the right node
scope
.
append
(
n
)
scope
.
remove
(
n1
)
return
nary_node
(
'*'
,
scope
)
return
scope
.
as_nary_node
(
)
tests/test_rules_numerics.py
View file @
7d186db7
...
@@ -96,7 +96,19 @@ class TestRulesNumerics(RulesTestCase):
...
@@ -96,7 +96,19 @@ class TestRulesNumerics(RulesTestCase):
a
*
6
*
b
)
a
*
6
*
b
)
def
test_multiply_numerics_negation
(
self
):
def
test_multiply_numerics_negation
(
self
):
#a, b = root = tree('1 - 5 * -3x - 5 * 6')
l1_neg
,
l2
=
root
=
tree
(
'-1 * 2'
)
l1
,
l2
=
tree
(
'-1 * 2'
)
self
.
assertEqualNodes
(
multiply_numerics
(
root
,
(
l1_neg
,
l2
,
-
1
,
2
)),
-
l2
)
self
.
assertEqual
(
multiply_numerics
(
l1
*
l2
,
(
l1
,
l2
,
-
1
,
2
)),
-
l2
)
root
,
l6
=
tree
(
'1 - 2 * 3,6'
)
l1
,
neg
=
root
l2
,
l3
=
mul
=
neg
[
0
]
self
.
assertEqualNodes
(
multiply_numerics
(
mul
,
(
l2
,
l3
,
2
,
3
)),
l6
)
l1
,
mul
=
root
=
tree
(
'1 + -2 * 3'
)
l2_neg
,
l3
=
mul
self
.
assertEqualNodes
(
multiply_numerics
(
mul
,
(
l2_neg
,
l3
,
-
2
,
3
)),
-
l6
)
root
,
l30
=
tree
(
'-5 * x ^ 2 - -15x - 5 * 6,30'
)
rest
,
mul_neg
=
root
l5_neg
,
l6
=
mul
=
mul_neg
[
0
]
self
.
assertEqualNodes
(
multiply_numerics
(
mul
,
(
l5_neg
,
l6
,
5
,
6
)),
l30
)
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