Skip to content

Commit

Permalink
Merge pull request #2566 from mckzm/coding-introduction/further-reading
Browse files Browse the repository at this point in the history
Fix link to "Entropy (information theory)" Wikipedia entry
  • Loading branch information
jimbonothing64 authored Apr 19, 2024
2 parents ebd212b + ba48cc3 commit 226c958
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Here are two prominent examples:
- This is used for investigating social structures using networks.
You can imagine how this works by thinking about the structure of Facebook.
You and everyone else on Facebook are each an individual node, and two people are connected by an edge if they are Facebook friends.
Together, these nodes and edges make a graph structure (a different type of [graph](https://en.wikipedia.org/wiki/Graph_(discrete_mathematics)) to the ones you normally see in maths) that can be analysed.
Together, these nodes and edges make a graph structure (a different type of [graph](https://en.wikipedia.org/wiki/Graph_%28discrete_mathematics%29) to the ones you normally see in maths) that can be analysed.

{image file-path="img/chapters/social-network-graph.png" caption="true" alt="Five circles with different names in them are shown with lines connecting each of them to illustrate that they are connected on social media. Each of these circles is then connected to several smaller circles, which represent other friends in their network."}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ The original 7x7 cards that the computer laid out for you could be some kind of
Although they are laid out in a grid, on a computer the rows of bits would be stored or transmitted one after the other (as 8 lots of 8 bits).

The extra cards you added are called *parity bits*.
[Parity](https://en.wikipedia.org/wiki/Parity_(mathematics))
[Parity](https://en.wikipedia.org/wiki/Parity_%28mathematics%29)
simply means whether a number is even or odd (the word comes from the same root as "pair").
By adding the extra cards in a way that ensured an even number of black cards in each row and column, you made it so that the rows and columns had what is called *even parity*.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ James Gleick's book [The Information: A History, a Theory, a Flood](http://www.a
## Useful links

- A good collection of resources related to all three kinds of coding is available in the [Bletchley Park Codes Resources](http://www.cimt.org.uk/resources/codes/)
- [Entropy and information theory](https://en.wikipedia.org/wiki/Entropy_(information_theory))
- [Entropy and information theory](https://en.wikipedia.org/wiki/Entropy_%28information_theory%29)
- [History of information theory and its relationship to entropy in thermodynamics](https://en.wikipedia.org/wiki/History_of_entropy#Information_theory)
- [Timeline of information theory](https://en.wikipedia.org/wiki/Timeline_of_information_theory)
- [Shannon's seminal work in information theory](https://en.wikipedia.org/wiki/A_Mathematical_Theory_of_Communication)
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ Extra sections will eventually be added here to introduce some of them, but in t
- [Longest path](https://en.wikipedia.org/wiki/Longest_path) (this is interesting because finding the longest path is intractable, yet finding the shortest path is tractable - the shortest path is calculated when a GPS device works out the shortest route to a destination.
Also, a Hamiltonian problem can be reduced easily to longest path, showing the concept of reduction when one NP-complete problem is used to solve another).
[Here's a song about it!](https://www.youtube.com/watch?feature=player_embedded&v=a3ww0gwEszo)
- [The Battleship problem](https://en.wikipedia.org/wiki/Battleship_(puzzle))
- [The Battleship problem](https://en.wikipedia.org/wiki/Battleship_%28puzzle%29)
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
- [Computer graphics on Wikipedia](https://en.wikipedia.org/wiki/Computer_graphics)
- [Transformation matrix on Wikipedia](https://en.wikipedia.org/wiki/Transformation_matrix)
- [Bresenham's line algorithm on Wikipedia](https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm)
- [Ray tracing on Wikipedia](https://en.wikipedia.org/wiki/Ray_tracing_(graphics))
- [Ray tracing on Wikipedia](https://en.wikipedia.org/wiki/Ray_tracing_%28graphics%29)
- [3D tutorials from POV-Ray](http://www.povray.org/resources/links/3D_Tutorials/POV-Ray_Tutorials/)
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- [Wikipedia – Software crisis](https://en.wikipedia.org/wiki/Software_crisis)
- [IEEE – Why software fails](http://spectrum.ieee.org/computing/software/why-software-fails)
- [Wikipedia – Software design](https://en.wikipedia.org/wiki/Software_design)
- [Wikipedia – Abstraction](https://en.wikipedia.org/wiki/Abstraction_(computer_science))
- [Wikipedia – Abstraction](https://en.wikipedia.org/wiki/Abstraction_%28computer_science%29)
- [Wikipedia – Software testing](https://en.wikipedia.org/wiki/Software_testing)
- [Wikipedia – Software development process](https://en.wikipedia.org/wiki/Software_development_process)
- [Wikipedia – Waterfall model](https://en.wikipedia.org/wiki/Waterfall_model)
Expand Down
1 change: 1 addition & 0 deletions csfieldguide/templates/appendices/contributors.html
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ <h2 id="community-contributors"><a href="#community-contributors">{% trans 'Comm
<li><a href="https://github.com/wolginm">wolginm</a> (Mark Wolgin)</li>
<li><a href="https://github.com/michaelmcleodnz">michaelmcleodnz</a> (Michael McLeod)</li>
<li><a href="https://github.com/CyberFlameGO">CyberFlameGO</a> (Aaron Lowe)</li>
<li><a href="https://https://github.com/mckzm">mckzm</a></li>
</ul>

<p>{% trans '<strong>Note:</strong> If there is an error in the list, please contact <a href="mailto:[email protected]">Jack Morgan</a>' %}</p>
Expand Down

0 comments on commit 226c958

Please sign in to comment.