Cut long lines and simplify hard to read sections

Author: cynddl

bandicoot/core.py

@@ -62,7 +62,8 @@ def __init__(self, interaction=None, direction=None, correspondent_id=None,
         self.position = position
 
     def __repr__(self):
-        return "Record(" + ", ".join(["%s=%r" % (x, getattr(self, x)) for x in self.__slots__]) + ")"
+        attr = ["%s=%r" % (x, getattr(self, x)) for x in self.__slots__]
+        return "Record(" + ", ".join(attr) + ")"
 
     def __eq__(self, other):
         if isinstance(other, self.__class__) and self.__slots__ == other.__slots__:
@@ -476,7 +477,8 @@ def __equals__(self, other):
                (self.retailer_id == other.retailer_id)
 
     def __repr__(self):
-        return "Recharge(" + ", ".join(["%s=%r" % (x, getattr(self, x)) for x in self.__slots__]) + ")"
+        attr = ["%s=%r" % (x, getattr(self, x)) for x in self.__slots__]
+        return "Recharge(" + ", ".join(attr) + ")"
 
     def __hash__(self):
         return hash(str(self))

bandicoot/helper/group.py

@@ -84,7 +84,8 @@ def filter_user(user, using='records', interaction=None,
             lambda r: r.datetime.isoweekday() in user.weekend, records)
     elif part_of_week != 'allweek':
         raise KeyError(
-            "{} is not a valid value for part_of_week. it should be 'weekday', 'weekend' or 'allweek'.".format(part_of_week))
+            "{} is not a valid value for part_of_week. it should be 'weekday', "
+            "'weekend' or 'allweek'.".format(part_of_week))
 
     if user.night_start < user.night_end:
         night_filter = lambda r: user.night_end > r.datetime.time(
@@ -230,20 +231,24 @@ def infer_type(data):
             return 'distribution_summarystats'
 
         raise TypeError(
-            "{} is not a valid input. It should be a number, a SummaryStats object, or None".format(data[0]))
+            "{} is not a valid input. It should be a number, a SummaryStats "
+            "object, or None".format(data[0]))
 
     raise TypeError(
-        "{} is not a valid input. It should be a number, a SummaryStats object, or a list".format(data))
+        "{} is not a valid input. It should be a number, a SummaryStats "
+        "object, or a list".format(data))
 
 
 def statistics(data, summary='default', datatype=None):
     """
-    Return statistics (mean, standard error, standard error and median, min and max) on data metrics.
+    Return statistics (mean, standard error, standard error and median,
+    min and max) on data metrics.
 
     Examples
     --------
     Given a list of integers or floating point numbers,
-    ``statistics`` computes the mean and standard error of the mean, and the min and max.
+    ``statistics`` computes the mean and standard error of the mean,
+    and the min and max.
 
     >>> statistics([0, 1, 2, 3])
     {'mean': 1.5, 'std': 1.2910, 'min': 0, 'max': 3}

bandicoot/helper/maths.py

@@ -152,10 +152,18 @@ class SummaryStats(object):
                  'skewness', 'kurtosis', 'distribution']
 
     def __init__(self, mean, std, min, max, median, skewness, kurtosis, distribution):
-        self.mean, self.std, self.min, self.max, self.median, self.skewness, self.kurtosis, self.distribution = mean, std, min, max, median, skewness, kurtosis, distribution
+        self.mean = mean
+        self.std = std
+        self.min = min
+        self.max = max
+        self.median = median
+        self.skewness = skewness
+        self.kurtosis = kurtosis
+        self.distribution = distribution
 
     def __repr__(self):
-        return "SummaryStats(" + ", ".join(["%s=%r" % (x, getattr(self, x)) for x in self.__slots__]) + ")"
+        attrs = ["%s=%r" % (x, getattr(self, x)) for x in self.__slots__]
+        return "SummaryStats(" + ", ".join(attrs) + ")"
 
     def __eq__(self, other):
         if isinstance(other, self.__class__) and self.__slots__ == other.__slots__:
@@ -191,7 +199,8 @@ def summary_stats(data):
     _skewness = skewness(data)
     _distribution = data
 
-    return SummaryStats(_mean, _std, _minimum, _maximum, _median, _skewness, _kurtosis, _distribution)
+    return SummaryStats(_mean, _std, _minimum, _maximum,
+                        _median, _skewness, _kurtosis, _distribution)
 
 
 def entropy(data):
@@ -210,7 +219,8 @@ def entropy(data):
 
 def great_circle_distance(pt1, pt2):
     """
-    Return the great-circle distance in kilometers between two points, defined by a tuple (lat, lon).
+    Return the great-circle distance in kilometers between two points,
+    defined by a tuple (lat, lon).
 
     Examples
     --------

bandicoot/individual.py

@@ -155,12 +155,15 @@ def call_duration(records, direction=None):
 
 def _conversations(group, delta=datetime.timedelta(hours=1)):
     """
-    Group texts into conversations. The function returns an iterator over records grouped by conversations.
+    Group texts into conversations. The function returns an iterator over
+    records grouped by conversations.
 
-    See :ref:`Using bandicoot <conversations-label>` for a definition of conversations.
+    See :ref:`Using bandicoot <conversations-label>` for a definition of
+    conversations.
 
-    A conversation begins when one person sends a text-message to the other and ends when one of them makes a phone call
-    or there is no activity between them for an hour.
+    A conversation begins when one person sends a text-message to the other and
+    ends when one of them makes a phone call or there is no activity between
+    them for an hour.
     """
     last_time = None
     results = []
