more info

quatrope · Nov 13, 2017 · e057e38 · e057e38
1 parent 26c8f4a
commit e057e38
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 64 deletions.
diff --git a/doc/source/_static/css/skcriteria.css b/doc/source/_static/css/skcriteria.css
@@ -40,20 +40,21 @@ div.input_area {
 }
 
 
-table {
+div.output_area table {
     border-collapse: collapse;
 }
 
-table thead tr th{
+div.output_area table thead tr th{
     background-color: #7b8e2d;
 }
 
-table thead tr th,
-table tbody tr td {
+
+div.output_area table thead tr th,
+div.output_area  table tbody tr td {
     border: 1px solid black;
     font-size: 12px;
 }
 
-tr:nth-child(even) {
-  background-color: #7b8e2d5c;
+div.output_area tr:nth-child(even){
+  background-color: #7b8e2d5c !important;
 }
diff --git a/doc/source/api/core.rst → doc/source/api/base.rst b/doc/source/api/core.rst → doc/source/api/base.rst
@@ -1,7 +1,7 @@
-``skcriteria.core`` module
+``skcriteria.base`` module
 ==========================
 
-.. automodule:: skcriteria.core
+.. automodule:: skcriteria.base
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/skcriteria.plot.rst b/doc/source/api/skcriteria.plot.rst
@@ -6,5 +6,4 @@ Submodules
 
 .. automodule:: skcriteria.plot
     :members:
-    :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/skcriteria.rst b/doc/source/api/skcriteria.rst
@@ -6,39 +6,7 @@ Reference
 
 .. toctree::
 
-    core
+    base
+    validate
     madm/madm
     skcriteria.plot
-.. ~     skcriteria.weights
-
-.. ~ skcriteria\.core module
-.. ~ -----------------------
-
-.. ~ .. automodule:: skcriteria.core
-.. ~     :members:
-.. ~     :undoc-members:
-.. ~     :show-inheritance:
-
-.. ~ skcriteria\.divcorr module
-.. ~ --------------------------
-
-.. ~ .. automodule:: skcriteria.divcorr
-.. ~     :members:
-.. ~     :undoc-members:
-.. ~     :show-inheritance:
-
-.. ~ skcriteria\.norm module
-.. ~ -----------------------
-
-.. ~ .. automodule:: skcriteria.norm
-.. ~     :members:
-.. ~     :undoc-members:
-.. ~     :show-inheritance:
-
-.. ~ skcriteria\.rank module
-.. ~ -----------------------
-
-.. ~ .. automodule:: skcriteria.rank
-.. ~     :members:
-.. ~     :undoc-members:
-.. ~     :show-inheritance:
diff --git a/doc/source/api/validate.rst b/doc/source/api/validate.rst
@@ -0,0 +1,7 @@
+``skcriteria.validate`` module
+==============================
+
+.. automodule:: skcriteria.validate
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/tutorial/quickstart.ipynb b/doc/source/tutorial/quickstart.ipynb
diff --git a/skcriteria/base.py b/skcriteria/base.py
@@ -206,13 +206,10 @@ def weights(self):
         """Relative importance of the criteria or None if all the same"""
         return None if self._weights is None else self._weights.copy()
 
-    @property
-    def plot(self):
-        """Data plotting accessor and method"""
-        return self._plot
-
+    # ----------------------------------------------------------------------
+    # Add plotting methods to DataFrame
 
-Data.plot = AccessorProperty(DataPlotMethods, DataPlotMethods)
+    plot = AccessorProperty(DataPlotMethods, DataPlotMethods)
 
 
 # =============================================================================

diff --git a/skcriteria/plot/__init__.py b/skcriteria/plot/__init__.py
@@ -32,19 +32,16 @@
 
 
 # =============================================================================
-# FUTURE
+# FUTURE & DOCS
 # =============================================================================
 
 from __future__ import unicode_literals
 
 
-# =============================================================================
-# DOCS
-# =============================================================================
+__doc__ = """Plotting utilities"""
 
-__doc__ = """Plotting utilities
 
-"""
+__all__ = ["DataPlotMethods"]
 
 
 # =============================================================================