Skip to content

Commit 9f201bc

Browse files
Solve warnings when building html
1 parent 06bcecf commit 9f201bc

35 files changed

+250
-548
lines changed

build_rst.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
notebooks = glob.glob('source/analyses/*/*.ipynb')
1010
notebooks += glob.glob('source/data/*/*.ipynb')
11-
1211
# Remove 'workbook' files
1312
notebooks = [Path(nbf) for nbf in notebooks if '_Workbook' not in nbf]
14-
errors = []
13+
figures = glob.glob('source/analyses/*/*.png')
14+
figures += glob.glob('source/data/*/*.png')
15+
figures = [Path(file) for file in figures]
1516

1617
for infile in notebooks:
1718
# convert notebook in its local directory
@@ -42,3 +43,8 @@
4243
shutil.rmtree(destdir)
4344
# !mv $movedir $dest
4445
shutil.move(str(movedir), str(dest))
46+
47+
for infile in figures:
48+
# Copy extra figures
49+
dest = _docs / Path(*infile.parts[1:])
50+
shutil.copy(infile, dest)

docs/analyses/data_handling/index_data_handling.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ Data Handling
77
:glob:
88

99
pandas
10-
Writing_to_Database
10+
Writing_to_Database
11+
exogenous_timeseries
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Desing Policy
2+
=============
3+
4+
5+
.. toctree::
6+
:maxdepth: 2
7+
:glob:
8+
9+
*

docs/analyses/fitting/index_fitting.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ Model Fitting
99
Fitting_with_Optimization
1010
Step_at_a_time_optimization
1111
Massively_Parallel_Fitting
12-
MCMC_for_fitting_models
12+
MCMC_for_fitting_models
13+
*

docs/analyses/getting_started/index_getting_started.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ Getting Started
1111
Python
1212
Notebook
1313
Git_and_Github
14-
Hello_World_Teacup
14+
Hello_World_Teacup
15+
PySD_Challenge_1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Model Comparison
2+
================
3+
4+
5+
.. toctree::
6+
:maxdepth: 2
7+
:glob:
8+
9+
*
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Sensitivity
2+
===========
3+
4+
5+
.. toctree::
6+
:maxdepth: 2
7+
:glob:
8+
9+
*
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Testing
2+
=======
3+
4+
5+
.. toctree::
6+
:maxdepth: 2
7+
:glob:
8+
9+
*

docs/analyses/visualization/index_visualization.rst

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ Visualization
55
.. toctree::
66
:maxdepth: 2
77
:glob:
8-
8+
99
matplotlib
1010
other_visualization_libraries
11-
phase_portraits
11+
phase_portraits
12+
marginal_density_plot
13+
marginal_density_plot_interactive
14+
*
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Wrapper EMAWorkbench
2+
====================
3+
4+
5+
.. toctree::
6+
:maxdepth: 2
7+
:glob:
8+
9+
*