@@ -196,8 +199,9 @@ def response_rate_text(records):
     """
     The response rate of the user (between 0 and 1).
 
-    Considers text-conversations which began with an incoming text.  Response rate
-    is the fraction of such conversations in which the user sent a text (a response).
+    Considers text-conversations which began with an incoming text. The response
+    rate is the fraction of such conversations in which the user sent a text
+    (a response).
 
     The following sequence of messages defines four conversations (``I`` for an
     incoming text, ``O`` for an outgoing text): ::
@@ -207,9 +211,11 @@ def response_rate_text(records):
         I-I-I-I => Started with an incoming text but doesn't have outgoing texts
         O-O-I-O => Not starting with an incoming text
 
-    Here, the ratio would be 2/3 as we have 3 conversations starting with an incoming text and 2 of them have at least one outgoing text.
+    Here, the ratio would be 2/3 as we have 3 conversations starting with an
+    incoming text and 2 of them have at least one outgoing text.
 
-    See :ref:`Using bandicoot <conversations-label>` for a definition of conversations.
+    See :ref:`Using bandicoot <conversations-label>` for a definition of
+    conversations.
     """
     if len(records) == 0:
         return None
@@ -257,9 +263,10 @@ def response_delay_text(records):
 
     Notes
     -----
-    See :ref:`Using bandicoot <conversations-label>` for a definition of conversations.
-    Conversation are defined to be a series of text messages each sent no more than an hour
-    after the previous. The response delay can thus not be greater than one hour.
+    See :ref:`Using bandicoot <conversations-label>` for a definition of
+    conversations. Conversation are defined to be a series of text messages each
+    sent no more than an hour after the previous. The response delay can thus
+    not be greater than one hour.
     """
     interactions = defaultdict(list)
     for r in records:

bandicoot/io.py

@@ -26,9 +26,10 @@
 
 from __future__ import with_statement, division
 
-from .core import User, Record, Position, Recharge
-from .helper.tools import OrderedDict, percent_overlapping_calls, percent_records_missing_location, antennas_missing_locations, ColorHandler
 from .utils import flatten
+from .core import User, Record, Position, Recharge
+from .helper.tools import OrderedDict, percent_overlapping_calls, \
+    percent_records_missing_location, antennas_missing_locations, ColorHandler
 
 from datetime import datetime
 from json import dumps
@@ -180,7 +181,8 @@ def _map_position(data):
                   direction=data['direction'],
                   correspondent_id=data['correspondent_id'],
                   datetime=_tryto(
-                      lambda x: datetime.strptime(x, "%Y-%m-%d %H:%M:%S"), data['datetime']),
+                      lambda x: datetime.strptime(x, "%Y-%m-%d %H:%M:%S"),
+                      data['datetime']),
                   call_duration=_tryto(_map_duration, data['call_duration']),
                   position=_tryto(_map_position, data))
 

bandicoot/network.py

@@ -67,8 +67,6 @@ def _count_interaction(user, interaction=None, direction='out'):
 
 def _interaction_matrix(user, interaction=None, default=0, missing=None):
     generating_fn = partial(_count_interaction, interaction=interaction)
-
-    # Just in case, we remove the user from user.network (self records can happen)
     neighbors = matrix_index(user)
 
     def make_direction(direction):
@@ -267,7 +265,9 @@ def assortativity_indicators(user):
 
     for i, u_name in enumerate(matrix_index(user)):
         correspondent = user.network.get(u_name, None)
-        if correspondent is None or u_name == user.name or matrix[0][i] == 0:  # Non reciprocated edge
+
+        # Non reciprocated edge
+        if correspondent is None or u_name == user.name or matrix[0][i] == 0:
             continue
 
         neighbor_indics = all(correspondent, flatten=True)
@@ -328,12 +328,8 @@ def network_sampling(n, filename, directory=None, snowball=False, user=None):
         File to export to.
     directory: string
         Directory to select users from if using the default random selection.
-
-    Selection options
-    -----------------
-    random (default): selects n users at random
-
-    snowball: starts from a specified user, iterates over neighbors, and does a BFS until n neighbors are reached
+    snowball: starts from a specified user, iterates over neighbors, and does a
+        BFS until n neighbors are reached
     """
     if snowball:
         if user is None:

bandicoot/tests/samples/regressions/ego.json

@@ -5,7 +5,7 @@
         "reporting__attributes_path": "samples/attributes",
         "reporting__recharges_path": "samples/attributes",
         "reporting__version": "0.5.2",
-        "reporting__code_signature": "c4c6a317c309bb87382ed96a8cd4472e65528dde",
+        "reporting__code_signature": "6d0f6c0556a33bd29d051b0a782573652141ef54",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,

bandicoot/tests/samples/regressions/empty_user.json

@@ -5,7 +5,7 @@
         "reporting__attributes_path": null,
         "reporting__recharges_path": null,
         "reporting__version": "0.5.2",
-        "reporting__code_signature": "c4c6a317c309bb87382ed96a8cd4472e65528dde",
+        "reporting__code_signature": "6d0f6c0556a33bd29d051b0a782573652141ef54",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,

bandicoot/tests/samples/regressions/manual_a.json

@@ -5,7 +5,7 @@
         "reporting__attributes_path": null,
         "reporting__recharges_path": null,
         "reporting__version": "0.5.2",
-        "reporting__code_signature": "c4c6a317c309bb87382ed96a8cd4472e65528dde",
+        "reporting__code_signature": "6d0f6c0556a33bd29d051b0a782573652141ef54",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,

bandicoot/tests/samples/regressions/manual_a_orange_network.json

@@ -5,7 +5,7 @@
         "reporting__attributes_path": "samples/attributes",
         "reporting__recharges_path": "samples/attributes",
         "reporting__version": "0.5.2",
-        "reporting__code_signature": "c4c6a317c309bb87382ed96a8cd4472e65528dde",
+        "reporting__code_signature": "6d0f6c0556a33bd29d051b0a782573652141ef54",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,