Skip to content

Commit 59a925f

Browse files
cindygrcindygr
committed
Last compile 3.7 to 3.11 vSCode
1 parent 2eaf9e4 commit 59a925f

34 files changed

Lines changed: 286 additions & 268 deletions

‎Week_0_python/d_tutorial_list.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def bad_programmer(l_orig):
292292
for i, v in enumerate(l_orig):
293293
if v < 0:
294294
l_orig[i] = 0.0
295-
elif v is math.nan:
295+
elif v == 0.0:
296296
l_orig[i] = 0.0
297297
return l_orig
298298

@@ -309,12 +309,12 @@ def good_programmer(l_orig):
309309
for v in l_orig:
310310
if v < 0:
311311
l_orig_fixed.append(0.0)
312-
elif v is math.nan:
313-
l_orig_fixed.append(0.0)
312+
elif v == 0.0:
313+
l_orig_fixed.append(1.0)
314314
else:
315315
l_orig_fixed.append(v)
316316
return l_orig_fixed
317-
l_orig = [3.0, 5.0, -1.0, 6.0, 0.0 / 0.0, 5.0]
317+
l_orig = [3.0, 5.0, -1.0, 6.0, 0.0, 5.0]
318318
l_orig_fixed = good_programmer(l_orig)
319319
print("These are the NOT the same list")
320320
print(l_orig)

‎Week_0_python/f_tutorial_dictionary.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"source": [
116116
"# [For illustration purposes only - do not do this] Loop through all the keys and see if one of them is Sum\n",
117117
"for k in my_dict.keys():\n",
118-
" if k is \"Sum\":\n",
118+
" if k == \"Sum\":\n",
119119
" print(f\"Found sum, value {my_dict['Sum']}\")"
120120
]
121121
},

‎Week_0_python/f_tutorial_dictionary.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
# [For illustration purposes only - do not do this] Loop through all the keys and see if one of them is Sum
5555
for k in my_dict.keys():
56-
if k is "Sum":
56+
if k == "Sum":
5757
print(f"Found sum, value {my_dict['Sum']}")
5858

5959
# And we can get out an element and edit it like this (add one to Accessed):

