Skip to content

Commit c644e25

Browse files
author
JBWBecker
committed
Refactored file names, removed "gn_" prefixes.
1 parent 6e6b459 commit c644e25

9 files changed

Lines changed: 38 additions & 42 deletions

File tree

‎gitnet/__init__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .get_log import get_log
2-
from .gn_exceptions import RepositoryError, ParseError, InputError
3-
from .gn_log import Log
4-
from .gn_commit_log import CommitLog
5-
from .gn_helpers import simple_edge, changes_edge, author_file_node_colours
2+
from .exceptions import RepositoryError, ParseError, InputError
3+
from .log import Log
4+
from .commit_log import CommitLog
5+
from .helpers import simple_edge, changes_edge, author_file_node_colours

gitnet/gn_commit_log.py renamed to gitnet/commit_log.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import numpy as np
22
import copy
3-
from gitnet.gn_log import Log
4-
from gitnet.gn_exceptions import InputError
5-
from gitnet.gn_helpers import git_datetime, most_common, filter_regex, simple_edge, changes_edge
3+
from gitnet.log import Log
4+
from gitnet.exceptions import InputError
5+
from gitnet.helpers import git_datetime, most_common, filter_regex, simple_edge, changes_edge
66

77

88
class CommitLog(Log):

gitnet/gn_exceptions.py renamed to gitnet/exceptions.py

File renamed without changes.

‎gitnet/get_log.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import bash as sh
22
import os
33
import warnings
4-
from gitnet.gn_exceptions import RepositoryError, ParseError, InputError
5-
from gitnet.gn_commit_log import CommitLog
4+
from gitnet.exceptions import RepositoryError, ParseError, InputError
5+
from gitnet.commit_log import CommitLog
66

77

88
def retrieve_commits(path, mode = "stat"):

‎gitnet/gitnet_tests/test_netgen.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ def test_edge_attr(self):
2929
self.assertEqual(set(hashes),set(manual))
3030

3131
def test_edge_weight(self):
32-
weights = [e[2]["weight"] for e in self.my_log.generate_edges("author","files",helper=gitnet.gn_helpers.changes_edge)]
32+
weights = [e[2]["weight"] for e in self.my_log.generate_edges("author","files", helper=gitnet.helpers.changes_edge)]
3333
manual = [33,45,51,1,5]
3434
self.assertEqual(set(weights),set(manual))
3535

3636
def test_edge_attr_dict(self):
37-
edges = self.my_log.generate_edges("author","files",helper=gitnet.gn_helpers.changes_edge,
38-
edge_attributes=["hash","date"])
37+
edges = self.my_log.generate_edges("author","files", helper=gitnet.helpers.changes_edge,
38+
edge_attributes=["hash","date"])
3939
attr_dict = [e[2] for e in edges if e[2]["hash"] == "51ba020a3fdc56d74d88306e507dd4e2d2db3543"][0]
4040
manual_dict = {"weight":1,"hash":"51ba020a3fdc56d74d88306e507dd4e2d2db3543","date":"Fri May 6 14:50:22 2016 -0400"}
4141
print("Attr Dict:",attr_dict)

‎gitnet/gitnet_tests/test_network.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import unittest
2-
from gitnet import gn_multigraph
2+
from gitnet import multigraph
33

44

55
class CollapseEdgesTest(unittest.TestCase):
6-
"""Tests for the collapse_edges() method within gn_multigraph.py"""
6+
"""Tests for the collapse_edges() method within multigraph.py"""
77
# A simple graph with weights
8-
mgw = gn_multigraph.MultiGraphPlus()
8+
mgw = multigraph.MultiGraphPlus()
99
mgw.add_edge(1, 2, weight=3)
1010
mgw.add_edge(1, 2, weight=2)
1111
mgw.add_edge(2, 3, weight=4)
1212

1313
# A graph with no weights, but other similar attributes
14-
now = gn_multigraph.MultiGraphPlus()
14+
now = multigraph.MultiGraphPlus()
1515
now.add_edge('Alice', 'file01', type='commit', date='Jan 3', changed_lines=[5,18,38,44])
1616
now.add_edge('file01', 'Alice', type='commit', date='Jan 5', changed_lines=[3,5,23,67])
1717
now.add_edge('file01', 'Bob', type='issue', date='Jan 16', importance='high')
1818

