Skip to content

Commit 9407a00

Browse files
committed
Merge branch 'master' into testing-code
2 parents af93863 + 9d4d9df commit 9407a00

File tree

204 files changed

+1379
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+1379
-499
lines changed

Python/Module1_GettingStartedWithPython/Getting_Started_With_IDEs_and_Notebooks.md

+10-15

Python/Module1_GettingStartedWithPython/Jupyter_Notebooks.md

+14-2

Python/Module5_OddsAndEnds/Writing_Good_Code.md

+13-4

Python/changes.rst

+27

Python/index.rst

+2-1

Python/intro.rst

+1-1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-1 Bytes
Binary file not shown.
Binary file not shown.
-1 Bytes
Binary file not shown.
-1 Bytes
Binary file not shown.
Binary file not shown.
-1 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/.doctrees/changes.doctree

9.77 KB
Binary file not shown.

docs/.doctrees/environment.pickle

61.3 KB
Binary file not shown.

docs/.doctrees/index.doctree

17 Bytes
Binary file not shown.

docs/.doctrees/intro.doctree

-1 Bytes
Binary file not shown.

docs/.doctrees/module_1.doctree

-1 Bytes
Binary file not shown.

docs/.doctrees/module_2.doctree

-1 Bytes
Binary file not shown.
-1 Bytes
Binary file not shown.

docs/.doctrees/module_3.doctree

-1 Bytes
Binary file not shown.
-1 Bytes
Binary file not shown.

docs/.doctrees/module_4.doctree

-1 Bytes
Binary file not shown.

docs/.doctrees/module_5.doctree

-1 Bytes
Binary file not shown.

docs/Module1_GettingStartedWithPython/Exercises/Informal_Intro_Python.html

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<li class="toctree-l1"><a class="reference internal" href="../../module_3_problems.html">Module 3: Problems</a></li>
9898
<li class="toctree-l1"><a class="reference internal" href="../../module_4.html">Module 4: Object Oriented Programming</a></li>
9999
<li class="toctree-l1"><a class="reference internal" href="../../module_5.html">Module 5: Odds and Ends</a></li>
100+
<li class="toctree-l1"><a class="reference internal" href="../../changes.html">Changelog</a></li>
100101
</ul>
101102

102103

docs/Module1_GettingStartedWithPython/GettingStartedWithPython.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<li class="toctree-l1"><a class="reference internal" href="../module_3_problems.html">Module 3: Problems</a></li>
117117
<li class="toctree-l1"><a class="reference internal" href="../module_4.html">Module 4: Object Oriented Programming</a></li>
118118
<li class="toctree-l1"><a class="reference internal" href="../module_5.html">Module 5: Odds and Ends</a></li>
119+
<li class="toctree-l1"><a class="reference internal" href="../changes.html">Changelog</a></li>
119120
</ul>
120121

121122

@@ -294,7 +295,7 @@ <h2>Why Python?<a class="headerlink" href="#Why-Python?" title="Permalink to thi
294295

295296
<span class="kt">int</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
296297
<span class="n">std</span><span class="o">::</span><span class="n">vector</span><span class="o">&lt;</span><span class="kt">int</span><span class="o">&gt;</span> <span class="n">a</span> <span class="o">=</span> <span class="p">{</span><span class="mi">0</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">3</span><span class="p">,</span> <span class="mi">4</span><span class="p">,</span> <span class="mi">5</span><span class="p">,</span> <span class="mi">6</span><span class="p">,</span> <span class="mi">7</span><span class="p">,</span> <span class="mi">8</span><span class="p">,</span> <span class="mi">9</span><span class="p">};</span>
297-
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">accumulate</span><span class="p">(</span><span class="n">a</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">e</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span> <span class="mi">0</span><span class="p">)</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
298+
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">accumulate</span><span class="p">(</span><span class="n">a</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">a</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span> <span class="mi">0</span><span class="p">)</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
298299
<span class="p">}</span>
299300
</pre></div>
300301
</div>

0 commit comments

Comments
 (0)