‎Week_10_runtime/lec_act_10_fibonacci_class.ipynb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,17 @@
215215
{
216216
"cases": [
217217
{
218-
"code": ">>> assert(fib_class.call_count == 21)\n",
218+
"code": ">>> assert fib_class.call_count == 21\n",
219219
"hidden": false,
220220
"locked": false
221221
},
222222
{
223-
"code": ">>> assert(fib_class.cache[1])\n",
223+
"code": ">>> assert fib_class.cache[1]\n",
224224
"hidden": false,
225225
"locked": false
226226
},
227227
{
228-
"code": ">>> assert(fib_class.cache[7])\n",
228+
"code": ">>> assert fib_class.cache[7]\n",
229229
"hidden": false,
230230
"locked": false
231231
}
@@ -244,17 +244,17 @@
244244
{
245245
"cases": [
246246
{
247-
"code": ">>> assert(not \"not filled out\" in worked_with_names)\n",
247+
"code": ">>> assert not 'not filled out' in worked_with_names\n",
248248
"hidden": false,
249249
"locked": false
250250
},
251251
{
252-
"code": ">>> assert(not \"not filled out\" in websites)\n",
252+
"code": ">>> assert not 'not filled out' in websites\n",
253253
"hidden": false,
254254
"locked": false
255255
},
256256
{
257-
"code": ">>> assert(hours > 0)\n",
257+
"code": ">>> assert hours > 0\n",
258258
"hidden": false,
259259
"locked": false
260260
}

‎Week_1_arrays/HW_1_data_numpy.ipynb‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -726,12 +726,12 @@
726726
{
727727
"cases": [
728728
{
729-
"code": ">>> assert(pick_data_description[\"n_total_dims\"] == 33)\n",
729+
"code": ">>> assert pick_data_description['n_total_dims'] == 33\n",
730730
"hidden": false,
731731
"locked": false
732732
},
733733
{
734-
"code": ">>> assert(pick_data_description[\"n_time_steps\"] == 40)\n",
734+
"code": ">>> assert pick_data_description['n_time_steps'] == 40\n",
735735
"hidden": false,
736736
"locked": false
737737
}
@@ -750,7 +750,7 @@
750750
{
751751
"cases": [
752752
{
753-
"code": ">>> assert(row_max_wrist_torque_z[0:2] == (82, 863))\n",
753+
"code": ">>> assert row_max_wrist_torque_z[0:2] == (82, 863)\n",
754754
"hidden": false,
755755
"locked": false
756756
}
@@ -769,17 +769,17 @@
769769
{
770770
"cases": [
771771
{
772-
"code": ">>> assert(not \"not filled out\" in worked_with_names)\n",
772+
"code": ">>> assert not 'not filled out' in worked_with_names\n",
773773
"hidden": false,
774774
"locked": false
775775
},
776776
{
777-
"code": ">>> assert(not \"not filled out\" in websites)\n",
777+
"code": ">>> assert not 'not filled out' in websites\n",
778778
"hidden": false,
779779
"locked": false
780780
},
781781
{
782-
"code": ">>> assert(hours > 0)\n",
782+
"code": ">>> assert hours > 0\n",
783783
"hidden": false,
784784
"locked": false
785785
}
@@ -798,7 +798,7 @@
798798
{
799799
"cases": [
800800
{
801-
"code": ">>> assert(np.isclose(np.min(np.zeros(3)), 0.0))\n",
801+
"code": ">>> assert np.isclose(np.min(np.zeros(3)), 0.0)\n",
802802
"hidden": false,
803803
"locked": false
804804
}
@@ -817,12 +817,12 @@
817817
{
818818
"cases": [
819819
{
820-
"code": ">>> assert(pick_data.shape == (660, 1321))\n",
820+
"code": ">>> assert pick_data.shape == (660, 1321)\n",
821821
"hidden": false,
822822
"locked": false
823823
},
824824
{
825-
"code": ">>> assert(pick_data_description[\"Pick data file\"] == \"proxy_pick_data.csv\")\n",
825+
"code": ">>> assert pick_data_description['Pick data file'] == 'proxy_pick_data.csv'\n",
826826
"hidden": false,
827827
"locked": false
828828
}
@@ -841,7 +841,7 @@
841841
{
842842
"cases": [
843843
{
844-
"code": ">>> assert(compare_files())\n",
844+
"code": ">>> assert compare_files()\n",
845845
"hidden": false,
846846
"locked": false
847847
}
@@ -860,22 +860,22 @@
860860
{
861861
"cases": [
862862
{
863-
"code": ">>> assert(np.isclose(ret_stats['Min'], -1.0, 0.001))\n",
863+
"code": ">>> assert np.isclose(ret_stats['Min'], -1.0, 0.001)\n",
864864
"hidden": false,
865865
"locked": false
866866
},
867867
{
868-
"code": ">>> assert(np.isclose(ret_stats['Max'], 1.0, 0.001))\n",
868+
"code": ">>> assert np.isclose(ret_stats['Max'], 1.0, 0.001)\n",
869869
"hidden": false,
870870
"locked": false
871871
},
872872
{
873-
"code": ">>> assert(np.isclose(ret_stats['Mean'], 0.0027777, 0.01))\n",
873+
"code": ">>> assert np.isclose(ret_stats['Mean'], 0.0027777, 0.01)\n",
874874
"hidden": false,
875875
"locked": false
876876
},
877877
{
878-
"code": ">>> assert(np.isclose(ret_stats['SD'],0.70808274, 0.01))\n",
878+
"code": ">>> assert np.isclose(ret_stats['SD'], 0.70808274, 0.01)\n",
879879
"hidden": false,
880880
"locked": false
881881
}

‎Week_1_arrays/Lab_1_data_numpy.ipynb‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
"\n",
270270
"\n",
271271
"# Check that you actually set the value somewhere in the loop - this is \"defensive coding\"\n",
272-
"if index_wrist_torque_offset is -1:\n",
272+
"if index_wrist_torque_offset == -1:\n",
273273
" print(f\"Error: No channel {channel} found\")\n",
274274
" \n",
275275
"print(f\"Offset for wrist torque: {index_wrist_torque_offset}\")"
@@ -560,22 +560,22 @@
560560
{
561561
"cases": [
562562
{
563-
"code": ">>> assert(np.isclose(min_wrist_torque_successful, -0.293665094))\n",
563+
"code": ">>> assert np.isclose(min_wrist_torque_successful, -0.293665094)\n",
564564
"hidden": false,
565565
"locked": false
566566
},
567567
{
568-
"code": ">>> assert(np.isclose(max_wrist_torque_successful, 0.340460618))\n",
568+
"code": ">>> assert np.isclose(max_wrist_torque_successful, 0.340460618)\n",
569569
"hidden": false,
570570
"locked": false
571571
},
572572
{
573-
"code": ">>> assert(np.isclose(min_wrist_torque_unsuccessful, -0.62552044))\n",
573+
"code": ">>> assert np.isclose(min_wrist_torque_unsuccessful, -0.62552044)\n",
574574
"hidden": false,
575575
"locked": false
576576
},
577577
{
578-
"code": ">>> assert(np.isclose(max_wrist_torque_unsuccessful, 0.326538637))\n",
578+
"code": ">>> assert np.isclose(max_wrist_torque_unsuccessful, 0.326538637)\n",
579579
"hidden": false,
580580
"locked": false
581581
}
@@ -594,7 +594,7 @@
594594
{
595595
"cases": [
596596
{
597-
"code": ">>> assert(index_wrist_torque_offset == 5)\n",
597+
"code": ">>> assert index_wrist_torque_offset == 5\n",
598598
"hidden": false,
599599
"locked": false
600600
}
@@ -613,17 +613,17 @@
613613
{
614614
"cases": [
615615
{
616-
"code": ">>> assert(pick_data.shape[0] == 660)\n",
616+
"code": ">>> assert pick_data.shape[0] == 660\n",
617617
"hidden": false,
618618
"locked": false
619619
},
620620
{
621-
"code": ">>> assert(n_picks == 660)\n",
621+
"code": ">>> assert n_picks == 660\n",
622622
"hidden": false,
623623
"locked": false
624624
},
625625
{
626-
"code": ">>> assert(n_successful == 355)\n",
626+
"code": ">>> assert n_successful == 355\n",
627627
"hidden": false,
628628
"locked": false
629629
}
@@ -642,17 +642,17 @@
642642
{
643643
"cases": [
644644
{
645-
"code": ">>> assert(not \"not filled out\" in worked_with_names)\n",
645+
"code": ">>> assert not 'not filled out' in worked_with_names\n",
646646
"hidden": false,
647647
"locked": false
648648
},
649649
{
650-
"code": ">>> assert(not \"not filled out\" in websites)\n",
650+
"code": ">>> assert not 'not filled out' in websites\n",
651651
"hidden": false,
652652
"locked": false
653653
},
654654
{
655-
"code": ">>> assert(hours > 0)\n",
655+
"code": ">>> assert hours > 0\n",
656656
"hidden": false,
657657
"locked": false
658658
}
@@ -671,7 +671,7 @@
671671
{
672672
"cases": [
673673
{
674-
"code": ">>> assert(all_rows_with_max[0] == 82)\n",
674+
"code": ">>> assert all_rows_with_max[0] == 82\n",
675675
"hidden": false,
676676
"locked": false
677677
}
@@ -690,12 +690,12 @@
690690
{
691691
"cases": [
692692
{
693-
"code": ">>> assert(n_total_dims == 33)\n",
693+
"code": ">>> assert n_total_dims == 33\n",
694694
"hidden": false,
695695
"locked": false
696696
},
697697
{
698-
"code": ">>> assert(n_time_steps == 40)\n",
698+
"code": ">>> assert n_time_steps == 40\n",
699699
"hidden": false,
700700
"locked": false
701701
}
@@ -714,12 +714,12 @@
714714
{
715715
"cases": [
716716
{
717-
"code": ">>> assert(np.isclose(min_wrist_torque, -0.62552044))\n",
717+
"code": ">>> assert np.isclose(min_wrist_torque, -0.62552044)\n",
718718
"hidden": false,
719719
"locked": false
720720
},
721721
{
722-
"code": ">>> assert(np.isclose(max_wrist_torque, 0.340460618))\n",
722+
"code": ">>> assert np.isclose(max_wrist_torque, 0.340460618)\n",
723723
"hidden": false,
724724
"locked": false
725725
}

‎Week_1_arrays/a_tutorial_numpy.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
{
2323
"cell_type": "code",
24-
"execution_count": 1,
24+
"execution_count": null,
2525
"metadata": {},
2626
"outputs": [],
2727
"source": [

‎Week_1_arrays/a_tutorial_numpy.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
# structures are setup to handle this a lot better than numpy arrays.
6767

6868
# Example 1: Reading in a csv file of numbers directly into a numpy array
69+
# Note: If you get a file name error, click on the triangle and select "run python file in a dedicated terminal"
6970
file_name = "Data/proxy_test_grasp.csv"
7071
# This is a first example of the fun of numpy/scipy function parameters. Google numpy loadtxt to get a list of
7172
# all possible parameters - all of which have default values, except the file name.
@@ -107,7 +108,7 @@
107108
# It is a tuple, so you can't change it
108109
data_ones = np.ones(data_from_csv.shape)
109110
print(f"Data dimensions: {data_ones.shape}, total number of elements: {data_ones.size}")
110-
print(f"First element: {data_ones[0, 0, 0]}")
111+
print(f"First element: {data_ones[0, 0]}")
111112

112113
# Making an array of numbers starting and stopping at given values (linspace)
113114
# 15 numbers, starting at -1 and going to 1

0 commit comments

Comments
 (0)