Fewer Oscillators = More Fun

README

@@ -10,12 +10,11 @@ Disclaimers:
   enough to get students started in the right direction, I stopped
   working on it.  I accept no blame for any faults in the labs.
 
-- I provided some input to the syllabus, but the final call was
-  always the lecturer, not me.  These labs include some stuff
-  that I don't think is useful; they even include some stuff that
-  I think is actively harmful to students learning to program.
-  (e.g. pointers, excessive amounts of sine waves)
-  Again, I accept no fault for these.
+"The Lecturer" has now rewritten a lot of the course with
+Python and PyQt, although it's now been replaced by
+a completely new course and back to C++ again, as it's for
+electronics engineers who will be doing embedded stuff.
+This can stay here in case it's of any use to anyone.
 
 
 This material is dual-licensed under:

python/index.html

@@ -25,7 +25,7 @@ <h3>Lab Exercises</h3>
 <ul>
 
 <li>
-<a href="labs/lab1.html">Lab 1</a>:
+<a href="labs/lab1.html">Getting Started with Python</a>:
 
 <ul style="list-style-type:none;">
 <li>
@@ -40,7 +40,7 @@ <h3>Lab Exercises</h3>
 </ul>
 
 </li><li>
-<a href="labs/lab2.html">Lab 2</a>:
+<a href="labs/lab2.html">Basic Flow of Control</a>:
 
 <ul style="list-style-type:none;">
 <li>
@@ -54,137 +54,107 @@ <h3>Lab Exercises</h3>
 
 </li><li>
 
-<a href="labs/lab3.html">Lab 3</a>:
+<a href="labs/lab3+4.html">Objects and How to Use them for Audio</a>:
 
 <ul style="list-style-type:none;">
 <li>
-8. <a href="labs/lab3.html#arrays">Numpy Arrays</a>
+8. <a href="labs/lab3+4.html#arrays">Numpy Arrays</a>
 </li><li>
-9. Reading and writing wav files
-</li>
-10. Classes and buffer-based audio
-</ul>
-
+	9. <a href="labs/lab3+4.html#two-d-arrays">Reading and writing wav files</a>
 </li><li>
-
-<a href="labs/lab4.html">Lab 4</a>:
-
-<ul style="list-style-type:none;">
-<li>
-11. Look-up table (full)
+10. <a href="labs/lab3+4.html#tic-tac-toe">Classes and buffer-based audio</a>
 </li><li>
-12. Look-up table (partial)
+11. <a href="labs/lab3+4.html#ootone">Object-oriented Tone Generation</a>
 </li>
 </ul>
 
 </li><li>
 
-<a href="labs/lab5.xhtml">Lab 5</a>:
+<a href="labs/lab5.xhtml">Recursive Oscillators</a>:
 
 <ul style="list-style-type:none;">
 <li>
-13. Small-angle interpolation
-</li><li>
-14. Recursive oscillator
+12. Recursive oscillator
 </li>
 </ul>
 
 </li><li>
 
-<a href="labs/lab6.html">Lab 6</a>:
+<a href="labs/lab6.html">Parameterising Filters</a>:
 
 <ul style="list-style-type:none;">
 <li>
-15. Complex Arithmetic
+<a href="labs/lab6.html#complex">13. Complex Arithmetic</a>
 </li><li>
-16. Frequency response
+<a href="labs/lab6.html#response">14. Frequency response</a>
 </li>
 </ul>
 
 </li><li>
 
-<a href="labs/lab7.xhtml">Lab 7</a>:
+<a href="labs/lab7.xhtml">Filtering Audio</a>:
 
 <ul style="list-style-type:none;">
 <li>
-17. Manipulating buffers
+<a href="labs/lab7.xhtml#buffers">15. Manipulating buffers
 </li><li>
-18. Filtering with pole and zero placement in the z-plane
+<a href="labs/lab7.xhtml#filtering1">16. Filtering with pole and zero placement in the z-plane
 </li><li>
-19. Filtering to a specification
+<a href="labs/lab7.xhtml#filtering2">17. Filtering to a specification
 </li><li>
 </li>
 </ul>
 
-<a href="labs/lab8.html">Lab 8</a>:
+<li>
+<a href="labs/lab-swig.html">Calling C from Python</a>:
 
 <ul style="list-style-type:none;">
 <li>
-20. A Grand Challenge
+	18. A very simple example
 </li>
-</ul>
-
-
-<!--
-</li><li>
-
-<a href="labs/lab3.html">Lab 3</a>:
-
-<ul style="list-style-type:none;">
 <li>