1919
# A graph whose edges have weights and other different attributes
20-
diff = gn_multigraph.MultiGraphPlus()
20+
diff = multigraph.MultiGraphPlus()
2121
diff.add_edge('Charlie', 'file02', weight=2, type='commit', date='Jan 1', changed_lines=[1, 2])
2222
diff.add_edge('Charlie', 'file02', weight=1, type='issue', date='Jan 2', importance='high')
2323
diff.add_edge('Charlie', 'file02', weight=4, type='review', date='Jan 5', status='PASS')
@@ -33,7 +33,7 @@ def test_simple(self):
3333
"""When sum_weights==False, or isn't provided, are weights calculated by adding number of edges?"""
3434
# sum_weights is made explicit
3535
sumwf_explicit = self.mgw.collapse_edges(sum_weights=False)
36-
self.assertIsInstance(sumwf_explicit, gn_multigraph.MultiGraphPlus)
36+
self.assertIsInstance(sumwf_explicit, multigraph.MultiGraphPlus)
3737
self.assertEqual(sumwf_explicit.edge[1][2][0]['weight'], 2)
3838
self.assertEqual(sumwf_explicit.edge[2][3][0]['weight'], 1)
3939
self.assertEqual(len(sumwf_explicit.edge[1]), 1)
@@ -42,7 +42,7 @@ def test_simple(self):
4242

4343
# sum_weights is left to the default
4444
sumwf = self.mgw.collapse_edges()
45-
self.assertIsInstance(sumwf, gn_multigraph.MultiGraphPlus)
45+
self.assertIsInstance(sumwf, multigraph.MultiGraphPlus)
4646
self.assertEqual(sumwf.edge[1][2][0]['weight'], 2)
4747
self.assertEqual(sumwf.edge[2][3][0]['weight'], 1)
4848
self.assertEqual(len(sumwf.edge[1]), 1)
@@ -52,7 +52,7 @@ def test_simple(self):
5252
def test_simple_sum_weights(self):
5353
"""When sum_weights==True, are weights added?"""
5454
sumwt = self.mgw.collapse_edges(sum_weights=True)
55-
self.assertIsInstance(sumwt, gn_multigraph.MultiGraphPlus)
55+
self.assertIsInstance(sumwt, multigraph.MultiGraphPlus)
5656
self.assertEqual(sumwt.edge[1][2][0]['weight'], 5)
5757
self.assertEqual(sumwt.edge[2][3][0]['weight'], 4)
5858
self.assertEqual(len(sumwt.edge[1]), 1)
@@ -63,15 +63,15 @@ def test_no_weight(self):
6363
"""Is the absence of a weight attribute handled correctly? (Default to 1)?"""
6464
# Summing the weights
6565
sum = self.now.collapse_edges(sum_weights=True)
66-
self.assertIsInstance(sum, gn_multigraph.MultiGraphPlus)
66+
self.assertIsInstance(sum, multigraph.MultiGraphPlus)
6767
self.assertEqual(sum.edge['Alice']['file01'][0]['weight'], 2)
6868
self.assertEqual(sum.edge['file01']['Bob'][0]['weight'], 1)
6969
self.assertEqual(len(sum.edge['Alice']), 1)
7070
self.assertEqual(len(sum.edge['file01']), 2)
7171
self.assertEqual(len(sum.edge['Bob']), 1)
7272
# Not summing weights
7373
nosum = self.now.collapse_edges()
74-
self.assertIsInstance(nosum, gn_multigraph.MultiGraphPlus)
74+
self.assertIsInstance(nosum, multigraph.MultiGraphPlus)
7575
self.assertEqual(nosum.edge['Alice']['file01'][0]['weight'], 2)
7676
self.assertEqual(nosum.edge['file01']['Bob'][0]['weight'], 1)
7777
self.assertEqual(len(nosum.edge['Alice']), 1)
@@ -84,20 +84,20 @@ def test_some_weight(self):
8484
mgw.add_edge(2,3) # Add non-weighted edge
8585
# Sum weights
8686
somew_sum = mgw.collapse_edges(sum_weights=True)
87-
self.assertIsInstance(somew_sum, gn_multigraph.MultiGraphPlus)
87+
self.assertIsInstance(somew_sum, multigraph.MultiGraphPlus)
8888
self.assertEqual(somew_sum.edge[1][2][0]['weight'],5)
8989
self.assertEqual(somew_sum.edge[2][3][0]['weight'],5)
9090

9191
# Don't sum weights
9292
somew_nosum = mgw.collapse_edges(sum_weights=False)
93-
self.assertIsInstance(somew_nosum, gn_multigraph.MultiGraphPlus)
93+
self.assertIsInstance(somew_nosum, multigraph.MultiGraphPlus)
9494
self.assertEqual(somew_nosum.edge[1][2][0]['weight'], 2)
9595
self.assertEqual(somew_nosum.edge[2][3][0]['weight'], 2)
9696

