From 6f5f6c657db96164d57cea8df124097ab280e42f Mon Sep 17 00:00:00 2001
From: Juan Eiros <jeirosz@gmail.com>
Date: Thu, 2 Mar 2017 11:01:22 +0000
Subject: [PATCH 1/5] Add __str__ method to GroupBase class

Smart reporting of groups with more than 10 items
---
 package/MDAnalysis/core/groups.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/MDAnalysis/core/groups.py b/package/MDAnalysis/core/groups.py
index 876a4b44cd3..7d39466e4c0 100644
--- a/package/MDAnalysis/core/groups.py
+++ b/package/MDAnalysis/core/groups.py
@@ -368,6 +368,15 @@ def __repr__(self):
                 "".format(name.capitalize(), len(self), name,
                 "s"[len(self)==1:])) # Shorthand for a conditional plural 's'.
 
+    def __str__(self):
+        name = self.level.name
+        if len(self) <= 10:
+            return '<{}Group {}>'.format(name.capitalize(), repr(list(self)))
+        else:
+            return '<{}Group {}, ..., {}>'.format(name.capitalize(),
+                                                  repr(list(self)[:3])[:-1],
+                                                  repr(list(self)[-3:])[1:])
+
     def __add__(self, other):
         """Concatenate the Group with another Group or Component of the same
         level.

From 45ce66bebd1ff24389399d5530b004fd06164d87 Mon Sep 17 00:00:00 2001
From: Juan Eiros <jeirosz@gmail.com>
Date: Thu, 2 Mar 2017 11:01:56 +0000
Subject: [PATCH 2/5] Remove individual __repr__ method of groups

General case is defined already in BaseGroup class
---
 package/MDAnalysis/core/groups.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/MDAnalysis/core/groups.py b/package/MDAnalysis/core/groups.py
index 7d39466e4c0..2031147fcc8 100644
--- a/package/MDAnalysis/core/groups.py
+++ b/package/MDAnalysis/core/groups.py
@@ -1658,8 +1658,6 @@ class ResidueGroup(GroupBase):
     specific to ResidueGroups.
 
     """
-    def __repr__(self):
-        return '<ResidueGroup {}>'.format(repr(list(self.residues)))
 
     @property
     def atoms(self):
@@ -1757,8 +1755,6 @@ class SegmentGroup(GroupBase):
     SegmentGroups.
 
     """
-    def __repr__(self):
-        return '<SegmentGroup {}>'.format(repr(list(self.segments)))
 
     @property
     def atoms(self):

From 7a8c5e6aed15d713e2c52cb31ca46897bd5b3e87 Mon Sep 17 00:00:00 2001
From: Juan Eiros <jeirosz@gmail.com>
Date: Thu, 2 Mar 2017 11:02:32 +0000
Subject: [PATCH 3/5] Added tests for groups

Short and long tests for __str__
Tests for __repr__
---
 testsuite/MDAnalysisTests/core/test_groups.py | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/testsuite/MDAnalysisTests/core/test_groups.py b/testsuite/MDAnalysisTests/core/test_groups.py
index 6c988a6016b..3697b3fff8f 100644
--- a/testsuite/MDAnalysisTests/core/test_groups.py
+++ b/testsuite/MDAnalysisTests/core/test_groups.py
@@ -550,10 +550,34 @@ def test_atomgroup_repr(self):
         ag = self.u.atoms[:10]
         assert_(repr(ag) == '<AtomGroup with 10 atoms>')
 
+    def test_atomgroup_str_short(self):
+        ag = self.u.atoms[:2]
+        assert_(str(ag) == '<AtomGroup [<Atom 1: N of type 56 of resname MET, resid 1 and segid 4AKE>, <Atom 2: HT1 of type 2 of resname MET, resid 1 and segid 4AKE>]>')
+
+    def test_atomgroup_str_long(self):
+        ag = self.u.atoms[:11]
+        assert_(str(ag).startswith('<AtomGroup [<Atom 1: N of type 56 of resname MET,'))
+        assert_('...' in str(ag))
+        assert_(str(ag).endswith(', resid 1 and segid 4AKE>]>'))
+
     def test_residuegroup_repr(self):
         rg = self.u.residues[:10]
-        assert_(repr(rg).startswith('<ResidueGroup [<Residue MET, 1>, '))
+        assert_(repr(rg) == '<ResidueGroup with 10 residues>')
+
+    def test_residuegroup_str_short(self):
+        rg = self.u.residues[:2]
+        assert_(str(rg) == '<ResidueGroup [<Residue MET, 1>, <Residue ARG, 2>]>')
+
+    def test_residuegroup_str_long(self):
+        rg = self.u.residues[:11]
+        assert_(str(rg).startswith('<ResidueGroup [<Residue MET, 1>,'))
+        assert_('...' in str(rg))
+        assert_(str(rg).endswith(', <Residue ALA, 11>]>'))
 
     def test_segmentgroup_repr(self):
         sg = self.u.segments[:10]
-        assert_(repr(sg) == '<SegmentGroup [<Segment 4AKE>]>')
+        assert_(repr(sg) == '<SegmentGroup with 1 segment>')
+
+    def test_segmentgroup_str(self):
+        sg = self.u.segments[:10]
+        assert_(str(sg) == '<SegmentGroup [<Segment 4AKE>]>')

From 566b28ab52470c0b88e32ad6c422e2bfe6b3d2c9 Mon Sep 17 00:00:00 2001
From: Juan Eiros <jeirosz@gmail.com>
Date: Thu, 2 Mar 2017 11:02:47 +0000
Subject: [PATCH 4/5] Add myself on AUTHORS

---
 package/AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/AUTHORS b/package/AUTHORS
index abb69d77ecd..f099acb744c 100644
--- a/package/AUTHORS
+++ b/package/AUTHORS
@@ -85,6 +85,7 @@ Chronological list of authors
   - Vedant Rathore
   - Xiki Tempula
   - Akshay Gupta
+  - Juan Eiros Zamora
 
 External code
 -------------

From e2f399f00b72ff293eea337fde9be8e5db10f9a5 Mon Sep 17 00:00:00 2001
From: Juan Eiros <jeirosz@gmail.com>
Date: Thu, 2 Mar 2017 11:03:11 +0000
Subject: [PATCH 5/5] Summarize PR #1225 in changelog

---
 package/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/CHANGELOG b/package/CHANGELOG
index d9c9a19d10a..6b4738a1561 100644
--- a/package/CHANGELOG
+++ b/package/CHANGELOG
@@ -20,6 +20,8 @@ The rules for this file:
   * 0.16.0
 
 Enhancements
+  * Improved __str__ and __repr__ of 'GroupBase' class in
+    MDAnalysis.core.groups (addresses Issue #1223)
   * Added dynamic selections (addresses Issues #175 and #1074).
   * Added 'MemoryReader' class to allow manipulation of trajectory data
     in-memory, which can provide substantial speed-ups to certain