-8. <a href="labs/lab3.html#arrays">Arrays</a>
-</li><li>
-9. <a href="labs/lab3.html#two-d-arrays">Two-dimensional arrays</a>
+	19. <a href="labs/lab-swig.html#numpy+swig">SWIG and numpy nd-arrays</a>
 </li>
 </ul>
+</li>
 
-</li><li>
-<a href="labs/lab4.html">Lab 4</a>:
+<li>
+<a href="labs/lab-qt.html">Creating a User Interface</a>:
 
 <ul style="list-style-type:none;">
 <li>
-10. <a href="labs/lab4.html#tic-tac-toe">Tic-Tac-Toe game</a>
-</li><li>
-11. <a href="labs/lab4.html#string-arrays">Strings are arrays</a>
+	20. Thinking about GUIs
 </li>
-</ul>
-
-</li><li>
-<a href="labs/lab5.html">Lab 5</a>:
-
-<ul style="list-style-type:none;">
 <li>
-12. <a href="labs/lab5.html#struct">Combining variables with
-<code>struct</code></a>
-</li><li>
-13. <a href="labs/lab5.html#bit-manipulation">Bit manipulation</a>
-</ul>
-
-</li><li>
-
-<a href="labs/lab6.html">Lab 6</a>:
-
-<ul style="list-style-type:none;">
+	21. <a href="labs/lab-qt.html#very-simple-qt">A(nother) Very Simple Example</a>
+</li>
 <li>
-14. <a href="labs/lab6.html#pointers">Pointers</a>
+   22. <a href="labs/lab-qt.html#qtmultimedia" >QtMultimedia</a>
+</li>
+<li>
+   23. <a href="labs/lab-qt.html#midi" >MIDI</a>
+</li>
+<li>
+   24. <a href="labs/lab-qt.html#threads" >QThreads</a>
 </li>
 </ul>
+</li>
 
-<br>
+<li>
+	<a href="labs/lab8.html">Lab 8</a>:
 
+<ul style="list-style-type:none;">
+<li>
+25. Research Seminar!
 </li><li>
-<a href="labs/lab-old.html">Misc old labs</a>
-
+26. A Grand Challenge
+</li>
 </ul>
 
 
--->
-
 </li>
 </ul>
 
-</li>
-</ul>
 
 
 <!--
@@ -310,18 +280,6 @@ <h3>General info about the labs</h3>
 </ul>
 
 
-<p>
-Later:
-</p>
-
-<ul>
-<li>
-<a href="info/programming-howto.html">How to Think about Programming</a>
-</li><li>
-<a href="info/grading.html">Unofficial grading scheme</a>
-</li>
-</ul>
-
 <p>
 Reference:
 </p>

python/info/programming-home.html

@@ -31,23 +31,48 @@ <h1>Programming at Home</h1>
 
 
 <div class="left">
-<h3>Python 2.6 or 2.7</h3>
+<h3>Python 3.x</h3>
 
 <div class="warning">
-Use python 2.6 or 2.7; do not use python 3.0 or higher.
+Use python 3.5 or newer; do not use python 2.x.
 </div>
 
+<p>
+The language syntax and semantics changed significantly
+between versions 2 and 3 of python. As of 2016, we have
+switched to python&nbsp;3 for Audio Programming.
+There is still a lot of python&nbsp;2 in the world,
+but its use is discouraged for new projects.
+</p>
+
+<h4>Installation</h4>
+
+<p>
+You can choose between downloading the minimum
+packages you need for your system, or installing
+the Anaconda package which is much bigger but
+contains many more, very powerful tools (see
+"Other Sofware").
+</p>
+
+<p>
+For a minumum install:
+</p>
+
 <h4>Linux</h4>
 
 <p>
 If you're running Ubuntu or Debian, enter:
 </p>
 
+<blockquote>
 <pre>
 sudo apt-get install \
-  python-scipy python-matplotlib \
+  python3-scipy \
+  python3-matplotlib \
   audacity
 </pre>
+</blockquote>
 
 <h4>MacOS X and Windows</h4>
 
@@ -66,6 +91,14 @@ <h4>MacOS X and Windows</h4>
 <div class="left">
 <h3>Other software</h3>
 
+<p>Anaconda IDE</p>
+<blockquote>
+<pre>
+<a href=https://www.continuum.io/anaconda-overview>Anaconda
+Home Page and Download</a>
+</pre>
+</blockquote>
+
 <p>
 Geany text editor.
 </p>