docs/data/index_data.rst

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ The notebooks listed here show how each set was collected or generated.
1616
Ebola/*
1717
Emails/*
1818
MA_Towns/*
19+
SD_Fever/*

docs/index.rst

+6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ Contents
4141

4242
analyses/getting_started/index_getting_started
4343
analyses/data_handling/index_data_handling
44+
analyses/design_policy/index_desing_policy.rst
4445
analyses/visualization/index_visualization
4546
analyses/fitting/index_fitting
4647
analyses/geo/index_geo
48+
analyses/model_comparison/index_model_comparison.rst
49+
analyses/sensitivity/index_sensitivity.rst
4750
analyses/surrogating_functions/index_surrogate
51+
analyses/testing/index_testing.rst
4852
analyses/realtime/index_realtime
4953
analyses/workflow/index_workflow
54+
analyses/wrapper_EMAWorkbench/index_wrapper_EMAWorkbench.rst
55+
5056
data/index_data
5157
future
5258
endnotes

source/analyses/data_handling/exogenous_timeseries.ipynb

+2-2
Large diffs are not rendered by default.

source/analyses/data_handling/pandas.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"\n",
5959
"Pandas gives us a comprehensive set of tools for loading data from [a variety of sources](http://pandas.pydata.org/pandas-docs/version/0.18.1/io.html), including CSV, Excel, SQL, JSON, and Stata, amongst others. In this demonstration, we'll read a comma separated value file of global emissions data from the year 1751 until 2011.\n",
6060
"\n",
61-
"The `.read_csv` [method]() gives us options for how we want to format the data as we read it in. In reading in our data file, we want to skip the second row (indexed as `1`!) and use the column `Time` as the index of our resulting `DataFrame`."
61+
"The `.read_csv` [method](https://pandas.pydata.org/docs/reference/api/pandas.read_csv.html) gives us options for how we want to format the data as we read it in. In reading in our data file, we want to skip the second row (indexed as `1`!) and use the column `Time` as the index of our resulting `DataFrame`."
6262
]
6363
},
6464
{
@@ -2798,7 +2798,7 @@
27982798
"name": "python",
27992799
"nbconvert_exporter": "python",
28002800
"pygments_lexer": "ipython3",
2801-
"version": "3.7.12"
2801+
"version": "3.8.10"
28022802
},
28032803
"vscode": {
28042804
"interpreter": {

source/analyses/design_policy/PySD_EMA_Connector_Demo.ipynb

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
{
22
"cells": [
3+
{
4+
"cell_type": "markdown",
5+
"metadata": {},
6+
"source": [
7+
"# PySD EMAWorkbench Connector Demo"
8+
]
9+
},
310
{
411
"cell_type": "code",
512
"execution_count": 9,
6-
"metadata": {
7-
"collapsed": false
8-
},
13+
"metadata": {},
914
"outputs": [
1015
{
1116
"name": "stdout",
@@ -34,9 +39,7 @@
3439
{
3540
"cell_type": "code",
3641
"execution_count": 5,
37-
"metadata": {
38-
"collapsed": false
39-
},
42+
"metadata": {},
4043
"outputs": [],
4144
"source": [
4245
"model = ema.connectors.PySDConnector(mdl_file='../../models/Climate/Atmospheric_Bathtub.mdl',\n",
@@ -51,9 +54,7 @@
5154
{
5255
"cell_type": "code",
5356
"execution_count": 14,
54-
"metadata": {
55-
"collapsed": false
56-
},
57+
"metadata": {},
5758
"outputs": [
5859
{
5960
"data": {
@@ -83,23 +84,23 @@
8384
],
8485
"metadata": {
8586
"kernelspec": {
86-
"display_name": "Python 2",
87+
"display_name": "Python 3 (ipykernel)",
8788
"language": "python",
88-
"name": "python2"
89+
"name": "python3"
8990
},
9091
"language_info": {
9192
"codemirror_mode": {
9293
"name": "ipython",
93-
"version": 2
94+
"version": 3
9495
},
9596
"file_extension": ".py",
9697
"mimetype": "text/x-python",
9798
"name": "python",
9899
"nbconvert_exporter": "python",
99-
"pygments_lexer": "ipython2",
100-
"version": "2.7.12"
100+
"pygments_lexer": "ipython3",
101+
"version": "3.7.12"
101102
}
102103
},
103104
"nbformat": 4,
104-
"nbformat_minor": 0
105+
"nbformat_minor": 1
105106
}

source/analyses/fitting/Fitting_with_Optimization.ipynb

+14-9
Large diffs are not rendered by default.

source/analyses/fitting/Fitting_with_Optimization_Workbook.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"source": [
4040
"The model that we'll try to fit is simple 'Susceptible-Infectious' model. This model assumes that everyone is either susceptible, or infectious. It assumes that there is no recovery, or death; and doesn't account for changes in behavior due to the presence of the disease. But it is super simple, and so we'll accept those limitations for now, until we've seen it's fit to the data.\n",
4141
"\n",
42-
"<img src=\"../../models/Epidemic/SI Model.png\" alt=\"Stock and Flow diagram of Susceptible-Infectious model\" style=\"width: 600px;\"/>"
42+
"<img src=\"../../models/Epidemic/SI_Model.png\" alt=\"Stock and Flow diagram of Susceptible-Infectious model\" style=\"width: 600px;\"/>"
4343
]
4444
},
4545
{
@@ -55,7 +55,7 @@
5555
"metadata": {},
5656
"outputs": [],
5757
"source": [
58-
"model = pysd.read_vensim('../../models/Epidemic/SI Model.mdl')"
58+
"model = pysd.read_vensim('../../models/Epidemic/SI_Model.mdl')"
5959
]
6060
},
6161
{

source/analyses/fitting/MCMC_for_fitting_models.ipynb

+15-10
Large diffs are not rendered by default.

source/analyses/fitting/MCMC_for_fitting_models_Workbook.ipynb

+8-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"metadata": {},
4242
"outputs": [],
4343
"source": [
44-
"model = pysd.read_vensim('../../models/SI Model/SI Model.mdl')"
44+
"model = pysd.read_vensim('../../models/SI_Model/SI_Model.mdl')"
4545
]
4646
},
4747
{
@@ -232,7 +232,7 @@
232232
],
233233
"metadata": {
234234
"kernelspec": {
235-
"display_name": "Python 3 (ipykernel)",
235+
"display_name": "Python 3.8.10 64-bit",
236236
"language": "python",
237237
"name": "python3"
238238
},
@@ -246,7 +246,12 @@
246246
"name": "python",
247247
"nbconvert_exporter": "python",
248248
"pygments_lexer": "ipython3",
249-
"version": "3.7.12"
249+
"version": "3.8.10"
250+
},
251+
"vscode": {
252+
"interpreter": {
253+
"hash": "916dbcbb3f70747c44a77c7bcd40155683ae19c65e1c03b4aa3499c5328201f1"
254+
}
250255
}
251256
},
252257
"nbformat": 4,

0 commit comments

Comments
 (0)