Merge branch 'main' of https://github.com/OSUrobotics/IntroPythonProgramming

cindygr · cindygr · commit 6c8cf247463f · 2024-01-25T09:48:44.000-08:00
diff --git a/Week_0_python/a_tutorial_strings_format.ipynb b/Week_0_python/a_tutorial_strings_format.ipynb
@@ -131,7 +131,7 @@
     "\n",
     "The curly brackets tell the format function to \"fill in\" the variables that are passed in. Python provides a much nicer way of doing this with **f(\"\")** which we'll show below. It's useful to see the more traditional, C++ or Matlab version first.\n",
     "TODO edits to try/do\n",
-    " - add in a 3rd variable to print\n",
+    " - add in a 3rd variable to pring\n",
     " - print with 5 decimal places\n",
     " - print out the same variable twice in one line"
    ]
diff --git a/Week_0_python/c_practice_strings.ipynb b/Week_0_python/c_practice_strings.ipynb
@@ -72,7 +72,7 @@
    "metadata": {},
    "source": [
     "# Practice: String editing \n",
-    "The first two problems just involve a simple replacement. The third problem involves multiple steps."
+    "The first two problems just to do a simple replacement. The third problem involves multiple steps."
    ]
   },
   {
diff --git a/Week_0_python/d_tutorial_list.ipynb b/Week_0_python/d_tutorial_list.ipynb
@@ -204,11 +204,11 @@
     "#   for the c programmer, there is no for (i = 0, i < n, i++) equivalent\n",
     "my_list_result = []\n",
     "for i in range(0, len(my_list_todos)):\n",
-    "    if my_list_todos[i] == \"add\":\n",
+    "    if my_list_todos[i] is \"add\":\n",
     "        my_list_result.append(my_list_lhs_numbers[i] + my_list_rhs_numbers[i])\n",
-    "    elif my_list_todos[i] == \"multiply\":\n",
+    "    elif my_list_todos[i] is \"multiply\":\n",
     "        my_list_result.append(my_list_lhs_numbers[i] * my_list_rhs_numbers[i])\n",
-    "    elif my_list_todos[i] == \"skip\":\n",
+    "    elif my_list_todos[i] is \"skip\":\n",
     "        pass \n",
     "    else:\n",
     "        # This is the RIGHT way to do this, so you catch if someone mis-typed something\n",
@@ -244,11 +244,11 @@
     "\n",
     "# Notice i, n\n",
     "for i, n in enumerate(my_list_todos):\n",
-    "    if n == \"add\":\n",
+    "    if n is \"add\":\n",
     "        my_list_result.append(my_list_lhs_numbers[i] + my_list_rhs_numbers[i])\n",
-    "    elif n == \"multiply\":\n",
+    "    elif n is \"multiply\":\n",
     "        my_list_result.append(my_list_lhs_numbers[i] * my_list_rhs_numbers[i])\n",
-    "    elif n == \"skip\":\n",
+    "    elif n is \"skip\":\n",
     "        pass  # This is the RIGHT way to do this, so you catch if someone mis-typed something\n",
     "    else:\n",
     "        raise ValueError(f\"Expected add, multiply, or skip, got {n}\")\n",
@@ -266,11 +266,11 @@
     "#  Note also that this does NOT require an index variable i - it's all handled for you\n",
     "my_list_result = []  # Set list back to empty\n",
     "for n, lhs, rhs in zip(my_list_todos, my_list_lhs_numbers, my_list_rhs_numbers):\n",
-    "    if n == \"add\":\n",
+    "    if n is \"add\":\n",
     "        my_list_result.append(lhs + rhs)\n",
-    "    elif n == \"multiply\":\n",
+    "    elif n is \"multiply\":\n",
     "        my_list_result.append(lhs * rhs)\n",
-    "    elif n == \"skip\":\n",
+    "    elif n is \"skip\":\n",
     "        pass  \n",
     "    else:\n",
     "        # This is the RIGHT way to do this, so you catch if someone mis-typed something\n",
diff --git a/Week_1_data_structures/HW_1_numpy_and_plotting.ipynb b/Week_1_data_structures/HW_1_numpy_and_plotting.ipynb
@@ -106,6 +106,7 @@
     "# \"success yn\" - the successful pick, y/n data\n",
     "# \"n picks\" - the total number of picks\n",
     "# \"n successful\" - the number of successful picks\n",
+    "# \"n unsuccessful\" - the number of unsuccessful picks\n",
     "#   Note: Do these two after you read in the json file\n",
     "# \"n timesteps\" - the number of time steps\n",
     "# \"n total dims\" - the total number of data channels per time step\n",
@@ -126,7 +127,7 @@
    },
    "outputs": [],
    "source": [
-    "# TODO: Read in proxy_data_diescription.json\n",
+    "# TODO: Read in proxy_data_description.json\n",
     "# - calculate number of channels\n",
     "# - calculate number of time steps\n",
     "\n",
@@ -473,6 +474,19 @@
     "    json.dump(pick_data_description, f, indent=4)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# These commands will force JN to actually re-load the external file when you re-execute the import command\n",
+    "%load_ext autoreload\n",
+    "%autoreload 2"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -654,6 +668,13 @@
     "- min and max - pass in the minimum and maximum values for that channel (use to draw lines)\n"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "This problem is manually graded; see slides and Gradescope rubric."
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -714,18 +735,6 @@
     "plt.tight_layout()"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "deletable": false,
-    "editable": false
-   },
-   "outputs": [],
-   "source": [
-    "grader.check(\"plot_function\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -827,12 +836,12 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "deletable": false,
-    "editable": false
+    "tags": []
    },
    "outputs": [],
    "source": [
-    "grader.check(\"plot_specific_channels\")"
+    "# Manual grade\n",
+    "print(\"This is a manually-graded question; there is no grader.check() function. See rubric and slides for more information on expected output.\")"
    ]
   },
   {
@@ -871,6 +880,18 @@
     "fig.set_tight_layout(tight=True)\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# Manual grade\n",
+    "print(\"This is a manually-graded question; there is no grader.check() function. See rubric and slides for more information on expected output.\")"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -1097,44 +1118,6 @@
       }
      ]
     },
