Skip to content

Commit 9d4cb64

Browse files
cindygrcindygr
committed
Re-running intro
1 parent 00a65d0 commit 9d4cb64

12 files changed

Lines changed: 35 additions & 28 deletions

File tree

‎Week_0_python/a_tutorial_strings_format.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505
"name": "python",
506506
"nbconvert_exporter": "python",
507507
"pygments_lexer": "ipython3",
508-
"version": "3.11.4"
508+
"version": "3.9.6"
509509
}
510510
},
511511
"nbformat": 4,

‎Week_10_classes/matrix_routines.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# TAF4
2+
# TCS3
33

44
import numpy as np
55
from matplotlib import pyplot as plt

‎Week_10_classes/pinball.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
# TAF4
32

43
import numpy as np
54
import matplotlib.pyplot as plt

‎Week_10_classes/pinball_wall.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
# TAF4
32

43
import numpy as np
54
import matplotlib.pyplot as plt

‎Week_1_data_structures/HW_1_numpy_and_plotting.ipynb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"pick_data_dict = {}\n",
118118
"\n",
119119
"# TODO Read the data\n",
120-
"# TODO Calculate the valeus above \n",
120+
"# TODO Calculate the values above \n",
121121
"..."
122122
]
123123
},
@@ -830,7 +830,6 @@
830830
"# You'll want to use enumerate to the the indices (ir and ic) to use for axs\n",
831831
"# plot_channel_row(axs[ir, ic], ts, ...)\n",
832832
"# Don't forget to change the title to include the row number and successful y/n\n",
833-
"\"\"\" # END PROPMT\n",
834833
"plt.tight_layout()\n"
835834
]
836835
},

‎Week_1_data_structures/a_tutorial_numpy.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@
683683
"name": "python",
684684
"nbconvert_exporter": "python",
685685
"pygments_lexer": "ipython3",
686-
"version": "3.11.4"
686+
"version": "3.9.6"
687687
}
688688
},
689689
"nbformat": 4,

‎Week_3_plotting/a_tutorial_matplotlib.ipynb‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,43 @@
1818
},
1919
{
2020
"cell_type": "code",
21-
"execution_count": 1,
21+
"execution_count": 6,
2222
"metadata": {},
2323
"outputs": [
2424
{
2525
"name": "stdout",
2626
"output_type": "stream",
2727
"text": [
28-
"Requirement already satisfied: matplotlib in /Users/grimmc/anaconda3/lib/python3.11/site-packages (3.7.1)\n",
29-
"Requirement already satisfied: contourpy>=1.0.1 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (1.0.5)\n",
30-
"Requirement already satisfied: cycler>=0.10 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (0.11.0)\n",
31-
"Requirement already satisfied: fonttools>=4.22.0 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (4.25.0)\n",
32-
"Requirement already satisfied: kiwisolver>=1.0.1 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (1.4.4)\n",
33-
"Requirement already satisfied: numpy>=1.20 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (1.24.3)\n",
34-
"Requirement already satisfied: packaging>=20.0 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (23.0)\n",
35-
"Requirement already satisfied: pillow>=6.2.0 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (9.4.0)\n",
36-
"Requirement already satisfied: pyparsing>=2.3.1 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (3.0.9)\n",
37-
"Requirement already satisfied: python-dateutil>=2.7 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from matplotlib) (2.8.2)\n",
38-
"Requirement already satisfied: six>=1.5 in /Users/grimmc/anaconda3/lib/python3.11/site-packages (from python-dateutil>=2.7->matplotlib) (1.16.0)\n"
28+
"Defaulting to user installation because normal site-packages is not writeable\n",
29+
"Requirement already satisfied: matplotlib in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (3.9.1)\n",
30+
"Requirement already satisfied: contourpy>=1.0.1 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (1.2.1)\n",
31+
"Requirement already satisfied: cycler>=0.10 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (0.12.1)\n",
32+
"Requirement already satisfied: fonttools>=4.22.0 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (4.53.1)\n",
33+
"Requirement already satisfied: kiwisolver>=1.3.1 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (1.4.5)\n",
34+
"Requirement already satisfied: numpy>=1.23 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (2.0.1)\n",
35+
"Requirement already satisfied: packaging>=20.0 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (24.1)\n",
36+
"Requirement already satisfied: pillow>=8 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (10.4.0)\n",
37+
"Requirement already satisfied: pyparsing>=2.3.1 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (3.1.2)\n",
38+
"Requirement already satisfied: python-dateutil>=2.7 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (2.9.0.post0)\n",
39+
"Requirement already satisfied: importlib-resources>=3.2.0 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from matplotlib) (6.4.0)\n",
40+
"Requirement already satisfied: zipp>=3.1.0 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from importlib-resources>=3.2.0->matplotlib) (3.19.2)\n",
41+
"Requirement already satisfied: six>=1.5 in /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/3.9/lib/python3.9/site-packages (from python-dateutil>=2.7->matplotlib) (1.15.0)\n",
42+
"Defaulting to user installation because normal site-packages is not writeable\n",
43+
"Collecting scipy\n",
44+
" Downloading scipy-1.13.1-cp39-cp39-macosx_12_0_arm64.whl.metadata (60 kB)\n",
45+
"Requirement already satisfied: numpy<2.3,>=1.22.4 in /Users/cindygrimm/Library/Python/3.9/lib/python/site-packages (from scipy) (2.0.1)\n",
46+
"Downloading scipy-1.13.1-cp39-cp39-macosx_12_0_arm64.whl (30.3 MB)\n",
47+
"\u001b[2K \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m30.3/30.3 MB\u001b[0m \u001b[31m2.4 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m00:01\u001b[0m00:01\u001b[0m\n",
48+
"\u001b[?25hInstalling collected packages: scipy\n",
49+
"Successfully installed scipy-1.13.1\n"
3950
]
4051
}
4152
],
4253
"source": [
4354
"# Install a pip package in the current Jupyter kernel\n",
4455
"# Note: this is a safety check in case your JN install was not in the same place as your libraries\n",
4556
"import sys\n",
46-
"!{sys.executable} -m pip install matplotlib"
57+
"!{sys.executable} -m pip install matplotlib\n"
4758
]
4859
},
4960
{
@@ -377,7 +388,7 @@
377388
"name": "python",
378389
"nbconvert_exporter": "python",
379390
"pygments_lexer": "ipython3",
380-
"version": "3.11.4"
391+
"version": "3.9.6"
381392
}
382393
},
383394
"nbformat": 4,