9797
def test_eattr(self):
9898
"""Are edge attributes retained?"""
9999
mg = self.now.collapse_edges()
100-
self.assertIsInstance(mg, gn_multigraph.MultiGraphPlus)
100+
self.assertIsInstance(mg, multigraph.MultiGraphPlus)
101101
# Looking at Alice, contains a list attribute
102102
self.assertIsInstance(mg.edge['Alice'], dict)
103103
AD = {'file01': {0: {'weight': 2,
@@ -121,7 +121,7 @@ def test_diff_attr(self):
121121
"""Are edge attributes retained properly, even when they aren't the same?"""
122122
# Sum the weights
123123
diff_attr = self.diff.collapse_edges(sum_weights=True)
124-
self.assertIsInstance(diff_attr, gn_multigraph.MultiGraphPlus)
124+
self.assertIsInstance(diff_attr, multigraph.MultiGraphPlus)
125125
# Looking at Charlie, contains 3 unique attributes
126126
cd = {'file02': {0: {'weight': 7,
127127
'type': ['commit', 'issue', 'review'],
@@ -158,8 +158,8 @@ def test_diff_attr(self):
158158

159159

160160
class NodeMergeTest(unittest.TestCase):
161-
"""Tests for the node_merge() method within gn_multigraph.py"""
162-
mg = gn_multigraph.MultiGraphPlus()
161+
"""Tests for the node_merge() method within multigraph.py"""
162+
mg = multigraph.MultiGraphPlus()
163163
mg.add_node('Alice', attr_dict={'id': 'a01',
164164
'email': 'alice@gmail.com',
165165
'phone': '1(888)123-4567',
@@ -183,7 +183,7 @@ def test_basic_res(self):
183183
"""Ensures the results of the method are appropriate"""
184184
mg_merged = self.mg_merged
185185
# Checking Return Value
186-
self.assertIsInstance(mg_merged, gn_multigraph.MultiGraphPlus)
186+
self.assertIsInstance(mg_merged, multigraph.MultiGraphPlus)
187187
# Checking Nodes
188188
self.assertEqual(self.mg.number_of_nodes(), 4) # Checking before
189189
self.assertEqual(mg_merged.number_of_nodes(), 3)
@@ -202,7 +202,7 @@ def test_basic_res(self):
202202
def test_list_attr(self):
203203
"""Are list attributes combined by node_merge?"""
204204
mg_merged = self.mg_merged
205-
self.assertIsInstance(mg_merged, gn_multigraph.MultiGraphPlus)
205+
self.assertIsInstance(mg_merged, multigraph.MultiGraphPlus)
206206
self.assertEqual(len(mg_merged.node['Alice Smith']['records']), 4)
207207
self.assertSetEqual(set(mg_merged.node['Alice Smith']['records']), {'hash1', 'hash2', 'hash3', 'hash4'})
208208

gitnet/gn_helpers.py renamed to gitnet/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import datetime as dt
22
import re
33
import networkx as nx
4-
from gitnet.gn_exceptions import InputError
4+
from gitnet.exceptions import InputError
55

66

77
# Working with Git Log date strings

gitnet/gn_log.py renamed to gitnet/log.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import datetime as dt
44
import warnings
55
import copy
6-
from gitnet.gn_multigraph import MultiGraphPlus
7-
from gitnet.gn_helpers import git_datetime, before, beforex, since, sincex, filter_has, filter_equals, simple_edge
6+
from gitnet.multigraph import MultiGraphPlus
7+
from gitnet.helpers import git_datetime, before, beforex, since, sincex, filter_has, filter_equals, simple_edge
88

99
class Log(object):
1010
"""

gitnet/gn_multigraph.py renamed to gitnet/multigraph.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
import warnings
33
import matplotlib.pyplot as plt
44
import copy
5-
<<<<<<< HEAD
6-
import numpy
7-
=======
85
import numpy as np
9-
>>>>>>> f7e086e092c968931362dde4bfd04759655e3857
10-
from gitnet.gn_helpers import git_datetime
6+
from gitnet.helpers import git_datetime
117
from networkx.drawing.nx_agraph import graphviz_layout
128
from networkx.algorithms import bipartite
139

@@ -227,14 +223,14 @@ def describe(self, extra = False):
227223
degree_mode2 = bipartite.degree_centrality(self, bipartite.sets(self)[1])
228224
degree_mode1 = list(degree_mode1.values())
229225
degree_mode2 = list(degree_mode2.values())
230-
degree_mode1 = numpy.mean(degree_mode1)
231-
degree_mode2 = numpy.mean(degree_mode2)
226+
degree_mode1 = np.mean(degree_mode1)
227+
degree_mode2 = np.mean(degree_mode2)
232228
betweenness_mode1 = bipartite.betweenness_centrality(self, bipartite.sets(self)[0])
233229
betweenness_mode1 = list(betweenness_mode1.values())
234-
betweenness_mode1 = numpy.mean(betweenness_mode1)
230+
betweenness_mode1 = np.mean(betweenness_mode1)
235231
betweenness_mode2 = bipartite.betweenness_centrality(self, bipartite.sets(self)[1])
236232
betweenness_mode2 = list(betweenness_mode2.values())
237-
betweenness_mode2 = numpy.mean(betweenness_mode2)
233+
betweenness_mode2 = np.mean(betweenness_mode2)
238234
G = nx.Graph(self)
239235
projection = bipartite.projected_graph(G, bipartite.sets(G)[0])
240236
transitivity = nx.transitivity(projection)

0 commit comments

Comments
 (0)