Merge branch 'PSLmodels:master' into master

PSLmodels · Sep 5, 2023 · ab36cbc · ab36cbc
2 parents 451ffe2 + 71db369
commit ab36cbc
Show file tree

Hide file tree

Showing 5 changed files with 1,166 additions and 460 deletions.
diff --git a/ccc/calcfunctions.py b/ccc/calcfunctions.py
@@ -25,9 +25,11 @@ def update_depr_methods(df, p, dp):
     # update tax_deprec_rates based on user defined parameters
     # create dataframe with depreciation policy parameters
     deprec_df = pd.DataFrame(dp.asset)
+    print("deprec_df", deprec_df.head())
     # split out value into two columns
-    deprec_df = pd.concat([deprec_df.drop(['value'], axis=1),
-                           deprec_df['value'].apply(pd.Series)], axis=1)
+    deprec_df = deprec_df.join(
+        pd.DataFrame(deprec_df.pop('value').values.tolist()))
+    print("deprec_df 2", deprec_df.head())
     # drop information duplicated in asset dataframe
     deprec_df.drop(columns=['asset_name', 'minor_asset_group',
                             'major_asset_group'], inplace=True)

diff --git a/ccc/calculator.py b/ccc/calculator.py
@@ -1345,7 +1345,7 @@ def bubble_widget(self, calc, output_variable='mettr',
         # p_legend.add_layout(l1)
         p_legend.axis.visible = False
         p_legend.grid.grid_line_color = None
-        p_legend.toolbar.active_drag = None
+        # p_legend.toolbar.active_drag = None
 
         # data_sources['equip_plot'] = p
 
@@ -1390,7 +1390,7 @@ def bubble_widget(self, calc, output_variable='mettr',
         # p2_legend.add_layout(l2)
         p2_legend.axis.visible = False
         p2_legend.grid.grid_line_color = None
-        p2_legend.toolbar.active_drag = None
+        # p2_legend.toolbar.active_drag = None
 
         # add buttons
         controls_callback = CustomJS(

diff --git a/docs/book/_config.yml b/docs/book/_config.yml
@@ -49,8 +49,10 @@ repository:
 sphinx:
   extra_extensions          : ['sphinx.ext.autodoc', 'sphinx.ext.mathjax',
                                'sphinx.ext.viewcode', 'sphinx.ext.napoleon',
-                               'alabaster']   # A list of extra extensions to load by Sphinx.
+                               'alabaster', 'sphinx.ext.autosummary']   # A list of extra extensions to load by Sphinx.
   config                    :   # key-value pairs to directly over-ride the Sphinx configuration
+    autosummary_generate: True
+
 
 ####################################################
 # LaTeX information

diff --git a/docs/book/content/api/data.rst b/docs/book/content/api/data.rst
@@ -1,6 +1,6 @@
-.. _data:
+.. _data:
 
-Data
+Cost of Capital Calculator
 ======================================
 
 **data**
@@ -11,4 +11,23 @@ ccc.data
 .. currentmodule:: ccc.data
 
 .. autoclass:: Assets
-  :members: data_year, array_length, read_var_info, _read_data
+  :members: _read_data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/book/content/examples/PSL_demo.ipynb b/docs/book/content/examples/PSL_demo.ipynb