-    "plot_function": {
-     "name": "plot_function",
-     "points": 3,
-     "suites": [
-      {
-       "cases": [
-        {
-         "code": ">>> print(\"This problem is manually graded, look at the slides for the expected plot\")\n",
-         "hidden": false,
-         "locked": false
-        }
-       ],
-       "scored": true,
-       "setup": "",
-       "teardown": "",
-       "type": "doctest"
-      }
-     ]
-    },
-    "plot_specific_channels": {
-     "name": "plot_specific_channels",
-     "points": 0,
-     "suites": [
-      {
-       "cases": [
-        {
-         "code": ">>> print(\"This question is manually graded, look at the slides for the expected plot\")\n",
-         "hidden": false,
-         "locked": false
-        }
-       ],
-       "scored": true,
-       "setup": "",
-       "teardown": "",
-       "type": "doctest"
-      }
-     ]
-    },
     "reverse_dictionary": {
      "name": "reverse_dictionary",
      "points": 3,
diff --git a/Week_1_data_structures/Lab_1_arrays_and_dictionaries.ipynb b/Week_1_data_structures/Lab_1_arrays_and_dictionaries.ipynb
@@ -674,7 +674,23 @@
    "source": [
     "# TEST CODE\n",
     "#   The correct answers are in Lab1_check_results.json. You can write test code here to check\n",
-    "#   each value in turn, make sure the slicing is the correct size. This will not be graded."
+    "#   each value in turn, make sure the slicing is the correct size. This will not be graded.\n",
+    "\n",
+    "# See the slides for how to debug this if it doesn't pass the test"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# These commands will force JN to actually re-load the external file when you re-execute the import command\n",
+    "\n",
+    "%load_ext autoreload\n",
+    "%autoreload 2"
    ]
   },
   {
diff --git a/Week_1_data_structures/a_tutorial_numpy.ipynb b/Week_1_data_structures/a_tutorial_numpy.ipynb
@@ -135,7 +135,7 @@
     "print(f\"Element in second row, first column: {data_from_csv[1, 0]}\")\n",
     "# The -1 says get the last element (see slicing)\n",
     "print(f\"Element in last row, last column: {data_from_csv[-1, -1]}\")\n",
-    "print(f\"Element in third row, last column: {data_from_csv[2, -1]}\")"
+    "print(f\"Element in third row, last column: {data_from_csv[1, -1]}\")"
    ]
   },
   {
@@ -199,7 +199,7 @@
     "\n",
     "Note: One of the most common errors is to forget the [] or the () around the list of dimensions - you don't need it for one dimensional arrays, but you will for more than one - otherwise, you get a TypeError: data type not understood\n",
     "\n",
-    "Create a **2 X 3**  array of zeros\n",
+    "Create a **3 X 5 X 2**  array of zeros\n",
     "\n",
     "TODO: Try creating a matrix of a different size"
    ]
