Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CSCI30_Project
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Temujin
CSCI30_Project
Commits
0b442d74
Commit
0b442d74
authored
Dec 10, 2019
by
Temujin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-4' into 'master'
Update family_tree.py See merge request
!4
parents
27781975
d4357b12
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
family_tree.py
family_tree.py
+13
-5
No files found.
family_tree.py
View file @
0b442d74
...
...
@@ -217,7 +217,7 @@ class FamilyTree:
"""Return the index in the times table."""
return
self
.
times
[
n
]
def
great
(
self
,
n
):
def
GREAT
(
self
,
n
):
"""Return a string of n 'greats' separated by '-' ."""
return
"-"
.
join
([
"great"
]
*
n
)
...
...
@@ -433,7 +433,7 @@ def commandLine():
print
(
"Error: no such person "
+
cmd
[
1
])
elif
cmd
[
0
]
==
"edit-age"
:
try
:
tree
.
get_person
(
cmd
[
1
])
.
set_
nam
e
(
cmd
[
2
])
tree
.
get_person
(
cmd
[
1
])
.
set_
ag
e
(
cmd
[
2
])
except
KeyError
:
print
(
"Error: no such person "
+
cmd
[
1
])
elif
cmd
[
0
]
==
"edit-sex"
:
...
...
@@ -446,13 +446,21 @@ def commandLine():
print
(
"Error: no such person "
+
cmd
[
1
])
elif
cmd
[
0
]
==
"relationship"
:
try
:
if
cmd
[
1
]
==
cmd
[
2
]:
print
(
"Error: inputs must be distinct"
)
else
:
print
(
tree
.
relationship
(
tree
.
get_person
(
cmd
[
1
]),
tree
.
get_person
(
cmd
[
2
])))
except
KeyError
:
print
(
"Error: one or both persons do not exist"
)
elif
cmd
[
0
]
==
"load"
:
try
:
tree
=
openfile
(
cmd
[
1
])
print
(
cmd
[
1
]
+
".ft has been loaded"
)
except
FileNotFoundError
:
print
(
"Error: File not found"
)
elif
cmd
[
0
]
==
"save"
:
tree
.
find_root
()
tree
.
precompute
()
savefile
(
cmd
[
1
],
tree
)
print
(
"file saved"
)
elif
cmd
[
0
]
==
"bye"
:
...
...
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