‎Week_4_fitting/HW_2_system_analysis.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
"source": [
445445
" \n",
446446
"# TODO: \n",
447-
"# Write a function, plot_syste, that reads in the data, analyzes it, then plots it\n",
447+
"# Write a function, plot_system, that reads in the data, analyzes it, then plots it\n",
448448
"def plot_system(axs, fname, m=1.0):\n",
449449
" pass\n"
450450
]

‎Week_6_matrices/arm_routines.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,13 @@ def matrix_shape_finger(finger_obj, palm_width, finger_size, b_is_top):
146146
def create_gripper(palm_width, finger_size):
147147
""" Make a gripper from a palm and two fingers
148148
Palm is centered on the x and y axis, base of finger will be at 0, 1/2 palm width
149-
@param palm_and_fingers_list - the palm and two fingers, as a list with three dictionaries
150149
@param palm_width - the desired separation of the two fingers
151150
@param finger_size - how long and wide to make the finger
152151
@return the modified object"""
153152

154153
# Make an object as a dictionary
155154
palm_obj = create_arm_component(name="Palm", pts=points_in_a_square(), color="tomato")
156-
# Sets the Matrix_scale key
155+
# Sets the matrix_shape key
157156
matrix_shape_palm(palm_obj, palm_width)
158157
# Keep this for later as a key
159158
palm_obj["Palm width"] = palm_width
@@ -167,7 +166,7 @@ def create_gripper(palm_width, finger_size):
167166
for b, tag, col in zip([True, False], ["Top", "Bottom"], ["darkgoldenrod", "darkgreen"]): # top and bottom fingers
168167
# Create the finger from a wedge
169168
finger_obj = create_arm_component(name="Finger_" + tag, pts=points_in_a_wedge(), color=col)
170-
# Sets the Matrix_scale key
169+
# Sets the matrix_shape key
171170
matrix_shape_finger(finger_obj, palm_width, finger_size, b)
172171

173172
# Keep this for later as a key

‎Week_6_matrices/matrix_routines.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# TAF4
2+
# TCS3
33

44
import numpy as np
55
from matplotlib import pyplot as plt

0 commit comments

Comments
 (0)