projectmesa · jackiekazil · May 12, 2016 · Nov 5, 2015 · Nov 5, 2015 · Nov 5, 2015
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -6,6 +6,7 @@ Release History
 Next release
 ++++++++++++++++++
 
+* Update of tutorial files and docs #176, #172
 * Adds np.int64() functions around some variables to get rid error caused by numpy update #188
 * Made examples Readme.md more readable #189
 

diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/html/_sources/index.txt b/docs/_build/html/_sources/index.txt
@@ -74,7 +74,7 @@ If you would like to add a feature, please reach out via `ticket`_ or the `email
 .. toctree::
    :maxdepth: 1
 
-   Mesa overview <index>
+   Mesa overview <overview>
    intro-tutorial
 
 

diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -76,6 +76,10 @@ <h2 id="A">A</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%" valign="top"><dl>
 
+  <dt><a href="mesa.html#mesa.space.accept_tuple_argument">accept_tuple_argument() (in module mesa.space)</a>
+  </dt>
+
+
   <dt><a href="mesa.html#mesa.time.BaseScheduler.add">add() (mesa.time.BaseScheduler method)</a>
   </dt>
 
@@ -172,6 +176,10 @@ <h2 id="C">C</h2>
   </dt>
 
 
+  <dt><a href="mesa.visualization.html#mesa.visualization.ModularVisualization.SocketHandler.check_origin">check_origin() (mesa.visualization.ModularVisualization.SocketHandler method)</a>
+  </dt>
+
+
   <dt><a href="mesa.html#mesa.datacollection.DataCollector.collect">collect() (mesa.datacollection.DataCollector method)</a>
   </dt>
 
@@ -766,24 +774,44 @@ <h2 id="S">S</h2>
   </dt>
 
 
+  <dt><a href="mesa.html#mesa.time.StagedActivation.shuffle">shuffle (mesa.time.StagedActivation attribute)</a>
+  </dt>
+
+
+  <dt><a href="mesa.html#mesa.time.StagedActivation.shuffle_between_stages">shuffle_between_stages (mesa.time.StagedActivation attribute)</a>
+  </dt>
+
+
   <dt><a href="mesa.html#mesa.time.SimultaneousActivation">SimultaneousActivation (class in mesa.time)</a>
   </dt>
 
 
   <dt><a href="mesa.html#mesa.space.SingleGrid">SingleGrid (class in mesa.space)</a>
   </dt>
 
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
 
   <dt><a href="mesa.visualization.html#mesa.visualization.ModularVisualization.ModularServer.socket_handler">socket_handler (mesa.visualization.ModularVisualization.ModularServer attribute)</a>
   </dt>
 
+  </dl></td>
+  <td style="width: 33%" valign="top"><dl>
 
   <dt><a href="mesa.visualization.html#mesa.visualization.ModularVisualization.SocketHandler">SocketHandler (class in mesa.visualization.ModularVisualization)</a>
   </dt>
 
 
+  <dt><a href="mesa.html#mesa.time.StagedActivation.stage_list">stage_list (mesa.time.StagedActivation attribute)</a>
+  </dt>
+
+
+  <dt><a href="mesa.html#mesa.time.StagedActivation.stage_time">stage_time (mesa.time.StagedActivation attribute)</a>
+  </dt>
+
+
+  <dt><a href="mesa.html#mesa.time.StagedActivation">StagedActivation (class in mesa.time)</a>
+  </dt>
+
+
   <dt><a href="mesa.visualization.html#mesa.visualization.ModularVisualization.ModularServer.static_handler">static_handler (mesa.visualization.ModularVisualization.ModularServer attribute)</a>
   </dt>
 
@@ -809,6 +837,10 @@ <h2 id="S">S</h2>
   </dt>
 
 
+  <dt><a href="mesa.html#mesa.time.StagedActivation.step">(mesa.time.StagedActivation method)</a>
+  </dt>
+
+
   <dt><a href="mesa.visualization.html#mesa.visualization.TextVisualization.TextVisualization.step">(mesa.visualization.TextVisualization.TextVisualization method)</a>
   </dt>
 

diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -25,7 +25,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
     <link rel="top" title="Mesa .1 documentation" href="#" />
-    <link rel="next" title="Mesa: Agent-based modeling in Python 3+" href="" /> 
+    <link rel="next" title="Overview of Modules" href="overview.html" /> 
   </head>
   <body role="document">
     <div class="related" role="navigation" aria-label="related navigation">
@@ -38,7 +38,7 @@ <h3>Navigation</h3>
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
         <li class="right" >
-          <a href="#" title="Mesa: Agent-based modeling in Python 3+"
+          <a href="overview.html" title="Overview of Modules"
              accesskey="N">next</a> |</li>
         <li class="nav-item nav-item-0"><a href="#">Mesa .1 documentation</a> &raquo;</li> 
       </ul>
@@ -91,9 +91,8 @@ <h2>Contributing back to Mesa<a class="headerlink" href="#contributing-back-to-m
 </ul>
 <p><strong>Table of Contents</strong></p>
 <div class="toctree-wrapper compound">
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">Mesa: Agent-based modeling in Python 3+</a></li>
-<li class="toctree-l1"><a class="reference internal" href="#indices-and-tables">Indices and tables</a></li>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Mesa overview</a></li>
 <li class="toctree-l1"><a class="reference internal" href="intro-tutorial.html">Introduction to Mesa - Tutorial</a></li>
 </ul>
 </div>
@@ -125,8 +124,8 @@ <h3><a href="#">Table Of Contents</a></h3>
 </ul>
 
   <h4>Next topic</h4>
-  <p class="topless"><a href=""
-                        title="next chapter">Mesa: Agent-based modeling in Python 3+</a></p>
+  <p class="topless"><a href="overview.html"
+                        title="next chapter">Overview of Modules</a></p>
   <div role="note" aria-label="source link">
     <h3>This Page</h3>
     <ul class="this-page-menu">
@@ -161,7 +160,7 @@ <h3>Navigation</h3>
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
         <li class="right" >
-          <a href="#" title="Mesa: Agent-based modeling in Python 3+"
+          <a href="overview.html" title="Overview of Modules"
              >next</a> |</li>
         <li class="nav-item nav-item-0"><a href="#">Mesa .1 documentation</a> &raquo;</li> 
       </ul>

diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
diff --git a/docs/conf.py b/docs/conf.py
@@ -16,6 +16,20 @@
 import sys
 import os
 
+
+# Adding mock imports to see if this builds
+from unittest.mock import MagicMock
+
+class Mock(MagicMock):
+    @classmethod
+    def __getattr__(cls, name):
+            return Mock()
+
+MOCK_MODULES = ['scipy', 'numpy', 'pandas']
+sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
+
+# End of mock
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

diff --git a/docs/images/tutorial/br_ginis.png b/docs/images/tutorial/br_ginis.png
diff --git a/docs/images/tutorial/dc_endwealth.png b/docs/images/tutorial/dc_endwealth.png
diff --git a/docs/images/tutorial/dc_gini.png b/docs/images/tutorial/dc_gini.png
diff --git a/docs/images/tutorial/dc_oneagent.png b/docs/images/tutorial/dc_oneagent.png
diff --git a/docs/images/tutorial/first_hist.png b/docs/images/tutorial/first_hist.png
diff --git a/docs/images/tutorial/multirun_hist.png b/docs/images/tutorial/multirun_hist.png
diff --git a/docs/images/tutorial/numpy_grid.png b/docs/images/tutorial/numpy_grid.png
diff --git a/docs/images/tutorial/viz_chart.png b/docs/images/tutorial/viz_chart.png
diff --git a/docs/images/tutorial/viz_empty.png b/docs/images/tutorial/viz_empty.png
diff --git a/docs/images/tutorial/viz_greycircles.png b/docs/images/tutorial/viz_greycircles.png
diff --git a/docs/images/tutorial/viz_histogram.png b/docs/images/tutorial/viz_histogram.png
diff --git a/docs/images/tutorial/viz_redcircles.png b/docs/images/tutorial/viz_redcircles.png
diff --git a/docs/index.rst b/docs/index.rst
@@ -74,7 +74,7 @@ If you would like to add a feature, please reach out via `ticket`_ or the `email
 .. toctree::
    :maxdepth: 1
 
-   Mesa overview <index>
+   Mesa overview <overview>
    intro-tutorial