move to integration of logic

Author: itholic

databricks/koalas/base.py

@@ -363,6 +363,39 @@ def is_monotonic_decreasing(self):
         window = Window.orderBy(monotonically_increasing_id()).rowsBetween(-1, -1)
         return self._with_new_scol((col <= F.lag(col, 1).over(window)) & col.isNotNull()).all()
 
+    @property
+    def ndim(self):
+        """
+        Return an int representing the number of array dimensions.
+
+        Return 1 for Series / Index / MultiIndex.
+
+        Examples
+        --------
+
+        For Series
+
+        >>> s = ks.Series([None, 1, 2, 3, 4], index=[4, 5, 2, 1, 8])
+        >>> s.ndim
+        1
+
+        For Index
+
+        >>> s.index.ndim
+        1
+
+        For MultiIndex
+
+        >>> midx = pd.MultiIndex([['lama', 'cow', 'falcon'],
+        ...                       ['speed', 'weight', 'length']],
+        ...                      [[0, 0, 0, 1, 1, 1, 2, 2, 2],
+        ...                       [1, 1, 1, 1, 1, 2, 1, 2, 2]])
+        >>> s = ks.Series([45, 200, 1.2, 30, 250, 1.5, 320, 1, 0.3], index=midx)
+        >>> s.index.ndim
+        1
+        """
+        return 1
+
     def astype(self, dtype):
         """
         Cast a Koalas object to a specified dtype ``dtype``.

databricks/koalas/frame.py

@@ -382,7 +382,7 @@ def ndim(self):
         """
         Return an int representing the number of array dimensions.
 
-        Return 1 if Series. Otherwise return 2 if DataFrame.
+        return 2 for DataFrame.
 
         Examples
         --------

databricks/koalas/indexes.py

@@ -151,27 +151,6 @@ def names(self, names: List[Union[str, Tuple[str, ...]]]) -> None:
         names = [name if isinstance(name, tuple) else (name,) for name in names]
         self._kdf._internal = internal.copy(index_map=list(zip(internal.index_columns, names)))
 
-    @property
-    def ndim(self):
-        """
-        Number of dimensions of the underlying data, by definition 1.
-
-        Examples
-        --------
-        >>> s = ks.Series([None, 1, 2, 3, 4], index=[4, 5, 2, 1, 8])
-        >>> s.index.ndim
-        1
-
-        >>> midx = pd.MultiIndex([['lama', 'cow', 'falcon'],
-        ...                       ['speed', 'weight', 'length']],
-        ...                      [[0, 0, 0, 1, 1, 1, 2, 2, 2],
-        ...                       [1, 1, 1, 1, 1, 2, 1, 2, 2]])
-        >>> s = ks.Series([45, 200, 1.2, 30, 250, 1.5, 320, 1, 0.3], index=midx)
-        >>> s.index.ndim
-        1
-        """
-        return 1
-
     def rename(self, name: Union[str, Tuple[str, ...]], inplace: bool = False):
         """
         Alter Index name.

databricks/koalas/series.py

@@ -821,11 +821,6 @@ def shape(self):
         """Return a tuple of the shape of the underlying data."""
         return len(self),
 
-    @property
-    def ndim(self):
-        """Returns number of dimensions of the Series."""
-        return 1
-
     @property
     def name(self) -> Union[str, Tuple[str, ...]]:
         """Return name of the Series."""