Skip to content

Commit

Permalink
m
Browse files Browse the repository at this point in the history
  • Loading branch information
Aylin Kallmayer authored and Aylin Kallmayer committed Feb 1, 2019
1 parent dd82e30 commit 383e6a8
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 145 deletions.
62 changes: 0 additions & 62 deletions docs/chapter_exp/Story Time: Galton's Pendulum.rst

This file was deleted.

Binary file not shown.
Binary file modified docs/nbuild/doctrees/environment.pickle
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Programming Experiments in Python with Psychopy
###############################################

Story Time: Galton's Pendulum
-----------------------------

Expand Down
4 changes: 2 additions & 2 deletions docs/nbuild/html/chapter_ana/Analysing Experimental Data.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="4.1. Introduction to Programming with R" href="Introduction to Programming with R.html" />
<link rel="prev" title="3.4. Story Time: Galton’s Pendulum" href="../chapter_exp/Programming Experiments in Python with Psychopy.html" />
<link rel="prev" title="3.4. Programming Experiments in Python with Psychopy" href="../chapter_exp/Programming Experiments in Python with Psychopy.html" />


<script src="../_static/js/modernizr.min.js"></script>
Expand Down Expand Up @@ -190,7 +190,7 @@ <h1>4. Analysing Experimental Data<a class="headerlink" href="#analysing-experim
<a href="Introduction to Programming with R.html" class="btn btn-neutral float-right" title="4.1. Introduction to Programming with R" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>


<a href="../chapter_exp/Programming Experiments in Python with Psychopy.html" class="btn btn-neutral" title="3.4. Story Time: Galton’s Pendulum" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
<a href="../chapter_exp/Programming Experiments in Python with Psychopy.html" class="btn btn-neutral" title="3.4. Programming Experiments in Python with Psychopy" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>

</div>

Expand Down
19 changes: 6 additions & 13 deletions docs/nbuild/html/chapter_exp/Conducting Experiments.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@
<li class="toctree-l2"><a class="reference internal" href="Variables in Psychology.html">3.1. Variables in Psychology</a></li>
<li class="toctree-l2"><a class="reference internal" href="Contrafactual Causality.html">3.2. Contrafactual Causality</a></li>
<li class="toctree-l2"><a class="reference internal" href="Experimental Designs.html">3.3. Experimental Designs</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Story Time: Galton’s Pendulum</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#programming-experiments-in-python-with-psychopy">3.5. Programming Experiments in Python with Psychopy</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#alternative-software">3.6. Alternative software</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#references">3.7. References</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Programming Experiments in Python with Psychopy</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../chapter_ana/Analysing Experimental Data.html">4. Analysing Experimental Data</a></li>
Expand Down Expand Up @@ -174,17 +171,13 @@ <h1>3. Conducting Experiments<a class="headerlink" href="#conducting-experiments
<li class="toctree-l2"><a class="reference internal" href="Experimental Designs.html#e-g-2-2-design-gambling-task">3.3.1. e.g. 2*2 Design gambling task</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Story Time: Galton’s Pendulum</a></li>
<li class="toctree-l1"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#programming-experiments-in-python-with-psychopy">3.5. Programming Experiments in Python with Psychopy</a><ul>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#the-basic-logic-of-experiments-in-psychopy">3.5.1. The basic logic of experiments in Psychopy</a></li>
<li class="toctree-l1"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Programming Experiments in Python with Psychopy</a><ul>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#story-time-galton-s-pendulum">3.4.1. Story Time: Galton’s Pendulum</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#id2">3.4.2. Programming Experiments in Python with Psychopy</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#alternative-software">3.4.3. Alternative software</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#references">3.4.4. References</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#alternative-software">3.6. Alternative software</a><ul>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#opensesame">3.6.1. OpenSesame</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#going-online-surveys-on-the-internet">3.6.2. Going online: surveys on the internet</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#references">3.7. References</a></li>
</ul>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions docs/nbuild/html/chapter_exp/Contrafactual Causality.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@
<li class="toctree-l2"><a class="reference internal" href="Variables in Psychology.html">3.1. Variables in Psychology</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="#">3.2. Contrafactual Causality</a></li>
<li class="toctree-l2"><a class="reference internal" href="Experimental Designs.html">3.3. Experimental Designs</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Story Time: Galton’s Pendulum</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#programming-experiments-in-python-with-psychopy">3.5. Programming Experiments in Python with Psychopy</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#alternative-software">3.6. Alternative software</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#references">3.7. References</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Programming Experiments in Python with Psychopy</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../chapter_ana/Analysing Experimental Data.html">4. Analysing Experimental Data</a></li>
Expand Down
9 changes: 3 additions & 6 deletions docs/nbuild/html/chapter_exp/Experimental Designs.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="3.4. Story Time: Galton’s Pendulum" href="Programming Experiments in Python with Psychopy.html" />
<link rel="next" title="3.4. Programming Experiments in Python with Psychopy" href="Programming Experiments in Python with Psychopy.html" />
<link rel="prev" title="3.2. Contrafactual Causality" href="Contrafactual Causality.html" />


Expand Down Expand Up @@ -88,10 +88,7 @@
<li class="toctree-l3"><a class="reference internal" href="#e-g-2-2-design-gambling-task">3.3.1. e.g. 2*2 Design gambling task</a></li>
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Story Time: Galton’s Pendulum</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#programming-experiments-in-python-with-psychopy">3.5. Programming Experiments in Python with Psychopy</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#alternative-software">3.6. Alternative software</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html#references">3.7. References</a></li>
<li class="toctree-l2"><a class="reference internal" href="Programming Experiments in Python with Psychopy.html">3.4. Programming Experiments in Python with Psychopy</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../chapter_ana/Analysing Experimental Data.html">4. Analysing Experimental Data</a></li>
Expand Down Expand Up @@ -182,7 +179,7 @@ <h2>3.3.1. e.g. 2*2 Design gambling task<a class="headerlink" href="#e-g-2-2-des

<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">

<a href="Programming Experiments in Python with Psychopy.html" class="btn btn-neutral float-right" title="3.4. Story Time: Galton’s Pendulum" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="Programming Experiments in Python with Psychopy.html" class="btn btn-neutral float-right" title="3.4. Programming Experiments in Python with Psychopy" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>


<a href="Contrafactual Causality.html" class="btn btn-neutral" title="3.2. Contrafactual Causality" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
Expand Down

0 comments on commit 383e6a8

Please sign in to comment.