add preset

mordred-descriptor · Jun 13, 2016 · 43746a0 · 43746a0
1 parent 07e98af
commit 43746a0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/mordred/MoRSE.py b/mordred/MoRSE.py
@@ -18,9 +18,17 @@ class MoRSE(Descriptor):
     @classmethod
     def preset(cls):
         return chain(
-            cls(None, i) for i in range(1, 33),
+            (cls(None, i) for i in range(1, 33)),
+            (cls('m', i) for i in range(1, 33)),
+            (cls('v', i) for i in range(1, 33)),
+            (cls('se', i) for i in range(1, 33)),
+            (cls('p', i) for i in range(1, 33)),
         )
 
+    def __str__(self):
+        p = '' if self._prop is None else self._prop.as_argument
+        return 'MOR{:02d}{}'.format(self._distance, p)
+
     def as_key(self):
         p = None if self._prop is None else self._prop.as_argument
         return self.__class__, (p, self._distance)