[geneagrapher] 149/226: Removed classes from each new module in graph.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Jul 11 17:10:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository geneagrapher.
commit b429aaa6b1c8a0d88aed35ed8269c96582e9bc4f
Author: David Alber <alber.david at gmail.com>
Date: Sun Oct 30 10:17:01 2011 -0700
Removed classes from each new module in graph.
---
geneagrapher/graph/graph.py | 119 ------------------------
geneagrapher/graph/node.py | 194 ---------------------------------------
geneagrapher/graph/record.py | 209 -------------------------------------------
3 files changed, 522 deletions(-)
diff --git a/geneagrapher/graph/graph.py b/geneagrapher/graph/graph.py
index 1fdddca..6f31496 100644
--- a/geneagrapher/graph/graph.py
+++ b/geneagrapher/graph/graph.py
@@ -1,128 +1,9 @@
-"""A set of classes for storing the genealogy graph."""
-
class DuplicateNodeError(Exception):
def __init__(self, value):
self.value = value
def __str__(self):
return repr(self.value)
-class Record:
- """
- Container class storing record of a mathematician in the graph.
- """
- def __init__(self, name, institution=None, year=None, id=None):
- """
- Record class constructor.
-
- Parameters:
- name: string containing mathematician's name
- institution: string containing mathematician's institution
- (empty if none)
- year: integer containing year degree was earned
- id: integer containing Math Genealogy Project id value
- """
- self.name = name
- self.institution = institution
- self.year = year
- self.id = id
-
- # Verify we got the types wanted.
- if not isinstance(self.name, basestring):
- raise TypeError("Unexpected parameter type: expected string value for 'name'")
- if not isinstance(self.institution, basestring) and self.institution is not None:
- raise TypeError("Unexpected parameter type: expected string value for 'institution'")
- if not isinstance(self.year, int) and self.year is not None:
- raise TypeError("Unexpected parameter type: expected integer value for 'year'")
- if not isinstance(self.id, int) and self.id is not None:
- raise TypeError("Unexpected parameter type: expected integer value for 'id'")
-
- def __cmp__(self, r2):
- """
- Compare a pair of mathematician records based on ids.
- """
- return self.id.__cmp__(r2.id)
-
- def has_institution(self):
- """
- Return True if this record has an institution associated with it,
- else False.
- """
- return self.institution is not None
-
- def has_year(self):
- """
- Return True if this record has a year associated with it, else
- False.
- """
- return self.year is not None
-
-
-class Node:
- """
- Container class storing a node in the graph.
- """
- def __init__(self, record, ancestors, descendants):
- """
- Node class constructor.
-
- Parameters:
- record: instance of the Record class
- ancestors: list of the record's genealogical ancestors'
- IDs
- descendants: list of this record's genealogical
- descendants' IDs
- """
-
- self.record = record
- self.ancestors = ancestors
- self.descendants = descendants
- self.already_printed = False
-
- # Verify parameter types.
- if not isinstance(self.record, Record):
- raise TypeError("Unexpected parameter type: expected Record object for 'record'")
- if not isinstance(self.ancestors, list):
- raise TypeError("Unexpected parameter type: expected list object for 'ancestors'")
- if not isinstance(self.descendants, list):
- raise TypeError("Unexpected parameter type: expected list object for 'descendants'")
-
- def __str__(self):
- if self.record.has_institution():
- if self.record.has_year():
- return self.record.name.encode('utf-8', 'replace') + ' \\n' + self.record.institution.encode('utf-8', 'replace') + ' (' + str(self.record.year) + ')'
- else:
- return self.record.name.encode('utf-8', 'replace') + ' \\n' + self.record.institution.encode('utf-8', 'replace')
- else:
- if self.record.has_year():
- return self.record.name.encode('utf-8', 'replace') + ' \\n(' + str(self.record.year) + ')'
- else:
- return self.record.name.encode('utf-8', 'replace')
-
- def __cmp__(self, n2):
- return self.record.__cmp__(n2.record)
-
- def add_ancestor(self, ancestor): # NOTE: is this used?
- """
- Append an ancestor id to the ancestor list.
- """
- # Verify we were passed an int.
- if not isinstance(ancestor, int):
- raise TypeError("Unexpected parameter type: expected int for 'ancestor'")
- self.ancestors.append(ancestor)
-
- def get_id(self):
- """
- Accessor method to retrieve the id of this node's record.
- """
- return self.record.id
-
- def set_id(self, id):
- """
- Sets the record id.
- """
- self.record.id = id
-
-
class Graph:
"""
Class storing the representation of a genealogy graph.
diff --git a/geneagrapher/graph/node.py b/geneagrapher/graph/node.py
index 1fdddca..8305982 100644
--- a/geneagrapher/graph/node.py
+++ b/geneagrapher/graph/node.py
@@ -1,62 +1,3 @@
-"""A set of classes for storing the genealogy graph."""
-
-class DuplicateNodeError(Exception):
- def __init__(self, value):
- self.value = value
- def __str__(self):
- return repr(self.value)
-
-class Record:
- """
- Container class storing record of a mathematician in the graph.
- """
- def __init__(self, name, institution=None, year=None, id=None):
- """
- Record class constructor.
-
- Parameters:
- name: string containing mathematician's name
- institution: string containing mathematician's institution
- (empty if none)
- year: integer containing year degree was earned
- id: integer containing Math Genealogy Project id value
- """
- self.name = name
- self.institution = institution
- self.year = year
- self.id = id
-
- # Verify we got the types wanted.
- if not isinstance(self.name, basestring):
- raise TypeError("Unexpected parameter type: expected string value for 'name'")
- if not isinstance(self.institution, basestring) and self.institution is not None:
- raise TypeError("Unexpected parameter type: expected string value for 'institution'")
- if not isinstance(self.year, int) and self.year is not None:
- raise TypeError("Unexpected parameter type: expected integer value for 'year'")
- if not isinstance(self.id, int) and self.id is not None:
- raise TypeError("Unexpected parameter type: expected integer value for 'id'")
-
- def __cmp__(self, r2):
- """
- Compare a pair of mathematician records based on ids.
- """
- return self.id.__cmp__(r2.id)
-
- def has_institution(self):
- """
- Return True if this record has an institution associated with it,
- else False.
- """
- return self.institution is not None
-
- def has_year(self):
- """
- Return True if this record has a year associated with it, else
- False.
- """
- return self.year is not None
-
-
class Node:
"""
Container class storing a node in the graph.
@@ -121,138 +62,3 @@ class Node:
Sets the record id.
"""
self.record.id = id
-
-
-class Graph:
- """
- Class storing the representation of a genealogy graph.
- """
- def __init__(self, heads=None):
- """
- Graph class constructor.
-
- Parameters:
- heads: a list of Node objects representing the tree head
- (can be omitted to create an empty graph)
- """
- self.heads = heads
- self.supp_id = -1
-
- # Verify type of heads is what we expect.
- if self.heads is not None:
- if not isinstance(self.heads, list):
- raise TypeError("Unexpected parameter type: expected list of Node objects for 'heads'")
- for head in self.heads:
- if not isinstance(head, Node):
- raise TypeError("Unexpected parameter type: expected list of Node objects for 'heads'")
-
- self.nodes = {}
- if self.heads is not None:
- for head in self.heads:
- self.nodes[head.get_id()] = head
-
- def has_node(self, id):
- """
- Check if the graph contains a node with the given id.
- """
- return self.nodes.has_key(id)
-
- def get_node(self, id):
- """
- Return the node in the graph with given id. Returns
- None if no such node exists.
- """
- if self.has_node(id):
- return self.nodes[id]
- else:
- return None
-
- def get_node_list(self): # NOTE: this method is unused
- """
- Return a list of the nodes in the graph.
- """
- return self.nodes.keys()
-
- def add_node(self, name, institution, year, id, ancestors, descendants, isHead=False):
- """
- Add a new node to the graph if a matching node is not already
- present.
- """
- record = Record(name, institution, year, id)
- node = Node(record, ancestors, descendants)
- self.add_node_object(node, isHead)
-
- def add_node_object(self, node, isHead=False):
- """
- Add a new node object to the graph if a node with the same id
- is not already present.
- """
- if node.get_id() is not None and self.has_node(node.get_id()):
- msg = "node with id {} already exists".format(node.get_id())
- raise DuplicateNodeError(msg)
- if node.get_id() is None:
- # Assign a "dummy" id.
- node.set_id(self.supp_id)
- self.supp_id -= 1
- self.nodes[node.get_id()] = node
- if self.heads is None:
- self.heads = [node]
- elif isHead:
- self.heads.append(node)
-
- def generate_dot_file(self, include_ancestors, include_descendants):
- """
- Return a string that contains the content of the Graphviz dotfile
- format for this graph.
- """
- if self.heads is None:
- return ""
-
- queue = []
- for head in self.heads:
- queue.append(head.get_id())
- edges = ""
- dotfile = ""
-
- dotfile += """digraph genealogy {
- graph [charset="utf-8"];
- node [shape=plaintext];
- edge [style=bold];\n\n"""
-
- while len(queue) > 0:
- node_id = queue.pop()
- if not self.has_node(node_id):
- # Skip this id if a corresponding node is not present.
- continue
- node = self.get_node(node_id)
-
- if node.already_printed:
- continue
- else:
- node.already_printed = True
-
- if include_ancestors:
- # Add this node's advisors to queue.
- queue += node.ancestors
-
- if include_descendants:
- # Add this node's descendants to queue.
- queue += node.descendants
-
- # Print this node's information.
- nodestr = " {} [label=\"{}\"];".format(node_id, node)
- dotfile += nodestr
-
- # Store the connection information for this node.
- for advisor in node.ancestors:
- if self.has_node(advisor):
- edgestr = "\n {} -> {};".format(advisor, node_id)
- edges += edgestr
-
- dotfile += "\n"
-
- # Now print the connections between the nodes.
- dotfile += edges
-
- dotfile += "\n}\n"
- return dotfile
diff --git a/geneagrapher/graph/record.py b/geneagrapher/graph/record.py
index 1fdddca..db372a3 100644
--- a/geneagrapher/graph/record.py
+++ b/geneagrapher/graph/record.py
@@ -1,11 +1,3 @@
-"""A set of classes for storing the genealogy graph."""
-
-class DuplicateNodeError(Exception):
- def __init__(self, value):
- self.value = value
- def __str__(self):
- return repr(self.value)
-
class Record:
"""
Container class storing record of a mathematician in the graph.
@@ -55,204 +47,3 @@ class Record:
False.
"""
return self.year is not None
-
-
-class Node:
- """
- Container class storing a node in the graph.
- """
- def __init__(self, record, ancestors, descendants):
- """
- Node class constructor.
-
- Parameters:
- record: instance of the Record class
- ancestors: list of the record's genealogical ancestors'
- IDs
- descendants: list of this record's genealogical
- descendants' IDs
- """
-
- self.record = record
- self.ancestors = ancestors
- self.descendants = descendants
- self.already_printed = False
-
- # Verify parameter types.
- if not isinstance(self.record, Record):
- raise TypeError("Unexpected parameter type: expected Record object for 'record'")
- if not isinstance(self.ancestors, list):
- raise TypeError("Unexpected parameter type: expected list object for 'ancestors'")
- if not isinstance(self.descendants, list):
- raise TypeError("Unexpected parameter type: expected list object for 'descendants'")
-
- def __str__(self):
- if self.record.has_institution():
- if self.record.has_year():
- return self.record.name.encode('utf-8', 'replace') + ' \\n' + self.record.institution.encode('utf-8', 'replace') + ' (' + str(self.record.year) + ')'
- else:
- return self.record.name.encode('utf-8', 'replace') + ' \\n' + self.record.institution.encode('utf-8', 'replace')
- else:
- if self.record.has_year():
- return self.record.name.encode('utf-8', 'replace') + ' \\n(' + str(self.record.year) + ')'
- else:
- return self.record.name.encode('utf-8', 'replace')
-
- def __cmp__(self, n2):
- return self.record.__cmp__(n2.record)
-
- def add_ancestor(self, ancestor): # NOTE: is this used?
- """
- Append an ancestor id to the ancestor list.
- """
- # Verify we were passed an int.
- if not isinstance(ancestor, int):
- raise TypeError("Unexpected parameter type: expected int for 'ancestor'")
- self.ancestors.append(ancestor)
-
- def get_id(self):
- """
- Accessor method to retrieve the id of this node's record.
- """
- return self.record.id
-
- def set_id(self, id):
- """
- Sets the record id.
- """
- self.record.id = id
-
-
-class Graph:
- """
- Class storing the representation of a genealogy graph.
- """
- def __init__(self, heads=None):
- """
- Graph class constructor.
-
- Parameters:
- heads: a list of Node objects representing the tree head
- (can be omitted to create an empty graph)
- """
- self.heads = heads
- self.supp_id = -1
-
- # Verify type of heads is what we expect.
- if self.heads is not None:
- if not isinstance(self.heads, list):
- raise TypeError("Unexpected parameter type: expected list of Node objects for 'heads'")
- for head in self.heads:
- if not isinstance(head, Node):
- raise TypeError("Unexpected parameter type: expected list of Node objects for 'heads'")
-
- self.nodes = {}
- if self.heads is not None:
- for head in self.heads:
- self.nodes[head.get_id()] = head
-
- def has_node(self, id):
- """
- Check if the graph contains a node with the given id.
- """
- return self.nodes.has_key(id)
-
- def get_node(self, id):
- """
- Return the node in the graph with given id. Returns
- None if no such node exists.
- """
- if self.has_node(id):
- return self.nodes[id]
- else:
- return None
-
- def get_node_list(self): # NOTE: this method is unused
- """
- Return a list of the nodes in the graph.
- """
- return self.nodes.keys()
-
- def add_node(self, name, institution, year, id, ancestors, descendants, isHead=False):
- """
- Add a new node to the graph if a matching node is not already
- present.
- """
- record = Record(name, institution, year, id)
- node = Node(record, ancestors, descendants)
- self.add_node_object(node, isHead)
-
- def add_node_object(self, node, isHead=False):
- """
- Add a new node object to the graph if a node with the same id
- is not already present.
- """
- if node.get_id() is not None and self.has_node(node.get_id()):
- msg = "node with id {} already exists".format(node.get_id())
- raise DuplicateNodeError(msg)
- if node.get_id() is None:
- # Assign a "dummy" id.
- node.set_id(self.supp_id)
- self.supp_id -= 1
- self.nodes[node.get_id()] = node
- if self.heads is None:
- self.heads = [node]
- elif isHead:
- self.heads.append(node)
-
- def generate_dot_file(self, include_ancestors, include_descendants):
- """
- Return a string that contains the content of the Graphviz dotfile
- format for this graph.
- """
- if self.heads is None:
- return ""
-
- queue = []
- for head in self.heads:
- queue.append(head.get_id())
- edges = ""
- dotfile = ""
-
- dotfile += """digraph genealogy {
- graph [charset="utf-8"];
- node [shape=plaintext];
- edge [style=bold];\n\n"""
-
- while len(queue) > 0:
- node_id = queue.pop()
- if not self.has_node(node_id):
- # Skip this id if a corresponding node is not present.
- continue
- node = self.get_node(node_id)
-
- if node.already_printed:
- continue
- else:
- node.already_printed = True
-
- if include_ancestors:
- # Add this node's advisors to queue.
- queue += node.ancestors
-
- if include_descendants:
- # Add this node's descendants to queue.
- queue += node.descendants
-
- # Print this node's information.
- nodestr = " {} [label=\"{}\"];".format(node_id, node)
- dotfile += nodestr
-
- # Store the connection information for this node.
- for advisor in node.ancestors:
- if self.has_node(advisor):
- edgestr = "\n {} -> {};".format(advisor, node_id)
- edges += edgestr
-
- dotfile += "\n"
-
- # Now print the connections between the nodes.
- dotfile += edges
-
- dotfile += "\n}\n"
- return dotfile
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/geneagrapher.git
More information about the debian-science-commits
mailing list