address comments

marmbrus · Apr 16, 2015 · d3b519b · d3b519b
1 parent ebaccc6
commit d3b519b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/ml/Identifiable.scala b/mllib/src/main/scala/org/apache/spark/ml/Identifiable.scala
@@ -25,7 +25,7 @@ import java.util.UUID
 private[ml] trait Identifiable extends Serializable {
 
   /**
-   * A unique id for the object. The default implementation concatenates the class name, "-", and 8
+   * A unique id for the object. The default implementation concatenates the class name, "_", and 8
    * random hex chars.
    */
   private[ml] val uid: String =

diff --git a/python/pyspark/ml/param/__init__.py b/python/pyspark/ml/param/__init__.py
@@ -59,8 +59,8 @@ class Params(Identifiable):
     @property
     def params(self):
         """
-        Returns all params. The default implementation uses
-        :py:func:`dir` to get all attributes of type
+        Returns all params ordered by name. The default implementation
+        uses :py:func:`dir` to get all attributes of type
         :py:class:`Param`.
         """
         return filter(lambda attr: isinstance(attr, Param),
@@ -139,8 +139,8 @@ def extractParamMap(self, extraParamMap={}):
         """
         Extracts the embedded default param values and user-supplied
         values, and then merges them with extra values from input into
-        a flat param map, where the latter values is used if there
-        exist conflicts, i.e., with ordering: default param values <
+        a flat param map, where the latter value is used if there exist
+        conflicts, i.e., with ordering: default param values <
         user-supplied values < extraParamMap.
         :param extraParamMap: extra param values
         :return: merged param map
@@ -161,7 +161,7 @@ def _resolveParam(self, param):
         """
         Resolves a param and validates the ownership.
         :param param: param name or the param instance, which must
-                      belongs to this Params instance
+                      belong to this Params instance
         :return: resolved param instance
         """
         if isinstance(param, Param):

diff --git a/python/pyspark/ml/util.py b/python/pyspark/ml/util.py
@@ -40,7 +40,7 @@ class Identifiable(object):
 
     def __init__(self):
         #: A unique id for the object. The default implementation
-        #: concatenates the class name, "-", and 8 random hex chars.
+        #: concatenates the class name, "_", and 8 random hex chars.
         self.uid = type(self).__name__ + "_" + uuid.uuid4().hex[:8]
 
     def __repr__(self):