Merge pull request #82 from brymz/Functions-python

Python Assignment 3: exercises and text solutions
datacarpentry · Jun 13, 2015 · f393708 · f393708
2 parents 3636eb9 + 7e49f63
commit f393708
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 2 deletions.
diff --git a/exercises/Functions-2.md → exercises/Functions-2-Python.md b/exercises/Functions-2.md → exercises/Functions-2-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Functions 2
+language: Python
 ---
 
 Write a function that converts pounds to grams (there are 453.592 grams in one

diff --git a/exercises/Functions-3.md → exercises/Functions-3-Python.md b/exercises/Functions-3.md → exercises/Functions-3-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Functions 3
+language: Python
 ---
 
 The length of an organism is typically strongly correlated with it's body

diff --git a/exercises/Functions-4.md → exercises/Functions-4-Python.md b/exercises/Functions-4.md → exercises/Functions-4-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Functions 4
+language: Python
 ---
 
 This is a follow up to the [Functions 3 problem]({{ site.baseurl }}/exercises/functions-3).

diff --git a/exercises/Functions-5.md → exercises/Functions-5-Python.md b/exercises/Functions-5.md → exercises/Functions-5-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Functions 5
+language: Python
 ---
 
 This is a follow up to the [Functions 4 problem]({{ site.baseurl }}/exercises/functions-4).

diff --git a/exercises/Functions-6.md → exercises/Functions-6-Python.md b/exercises/Functions-6.md → exercises/Functions-6-Python.md
@@ -1,9 +1,10 @@
 ---
 layout: exercise
 title: Functions 6
+language: Python
 ---
 
-This is a follow up to [Strings 6]({{ site.baseurl }}/exercises/Strings-6/).
+This is a follow up to [Strings 6]({{ site.baseurl }}/exercises/Strings-6-Python/).
 
 A colleague has produced a file with one DNA sequence on each line. Download
 [the file]({{ site.baseurl }}/data/dna_sequences_1.txt) and load it into Python using

diff --git a/exercises/Lists-1.md → exercises/Lists-1-Python.md b/exercises/Lists-1.md → exercises/Lists-1-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Lists 1
+language: R
 ---
 
 The number of birds banded at a series of sampling sites has been counted by

diff --git a/exercises/Loops-1.md → exercises/Loops-1-Python.md b/exercises/Loops-1.md → exercises/Loops-1-Python.md
@@ -1,9 +1,10 @@
 ---
 layout: exercise
 title: Loops 1
+language: Python
 ---
 
-This is a follow up to [Functions 6]({{ site.baseurl }}/exercises/Functions-6/).
+This is a follow up to [Functions 6]({{ site.baseurl }}/exercises/Functions-6-Python/).
 
 A colleague has produced a file with one DNA sequence on each line. So far
 you've been manually extracting each DNA sequence and calculating it's GC

diff --git a/exercises/Loops-3.md → exercises/Loops-3-Python.md b/exercises/Loops-3.md → exercises/Loops-3-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Loops 3
+language: Python
 ---
 
 One of your collaborators has posted

diff --git a/exercises/Loops-4.md → exercises/Loops-4-Python.md b/exercises/Loops-4.md → exercises/Loops-4-Python.md
@@ -1,6 +1,7 @@
 ---
 layout: exercise
 title: Loops 4
+language: Python
 ---
 
 This is a follow up to [Loops 3]({{ site.baseurl }}/exercises/Loops-3)

diff --git a/solutions/Functions-2-Python.txt b/solutions/Functions-2-Python.txt
@@ -0,0 +1 @@
+1701.0
diff --git a/solutions/Functions-3-Python.txt b/solutions/Functions-3-Python.txt
@@ -0,0 +1,2 @@
+17150.5636319
+24955.535105
diff --git a/solutions/Functions-6-Python.txt b/solutions/Functions-6-Python.txt
@@ -0,0 +1,5 @@
+0.411764705882
+0.434343434343
+0.535714285714
+0.33734939759
+0.37
diff --git a/solutions/Lists-1-Python.txt b/solutions/Lists-1-Python.txt
@@ -0,0 +1,7 @@
+61
+83
+11
+4366
+0
+900
+71.5737704918
diff --git a/solutions/Loops-1-Python.txt b/solutions/Loops-1-Python.txt
@@ -0,0 +1,5 @@
+0.411764705882
+0.434343434343
+0.535714285714
+0.33734939759
+0.37
diff --git a/solutions/Loops-3-Python.txt b/solutions/Loops-3-Python.txt
@@ -0,0 +1,10 @@
+The volume of the shrubs is 27.456
+The volume of the shrubs is 35.112
+The volume of the shrubs is 8.91
+The volume of the shrubs is 20.25
+The volume of the shrubs is 38.44
+The volume of the shrubs is 21.0
+The volume of the shrubs is 15.39
+The volume of the shrubs is 1.265
+The volume of the shrubs is 52.5
+The volume of the shrubs is 25.056