diff --git a/Week_1_data_structures/check_json_answers.py b/Week_1_data_structures/check_json_answers.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+# Just a helper function to check if two json files are the same
+
+import numpy as np
+import json as json
+
+# Compare dictionaries or data to files
+def compare_files(student_answer, soln_file_name):
+    # Student is always the first argument
+    student = student_answer
+    # If it's a file name, then load that file
+    if isinstance(student_answer, str):
+        with open("Data/" + student_answer, "r") as fp:
+            student = json.load(fp)
+
+    # Second filename is always the solution, stored in a file or a dictionary. Load it if it is a file.
+    soln = soln_file_name
+    if isinstance(soln_file_name, str):
+        with open("Data/" + soln_file_name, "r") as fp:
+            soln = json.load(fp)
+
+    # If soln is a dictionary, then do the first if statement
+    if isinstance(soln, dict):
+        # Loop through all elements of the dictionary
+        for k, v in soln.items():
+            try:
+                if k == "Data channels":
+                    # The data channels list
+                    for i, d in enumerate(student[k]):
+                        if d != v[i]:
+                            print(f"miss-match value {d} {v[i]}")
+                            return False
+                else:
+                    if v != student[k]:
+                        print(f"Miss-match key-item {k} {v} {student[k]}")
+                        return False
+            except KeyError:
+                print(f"Missing key {k}")
+                return False
+        return True
+    else:
+        # soln is a list.
+        if len(soln) != len(student):   # Check lists are same length
+            print(f"Mismatched number of elements, solution {len(soln)} yours {len(student)}")            
+            return False
+
+        # For each item in each list
+        for ce, cs in zip(soln, student):
+            # Each item is a dictionary - loop through the solution keys
+            for k, v in ce.items():
+                try:
+                    # Check if the values in the keys are similar
+                    if not np.isclose(v, cs[k], atol=0.01):
+                        print(f"Value for key {k} is {cs[k]}, expected {v}")
+                        return False
+                except KeyError:
+                    print(f"Missing key {k} or not a number {cs[k]}")
+                    return False
+    return True
+        
+    
diff --git a/Week_2_functions/Lab_2_functions.ipynb b/Week_2_functions/Lab_2_functions.ipynb
@@ -402,7 +402,7 @@
     "# Use b_successful to pick out the rows that are successful. Send all column data for the selected rows.\n",
     "#   Wrist torque data has 3 dimensions (x,y,z)\n",
     "#   There's two errors here - one that actually will create incorrect results, one that just *happens* to work\n",
-    "#   correctly, although it doesn't do what the first sentance says...\n",
+    "#   correctly, although it doesn't do what the first sentence says...\n",
     "ret_wrist_torque_successful = calc_stats_for_channel(wrist_torque_data[b_successful], n_dims=1)\n",
     "\n",
     "# The minimum should be in the third (last) element in the list, the \"min\" key\n",
diff --git a/Week_2_functions/b_practice_where.ipynb b/Week_2_functions/b_practice_where.ipynb
diff --git a/Week_2_functions/lec_act_2_functions.ipynb b/Week_2_functions/lec_act_2_functions.ipynb

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@`
`131`	`131`	`"\n",`
`132`	`132`	`"The curly brackets tell the format function to \"fill in\" the variables that are passed in. Python provides a much nicer way of doing this with f(\"\") which we'll show below. It's useful to see the more traditional, C++ or Matlab version first.\n",`
`133`	`133`	`"TODO edits to try/do\n",`
`134`		`- " - add in a 3rd variable to print\n",`
	`134`	`+ " - add in a 3rd variable to pring\n",`
`135`	`135`	`" - print with 5 decimal places\n",`
`136`	`136`	`" - print out the same variable twice in one line"`
`137`	`137`	`]`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`"metadata": {},`
`73`	`73`	`"source": [`
`74`	`74`	`"# Practice: String editing \n",`
`75`		`- "The first two problems just involve a simple replacement. The third problem involves multiple steps."`
	`75`	`+ "The first two problems just to do a simple replacement. The third problem involves multiple steps."`
`76`	`76`	`]`
`77`	`77`	`},`
`78`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@`
`135`	`135`	`"print(f\"Element in second row, first column: {data_from_csv[1, 0]}\")\n",`
`136`	`136`	`"# The -1 says get the last element (see slicing)\n",`
`137`	`137`	`"print(f\"Element in last row, last column: {data_from_csv[-1, -1]}\")\n",`
`138`		`- "print(f\"Element in third row, last column: {data_from_csv[2, -1]}\")"`
	`138`	`+ "print(f\"Element in third row, last column: {data_from_csv[1, -1]}\")"`
`139`	`139`	`]`
`140`	`140`	`},`
`141`	`141`	`{`
`@@ -199,7 +199,7 @@`
`199`	`199`	`"\n",`
`200`	`200`	`"Note: One of the most common errors is to forget the [] or the () around the list of dimensions - you don't need it for one dimensional arrays, but you will for more than one - otherwise, you get a TypeError: data type not understood\n",`
`201`	`201`	`"\n",`
`202`		`- "Create a 2 X 3 array of zeros\n",`
	`202`	`+ "Create a 3 X 5 X 2 array of zeros\n",`
`203`	`203`	`"\n",`
`204`	`204`	`"TODO: Try creating a matrix of a different size"`
`205`	`205`	`]`