From cc86fc7ba29be9c4b0dbc40794c27ba123f53522 Mon Sep 17 00:00:00 2001
From: ashwinmaran <amaran@wisc.edu>
Date: Wed, 15 Nov 2023 10:52:44 -0600
Subject: [PATCH] public_tests bugfix
---
lab-p11/README.md | 75 ++++++
lab-p11/lab-p11.ipynb | 446 +++++++++++++++++------------------
lab-p11/public_tests.py | 30 ++-
p11/README.md | 2 +-
p11/p11.ipynb | 502 ++++++++++++++++++++--------------------
p11/public_tests.py | 24 +-
6 files changed, 585 insertions(+), 494 deletions(-)
create mode 100644 lab-p11/README.md
diff --git a/lab-p11/README.md b/lab-p11/README.md
new file mode 100644
index 0000000..f66fec7
--- /dev/null
+++ b/lab-p11/README.md
@@ -0,0 +1,75 @@
+# Lab-P11: Scatter Plots and Recursion
+
+In this lab, you'll get practice with creating scatter plots and defining recursive functions, in preparation for P11.
+
+-----------------------------
+## Corrections/Clarifications
+
+* **(11/15/2023 - 10:50 AM)**: `public_tests.py` updated. Please redownload this file if you are using MacOS.
+
+
+**Find any issues?** Please report to us:
+
+- Ashwin Maran <amaran@wisc.edu>
+
+------------------------------
+## Learning Objectives
+
+In this lab, you will practice...
+* creating scatter plots,
+* defining recursive functions.
+
+------------------------------
+
+## Note on Academic Misconduct
+
+You may do these lab exercises with only your project partner; you are not allowed to start
+working on Lab-P11 with one person, then do the project with a different partner. Now may be a
+good time to review [our course policies](https://cs220.cs.wisc.edu/f23/syllabus.html).
+
+**Important:** P10 and P11 are two parts of the same data analysis.
+You **cannot** switch project partners between these two projects.
+If you partnered up with someone for P10, you have to sustain that partnership until the end of P11.
+
+------------------------------
+
+## Segment 1: Setup
+
+Create a `lab-p11` directory and download the following files into the `lab-p11` directory.
+
+* `sample_data.zip`
+* `planets_small.json`
+* `lab-p11.ipynb`
+* `public_tests.py`
+* `expected_plots.json`
+
+After downloading `sample_data.zip`, make sure to extract it (using [Mac directions](http://osxdaily.com/2017/11/05/how-open-zip-file-mac/) or [Windows directions](https://support.microsoft.com/en-us/help/4028088/windows-zip-and-unzip-files)). After extracting, you should see a folder called `sample_data`. You may delete `sample_data.zip` after extracting the files inside it.
+
+**Important**: You **must** make sure that the `sample_data` directory is in the same directory as `practice.ipynb`. Your file structure **must** look like this:
+
+```
++-- lab-p11.ipynb
++-- planets_small.json
++-- public_tests.py
++-- expected_plots.json
++-- sample_data
+| +-- .DS_Store
+| +-- file_1.json
+| +-- sample_1
+| | +-- .ipynb_checkpoints
+| | +-- file_2.json
+| | +-- file_3.json
+| +-- sample_2
+| | +-- file_4.json
+| | +-- sample_3
+| | | +-- .DS_Store
+| | | +-- file_5.json
+```
+
+
+## Segment 2:
+For the remaining segments, detailed instructions are provided in `lab-p11.ipynb`. From the terminal, open a `jupyter notebook` session, open your `lab-p11.ipynb`, and follow the instructions in `lab-p11.ipynb`.
+
+## Project 11
+
+You can now get started with [P11](https://git.doit.wisc.edu/cdis/cs/courses/cs220/cs220-f23-projects/-/tree/main/p11). **You may copy/paste any code created here in project P11**. Remember to work on P11 with only your partner from this point on. Have fun!
diff --git a/lab-p11/lab-p11.ipynb b/lab-p11/lab-p11.ipynb
index 83e9b16..5acbe9d 100644
--- a/lab-p11/lab-p11.ipynb
+++ b/lab-p11/lab-p11.ipynb
@@ -3,7 +3,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "93940fc2",
+ "id": "de0c260e",
"metadata": {
"cell_type": "code",
"deletable": false,
@@ -23,10 +23,10 @@
"metadata": {
"editable": false,
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:53.233836Z",
- "iopub.status.busy": "2023-11-15T01:37:53.232836Z",
- "iopub.status.idle": "2023-11-15T01:37:53.494131Z",
- "shell.execute_reply": "2023-11-15T01:37:53.493115Z"
+ "iopub.execute_input": "2023-11-15T16:47:16.919432Z",
+ "iopub.status.busy": "2023-11-15T16:47:16.919432Z",
+ "iopub.status.idle": "2023-11-15T16:47:17.246151Z",
+ "shell.execute_reply": "2023-11-15T16:47:17.245121Z"
}
},
"outputs": [],
@@ -136,10 +136,10 @@
"id": "4a6e5d9a",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:53.499137Z",
- "iopub.status.busy": "2023-11-15T01:37:53.499137Z",
- "iopub.status.idle": "2023-11-15T01:37:54.443847Z",
- "shell.execute_reply": "2023-11-15T01:37:54.442833Z"
+ "iopub.execute_input": "2023-11-15T16:47:17.251154Z",
+ "iopub.status.busy": "2023-11-15T16:47:17.250133Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.072801Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.071772Z"
},
"tags": []
},
@@ -176,10 +176,10 @@
"id": "7a3ce7f3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.449845Z",
- "iopub.status.busy": "2023-11-15T01:37:54.448844Z",
- "iopub.status.idle": "2023-11-15T01:37:54.455862Z",
- "shell.execute_reply": "2023-11-15T01:37:54.454850Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.077783Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.076802Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.082852Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.082852Z"
},
"tags": []
},
@@ -209,10 +209,10 @@
"id": "73724c3e",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.459861Z",
- "iopub.status.busy": "2023-11-15T01:37:54.458861Z",
- "iopub.status.idle": "2023-11-15T01:37:54.531253Z",
- "shell.execute_reply": "2023-11-15T01:37:54.530245Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.086882Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.086882Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.162792Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.161782Z"
},
"tags": []
},
@@ -265,10 +265,10 @@
"id": "37fc3c80",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.536251Z",
- "iopub.status.busy": "2023-11-15T01:37:54.536251Z",
- "iopub.status.idle": "2023-11-15T01:37:54.542318Z",
- "shell.execute_reply": "2023-11-15T01:37:54.541282Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.166794Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.166794Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.171628Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.171628Z"
},
"tags": []
},
@@ -310,10 +310,10 @@
"id": "47e6815c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.546553Z",
- "iopub.status.busy": "2023-11-15T01:37:54.546553Z",
- "iopub.status.idle": "2023-11-15T01:37:54.552797Z",
- "shell.execute_reply": "2023-11-15T01:37:54.551756Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.176657Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.176657Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.180507Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.180507Z"
},
"tags": []
},
@@ -330,7 +330,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "fb3fc395",
+ "id": "18515fec",
"metadata": {
"deletable": false,
"editable": false
@@ -373,10 +373,10 @@
"id": "6949919b",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.570381Z",
- "iopub.status.busy": "2023-11-15T01:37:54.570381Z",
- "iopub.status.idle": "2023-11-15T01:37:54.868605Z",
- "shell.execute_reply": "2023-11-15T01:37:54.867595Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.197237Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.197237Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.476932Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.475899Z"
},
"tags": []
},
@@ -417,10 +417,10 @@
"id": "56e4093f",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.872625Z",
- "iopub.status.busy": "2023-11-15T01:37:54.872625Z",
- "iopub.status.idle": "2023-11-15T01:37:54.878448Z",
- "shell.execute_reply": "2023-11-15T01:37:54.877439Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.480929Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.480929Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.486992Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.486068Z"
},
"tags": []
},
@@ -438,7 +438,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "e0aec3aa",
+ "id": "95d85303",
"metadata": {
"deletable": false,
"editable": false
@@ -481,10 +481,10 @@
"id": "9acf1d64",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:54.892643Z",
- "iopub.status.busy": "2023-11-15T01:37:54.892643Z",
- "iopub.status.idle": "2023-11-15T01:37:55.141177Z",
- "shell.execute_reply": "2023-11-15T01:37:55.140169Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.502612Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.501620Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.729446Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.728433Z"
},
"tags": []
},
@@ -514,10 +514,10 @@
"id": "bb3ca11c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.146177Z",
- "iopub.status.busy": "2023-11-15T01:37:55.145183Z",
- "iopub.status.idle": "2023-11-15T01:37:55.151468Z",
- "shell.execute_reply": "2023-11-15T01:37:55.150456Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.733443Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.733443Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.739383Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.738369Z"
},
"tags": []
},
@@ -535,7 +535,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "582c19ef",
+ "id": "bc03ffe6",
"metadata": {
"deletable": false,
"editable": false
@@ -578,10 +578,10 @@
"id": "c5623a98",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.166397Z",
- "iopub.status.busy": "2023-11-15T01:37:55.165404Z",
- "iopub.status.idle": "2023-11-15T01:37:55.382534Z",
- "shell.execute_reply": "2023-11-15T01:37:55.381521Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.753480Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.753480Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.960475Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.959462Z"
},
"tags": []
},
@@ -620,10 +620,10 @@
"id": "3ffa1887",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.387551Z",
- "iopub.status.busy": "2023-11-15T01:37:55.386531Z",
- "iopub.status.idle": "2023-11-15T01:37:55.392149Z",
- "shell.execute_reply": "2023-11-15T01:37:55.391139Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.964472Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.964472Z",
+ "iopub.status.idle": "2023-11-15T16:47:18.968089Z",
+ "shell.execute_reply": "2023-11-15T16:47:18.968089Z"
},
"tags": []
},
@@ -637,7 +637,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "27eba0b2",
+ "id": "b7daeb3f",
"metadata": {
"deletable": false,
"editable": false
@@ -680,10 +680,10 @@
"id": "dd31a5ee",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.408978Z",
- "iopub.status.busy": "2023-11-15T01:37:55.407959Z",
- "iopub.status.idle": "2023-11-15T01:37:55.653739Z",
- "shell.execute_reply": "2023-11-15T01:37:55.652727Z"
+ "iopub.execute_input": "2023-11-15T16:47:18.982164Z",
+ "iopub.status.busy": "2023-11-15T16:47:18.982164Z",
+ "iopub.status.idle": "2023-11-15T16:47:19.192949Z",
+ "shell.execute_reply": "2023-11-15T16:47:19.191936Z"
},
"tags": []
},
@@ -727,10 +727,10 @@
"id": "972df04c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.658738Z",
- "iopub.status.busy": "2023-11-15T01:37:55.657738Z",
- "iopub.status.idle": "2023-11-15T01:37:55.667293Z",
- "shell.execute_reply": "2023-11-15T01:37:55.666283Z"
+ "iopub.execute_input": "2023-11-15T16:47:19.196947Z",
+ "iopub.status.busy": "2023-11-15T16:47:19.196947Z",
+ "iopub.status.idle": "2023-11-15T16:47:19.205847Z",
+ "shell.execute_reply": "2023-11-15T16:47:19.204834Z"
},
"tags": []
},
@@ -749,7 +749,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "80abdfbb",
+ "id": "cf7b3a2a",
"metadata": {
"deletable": false,
"editable": false
@@ -778,10 +778,10 @@
"id": "f951cfea",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.681355Z",
- "iopub.status.busy": "2023-11-15T01:37:55.680358Z",
- "iopub.status.idle": "2023-11-15T01:37:55.694781Z",
- "shell.execute_reply": "2023-11-15T01:37:55.693766Z"
+ "iopub.execute_input": "2023-11-15T16:47:19.218539Z",
+ "iopub.status.busy": "2023-11-15T16:47:19.218539Z",
+ "iopub.status.idle": "2023-11-15T16:47:19.227449Z",
+ "shell.execute_reply": "2023-11-15T16:47:19.226438Z"
},
"tags": []
},
@@ -793,7 +793,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "783b9d56",
+ "id": "7932ca15",
"metadata": {
"deletable": false,
"editable": false
@@ -822,10 +822,10 @@
"id": "7d166fe2",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:55.711192Z",
- "iopub.status.busy": "2023-11-15T01:37:55.711192Z",
- "iopub.status.idle": "2023-11-15T01:37:55.721672Z",
- "shell.execute_reply": "2023-11-15T01:37:55.720660Z"
+ "iopub.execute_input": "2023-11-15T16:47:19.240805Z",
+ "iopub.status.busy": "2023-11-15T16:47:19.240805Z",
+ "iopub.status.idle": "2023-11-15T16:47:19.249129Z",
+ "shell.execute_reply": "2023-11-15T16:47:19.248196Z"
},
"tags": []
},
@@ -847,7 +847,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "ddd2ac0d",
+ "id": "aae97b08",
"metadata": {
"deletable": false,
"editable": false
@@ -874,10 +874,10 @@
"id": "8970ad42",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:56.117354Z",
- "iopub.status.busy": "2023-11-15T01:37:56.117354Z",
- "iopub.status.idle": "2023-11-15T01:37:56.495640Z",
- "shell.execute_reply": "2023-11-15T01:37:56.494626Z"
+ "iopub.execute_input": "2023-11-15T16:47:19.593767Z",
+ "iopub.status.busy": "2023-11-15T16:47:19.593767Z",
+ "iopub.status.idle": "2023-11-15T16:47:19.897116Z",
+ "shell.execute_reply": "2023-11-15T16:47:19.896086Z"
},
"tags": []
},
@@ -918,10 +918,10 @@
"id": "7bc93ba8",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:56.499659Z",
- "iopub.status.busy": "2023-11-15T01:37:56.499659Z",
- "iopub.status.idle": "2023-11-15T01:37:56.509501Z",
- "shell.execute_reply": "2023-11-15T01:37:56.508491Z"
+ "iopub.execute_input": "2023-11-15T16:47:19.901117Z",
+ "iopub.status.busy": "2023-11-15T16:47:19.901117Z",
+ "iopub.status.idle": "2023-11-15T16:47:19.910762Z",
+ "shell.execute_reply": "2023-11-15T16:47:19.909755Z"
},
"tags": []
},
@@ -944,7 +944,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "6cad14c6",
+ "id": "70beecd7",
"metadata": {
"deletable": false,
"editable": false
@@ -987,10 +987,10 @@
"id": "fcb720d3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:56.835801Z",
- "iopub.status.busy": "2023-11-15T01:37:56.835801Z",
- "iopub.status.idle": "2023-11-15T01:37:57.118147Z",
- "shell.execute_reply": "2023-11-15T01:37:57.118147Z"
+ "iopub.execute_input": "2023-11-15T16:47:20.184244Z",
+ "iopub.status.busy": "2023-11-15T16:47:20.183250Z",
+ "iopub.status.idle": "2023-11-15T16:47:20.470113Z",
+ "shell.execute_reply": "2023-11-15T16:47:20.469098Z"
},
"tags": []
},
@@ -1020,10 +1020,10 @@
"id": "3ffe471e",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:57.123177Z",
- "iopub.status.busy": "2023-11-15T01:37:57.123177Z",
- "iopub.status.idle": "2023-11-15T01:37:57.132196Z",
- "shell.execute_reply": "2023-11-15T01:37:57.131183Z"
+ "iopub.execute_input": "2023-11-15T16:47:20.475113Z",
+ "iopub.status.busy": "2023-11-15T16:47:20.474112Z",
+ "iopub.status.idle": "2023-11-15T16:47:20.484838Z",
+ "shell.execute_reply": "2023-11-15T16:47:20.483825Z"
},
"tags": []
},
@@ -1036,7 +1036,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "1bc82674",
+ "id": "427f2e12",
"metadata": {
"deletable": false,
"editable": false
@@ -1079,10 +1079,10 @@
"id": "36bf1d4c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:57.420402Z",
- "iopub.status.busy": "2023-11-15T01:37:57.419402Z",
- "iopub.status.idle": "2023-11-15T01:37:57.691255Z",
- "shell.execute_reply": "2023-11-15T01:37:57.691255Z"
+ "iopub.execute_input": "2023-11-15T16:47:20.793781Z",
+ "iopub.status.busy": "2023-11-15T16:47:20.792771Z",
+ "iopub.status.idle": "2023-11-15T16:47:21.081210Z",
+ "shell.execute_reply": "2023-11-15T16:47:21.080198Z"
},
"tags": []
},
@@ -1112,10 +1112,10 @@
"id": "b535ec08",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:57.698274Z",
- "iopub.status.busy": "2023-11-15T01:37:57.697268Z",
- "iopub.status.idle": "2023-11-15T01:37:57.709152Z",
- "shell.execute_reply": "2023-11-15T01:37:57.708139Z"
+ "iopub.execute_input": "2023-11-15T16:47:21.087215Z",
+ "iopub.status.busy": "2023-11-15T16:47:21.086214Z",
+ "iopub.status.idle": "2023-11-15T16:47:21.098133Z",
+ "shell.execute_reply": "2023-11-15T16:47:21.097124Z"
},
"tags": []
},
@@ -1158,10 +1158,10 @@
"id": "903474ca",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:57.716152Z",
- "iopub.status.busy": "2023-11-15T01:37:57.715164Z",
- "iopub.status.idle": "2023-11-15T01:37:58.002142Z",
- "shell.execute_reply": "2023-11-15T01:37:58.001112Z"
+ "iopub.execute_input": "2023-11-15T16:47:21.102134Z",
+ "iopub.status.busy": "2023-11-15T16:47:21.102134Z",
+ "iopub.status.idle": "2023-11-15T16:47:21.359186Z",
+ "shell.execute_reply": "2023-11-15T16:47:21.358175Z"
},
"tags": []
},
@@ -1191,10 +1191,10 @@
"id": "c5efee52",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:58.007126Z",
- "iopub.status.busy": "2023-11-15T01:37:58.007126Z",
- "iopub.status.idle": "2023-11-15T01:37:58.243299Z",
- "shell.execute_reply": "2023-11-15T01:37:58.242276Z"
+ "iopub.execute_input": "2023-11-15T16:47:21.363185Z",
+ "iopub.status.busy": "2023-11-15T16:47:21.363185Z",
+ "iopub.status.idle": "2023-11-15T16:47:21.588385Z",
+ "shell.execute_reply": "2023-11-15T16:47:21.587372Z"
},
"tags": []
},
@@ -1243,10 +1243,10 @@
"id": "d96127b8",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:58.248292Z",
- "iopub.status.busy": "2023-11-15T01:37:58.248292Z",
- "iopub.status.idle": "2023-11-15T01:37:58.481643Z",
- "shell.execute_reply": "2023-11-15T01:37:58.480632Z"
+ "iopub.execute_input": "2023-11-15T16:47:21.593383Z",
+ "iopub.status.busy": "2023-11-15T16:47:21.592403Z",
+ "iopub.status.idle": "2023-11-15T16:47:21.820225Z",
+ "shell.execute_reply": "2023-11-15T16:47:21.819213Z"
},
"tags": []
},
@@ -1280,10 +1280,10 @@
"id": "c9833e12",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:58.486646Z",
- "iopub.status.busy": "2023-11-15T01:37:58.486646Z",
- "iopub.status.idle": "2023-11-15T01:37:58.496980Z",
- "shell.execute_reply": "2023-11-15T01:37:58.495974Z"
+ "iopub.execute_input": "2023-11-15T16:47:21.824222Z",
+ "iopub.status.busy": "2023-11-15T16:47:21.824222Z",
+ "iopub.status.idle": "2023-11-15T16:47:21.833166Z",
+ "shell.execute_reply": "2023-11-15T16:47:21.833166Z"
},
"tags": []
},
@@ -1309,7 +1309,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "77c48f9d",
+ "id": "f4a5553e",
"metadata": {
"deletable": false,
"editable": false
@@ -1336,10 +1336,10 @@
"id": "8e27b128",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:58.592631Z",
- "iopub.status.busy": "2023-11-15T01:37:58.591610Z",
- "iopub.status.idle": "2023-11-15T01:37:58.919950Z",
- "shell.execute_reply": "2023-11-15T01:37:58.918939Z"
+ "iopub.execute_input": "2023-11-15T16:47:21.913616Z",
+ "iopub.status.busy": "2023-11-15T16:47:21.913616Z",
+ "iopub.status.idle": "2023-11-15T16:47:22.206888Z",
+ "shell.execute_reply": "2023-11-15T16:47:22.205878Z"
},
"tags": []
},
@@ -1380,10 +1380,10 @@
"id": "4d948b1c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:58.924949Z",
- "iopub.status.busy": "2023-11-15T01:37:58.924949Z",
- "iopub.status.idle": "2023-11-15T01:37:58.938401Z",
- "shell.execute_reply": "2023-11-15T01:37:58.937395Z"
+ "iopub.execute_input": "2023-11-15T16:47:22.211891Z",
+ "iopub.status.busy": "2023-11-15T16:47:22.210890Z",
+ "iopub.status.idle": "2023-11-15T16:47:22.221796Z",
+ "shell.execute_reply": "2023-11-15T16:47:22.220782Z"
},
"tags": []
},
@@ -1396,7 +1396,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "53c0c78a",
+ "id": "60f313a1",
"metadata": {
"deletable": false,
"editable": false
@@ -1439,10 +1439,10 @@
"id": "876fadba",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:59.298928Z",
- "iopub.status.busy": "2023-11-15T01:37:59.298928Z",
- "iopub.status.idle": "2023-11-15T01:37:59.722734Z",
- "shell.execute_reply": "2023-11-15T01:37:59.721721Z"
+ "iopub.execute_input": "2023-11-15T16:47:22.622342Z",
+ "iopub.status.busy": "2023-11-15T16:47:22.622342Z",
+ "iopub.status.idle": "2023-11-15T16:47:23.026608Z",
+ "shell.execute_reply": "2023-11-15T16:47:23.025600Z"
},
"tags": []
},
@@ -1472,10 +1472,10 @@
"id": "60f7b2aa",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:37:59.727733Z",
- "iopub.status.busy": "2023-11-15T01:37:59.726734Z",
- "iopub.status.idle": "2023-11-15T01:37:59.740667Z",
- "shell.execute_reply": "2023-11-15T01:37:59.739656Z"
+ "iopub.execute_input": "2023-11-15T16:47:23.032610Z",
+ "iopub.status.busy": "2023-11-15T16:47:23.031609Z",
+ "iopub.status.idle": "2023-11-15T16:47:23.046865Z",
+ "shell.execute_reply": "2023-11-15T16:47:23.045848Z"
},
"tags": []
},
@@ -1488,7 +1488,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "31740a65",
+ "id": "e2aa67fe",
"metadata": {
"deletable": false,
"editable": false
@@ -1531,10 +1531,10 @@
"id": "9ebf14f0",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:00.146885Z",
- "iopub.status.busy": "2023-11-15T01:38:00.145902Z",
- "iopub.status.idle": "2023-11-15T01:38:00.644173Z",
- "shell.execute_reply": "2023-11-15T01:38:00.643163Z"
+ "iopub.execute_input": "2023-11-15T16:47:23.442692Z",
+ "iopub.status.busy": "2023-11-15T16:47:23.441696Z",
+ "iopub.status.idle": "2023-11-15T16:47:23.955454Z",
+ "shell.execute_reply": "2023-11-15T16:47:23.954445Z"
},
"tags": []
},
@@ -1577,10 +1577,10 @@
"id": "5afbd70a",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:00.649328Z",
- "iopub.status.busy": "2023-11-15T01:38:00.648329Z",
- "iopub.status.idle": "2023-11-15T01:38:00.654130Z",
- "shell.execute_reply": "2023-11-15T01:38:00.654130Z"
+ "iopub.execute_input": "2023-11-15T16:47:23.959456Z",
+ "iopub.status.busy": "2023-11-15T16:47:23.959456Z",
+ "iopub.status.idle": "2023-11-15T16:47:23.966113Z",
+ "shell.execute_reply": "2023-11-15T16:47:23.965083Z"
}
},
"outputs": [],
@@ -1611,10 +1611,10 @@
"id": "eee29241",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:00.659144Z",
- "iopub.status.busy": "2023-11-15T01:38:00.658139Z",
- "iopub.status.idle": "2023-11-15T01:38:01.005505Z",
- "shell.execute_reply": "2023-11-15T01:38:01.004495Z"
+ "iopub.execute_input": "2023-11-15T16:47:23.970094Z",
+ "iopub.status.busy": "2023-11-15T16:47:23.970094Z",
+ "iopub.status.idle": "2023-11-15T16:47:24.303599Z",
+ "shell.execute_reply": "2023-11-15T16:47:24.302569Z"
},
"tags": []
},
@@ -1657,10 +1657,10 @@
"id": "216f387f",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:01.010507Z",
- "iopub.status.busy": "2023-11-15T01:38:01.009515Z",
- "iopub.status.idle": "2023-11-15T01:38:01.022530Z",
- "shell.execute_reply": "2023-11-15T01:38:01.021515Z"
+ "iopub.execute_input": "2023-11-15T16:47:24.307599Z",
+ "iopub.status.busy": "2023-11-15T16:47:24.307599Z",
+ "iopub.status.idle": "2023-11-15T16:47:24.319265Z",
+ "shell.execute_reply": "2023-11-15T16:47:24.318249Z"
},
"tags": []
},
@@ -1688,7 +1688,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "9f5c593d",
+ "id": "d06dfcd3",
"metadata": {
"deletable": false,
"editable": false
@@ -1731,10 +1731,10 @@
"id": "c14e0a51",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:01.036323Z",
- "iopub.status.busy": "2023-11-15T01:38:01.035330Z",
- "iopub.status.idle": "2023-11-15T01:38:01.776549Z",
- "shell.execute_reply": "2023-11-15T01:38:01.775533Z"
+ "iopub.execute_input": "2023-11-15T16:47:24.548979Z",
+ "iopub.status.busy": "2023-11-15T16:47:24.548979Z",
+ "iopub.status.idle": "2023-11-15T16:47:25.295678Z",
+ "shell.execute_reply": "2023-11-15T16:47:25.293663Z"
},
"tags": []
},
@@ -1768,10 +1768,10 @@
"deletable": false,
"editable": false,
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:01.780551Z",
- "iopub.status.busy": "2023-11-15T01:38:01.780551Z",
- "iopub.status.idle": "2023-11-15T01:38:01.787754Z",
- "shell.execute_reply": "2023-11-15T01:38:01.786744Z"
+ "iopub.execute_input": "2023-11-15T16:47:25.300674Z",
+ "iopub.status.busy": "2023-11-15T16:47:25.300674Z",
+ "iopub.status.idle": "2023-11-15T16:47:25.306772Z",
+ "shell.execute_reply": "2023-11-15T16:47:25.305757Z"
}
},
"outputs": [],
@@ -1793,10 +1793,10 @@
"id": "d5cf32d4",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:01.791755Z",
- "iopub.status.busy": "2023-11-15T01:38:01.791755Z",
- "iopub.status.idle": "2023-11-15T01:38:01.808085Z",
- "shell.execute_reply": "2023-11-15T01:38:01.807074Z"
+ "iopub.execute_input": "2023-11-15T16:47:25.311773Z",
+ "iopub.status.busy": "2023-11-15T16:47:25.310770Z",
+ "iopub.status.idle": "2023-11-15T16:47:25.332711Z",
+ "shell.execute_reply": "2023-11-15T16:47:25.331700Z"
},
"tags": []
},
@@ -1809,7 +1809,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "b9cd1ca2",
+ "id": "b73c0b5a",
"metadata": {
"deletable": false,
"editable": false
@@ -1852,10 +1852,10 @@
"id": "d35e5845",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:01.826462Z",
- "iopub.status.busy": "2023-11-15T01:38:01.825466Z",
- "iopub.status.idle": "2023-11-15T01:38:02.318200Z",
- "shell.execute_reply": "2023-11-15T01:38:02.317190Z"
+ "iopub.execute_input": "2023-11-15T16:47:25.605873Z",
+ "iopub.status.busy": "2023-11-15T16:47:25.604894Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.156395Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.155384Z"
},
"tags": []
},
@@ -1923,10 +1923,10 @@
"id": "9122e785",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.323213Z",
- "iopub.status.busy": "2023-11-15T01:38:02.322219Z",
- "iopub.status.idle": "2023-11-15T01:38:02.328861Z",
- "shell.execute_reply": "2023-11-15T01:38:02.328861Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.161414Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.161414Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.168154Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.167124Z"
},
"tags": []
},
@@ -1966,10 +1966,10 @@
"id": "ca71f37a",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.333891Z",
- "iopub.status.busy": "2023-11-15T01:38:02.333891Z",
- "iopub.status.idle": "2023-11-15T01:38:02.340234Z",
- "shell.execute_reply": "2023-11-15T01:38:02.340234Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.172135Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.172135Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.180416Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.179408Z"
},
"tags": []
},
@@ -1985,7 +1985,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "e00406c9",
+ "id": "33be1c7a",
"metadata": {
"deletable": false,
"editable": false
@@ -2012,10 +2012,10 @@
"id": "040a0ace",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.354040Z",
- "iopub.status.busy": "2023-11-15T01:38:02.353021Z",
- "iopub.status.idle": "2023-11-15T01:38:02.359564Z",
- "shell.execute_reply": "2023-11-15T01:38:02.358556Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.197080Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.197080Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.204018Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.203006Z"
}
},
"outputs": [],
@@ -2060,10 +2060,10 @@
"id": "d525c667",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.364585Z",
- "iopub.status.busy": "2023-11-15T01:38:02.364585Z",
- "iopub.status.idle": "2023-11-15T01:38:02.371009Z",
- "shell.execute_reply": "2023-11-15T01:38:02.369980Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.209019Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.209019Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.216204Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.215193Z"
}
},
"outputs": [],
@@ -2111,10 +2111,10 @@
"id": "89a09123",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.375010Z",
- "iopub.status.busy": "2023-11-15T01:38:02.375010Z",
- "iopub.status.idle": "2023-11-15T01:38:02.382770Z",
- "shell.execute_reply": "2023-11-15T01:38:02.381741Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.221205Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.220214Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.228557Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.227546Z"
},
"tags": []
},
@@ -2128,7 +2128,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "5dd9fdcc",
+ "id": "1f921179",
"metadata": {
"deletable": false,
"editable": false
@@ -2160,10 +2160,10 @@
"id": "fd040f6f",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.399916Z",
- "iopub.status.busy": "2023-11-15T01:38:02.397935Z",
- "iopub.status.idle": "2023-11-15T01:38:02.407228Z",
- "shell.execute_reply": "2023-11-15T01:38:02.406215Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.241856Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.240856Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.248436Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.248436Z"
},
"tags": []
},
@@ -2178,7 +2178,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "55bed0f1",
+ "id": "14671461",
"metadata": {
"deletable": false,
"editable": false
@@ -2222,10 +2222,10 @@
"id": "6a68bb8b",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.422920Z",
- "iopub.status.busy": "2023-11-15T01:38:02.421917Z",
- "iopub.status.idle": "2023-11-15T01:38:02.431016Z",
- "shell.execute_reply": "2023-11-15T01:38:02.430006Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.262348Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.261347Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.268419Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.268419Z"
},
"tags": []
},
@@ -2242,7 +2242,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "df406924",
+ "id": "29413aa1",
"metadata": {
"deletable": false,
"editable": false
@@ -2280,10 +2280,10 @@
"id": "7cb47a4f",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.444565Z",
- "iopub.status.busy": "2023-11-15T01:38:02.444565Z",
- "iopub.status.idle": "2023-11-15T01:38:02.452297Z",
- "shell.execute_reply": "2023-11-15T01:38:02.452297Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.282385Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.281387Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.289279Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.289279Z"
},
"tags": []
},
@@ -2298,7 +2298,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "4c424cab",
+ "id": "1fcec503",
"metadata": {
"deletable": false,
"editable": false
@@ -2331,10 +2331,10 @@
"id": "1f171980",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.466858Z",
- "iopub.status.busy": "2023-11-15T01:38:02.466858Z",
- "iopub.status.idle": "2023-11-15T01:38:02.475614Z",
- "shell.execute_reply": "2023-11-15T01:38:02.474603Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.303431Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.302429Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.311670Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.310659Z"
},
"tags": []
},
@@ -2349,7 +2349,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "2ddf8b55",
+ "id": "42f3ca92",
"metadata": {
"deletable": false,
"editable": false
@@ -2425,10 +2425,10 @@
"id": "b82200bf",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.488958Z",
- "iopub.status.busy": "2023-11-15T01:38:02.488958Z",
- "iopub.status.idle": "2023-11-15T01:38:02.496849Z",
- "shell.execute_reply": "2023-11-15T01:38:02.495823Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.325123Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.325123Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.332826Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.331821Z"
},
"tags": []
},
@@ -2465,10 +2465,10 @@
"id": "ceb68dfc",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.500868Z",
- "iopub.status.busy": "2023-11-15T01:38:02.500868Z",
- "iopub.status.idle": "2023-11-15T01:38:02.507403Z",
- "shell.execute_reply": "2023-11-15T01:38:02.507403Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.336829Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.336829Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.344529Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.343521Z"
},
"tags": []
},
@@ -2484,7 +2484,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "b90c0175",
+ "id": "592c9979",
"metadata": {
"deletable": false,
"editable": false
@@ -2513,10 +2513,10 @@
"id": "8bf83cb3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:38:02.521927Z",
- "iopub.status.busy": "2023-11-15T01:38:02.520920Z",
- "iopub.status.idle": "2023-11-15T01:38:02.529520Z",
- "shell.execute_reply": "2023-11-15T01:38:02.529520Z"
+ "iopub.execute_input": "2023-11-15T16:47:26.357637Z",
+ "iopub.status.busy": "2023-11-15T16:47:26.357637Z",
+ "iopub.status.idle": "2023-11-15T16:47:26.366306Z",
+ "shell.execute_reply": "2023-11-15T16:47:26.365299Z"
},
"tags": []
},
@@ -2528,7 +2528,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "a4d1e24f",
+ "id": "3066d460",
"metadata": {
"deletable": false,
"editable": false
diff --git a/lab-p11/public_tests.py b/lab-p11/public_tests.py
index 8da3154..9bf309b 100644
--- a/lab-p11/public_tests.py
+++ b/lab-p11/public_tests.py
@@ -53,9 +53,9 @@ def get_expected_format():
'q18': 'TEXT_FORMAT_ORDERED_LIST',
'q19': 'TEXT_FORMAT_ORDERED_LIST',
'q20': 'TEXT_FORMAT',
- 'q21': 'TEXT_FORMAT_ORDERED_LIST',
+ 'q21': 'TEXT_FORMAT_ORDERED_LIST_SLASHES',
'q22': 'TEXT_FORMAT',
- 'q23': 'TEXT_FORMAT_ORDERED_LIST'}
+ 'q23': 'TEXT_FORMAT_ORDERED_LIST_SLASHES'}
return expected_format
@@ -104,6 +104,19 @@ def compare(expected, actual, q_format=TEXT_FORMAT):
"""compare(expected, actual) is used to compare when the format of
the expected answer is known for certain."""
try:
+ if SLASHES in q_format:
+ q_format = q_format.replace(SLASHES, "").strip("_ ")
+ if q_format == TEXT_FORMAT_ORDERED_LIST:
+ if expected == sorted(expected):
+ expected = sorted(clean_slashes(expected))
+ elif expected == sorted(expected, reverse=True):
+ expected = sorted(clean_slashes(expected), reverse=True)
+ else:
+ expected = clean_slashes(expected)
+ else:
+ expected = clean_slashes(expected)
+ actual = clean_slashes(actual)
+
if q_format == TEXT_FORMAT:
return simple_compare(expected, actual)
elif q_format == TEXT_FORMAT_UNORDERED_LIST:
@@ -127,7 +140,7 @@ def compare(expected, actual, q_format=TEXT_FORMAT):
return "expected %s but found %s " % (repr(expected), repr(actual))
except:
if expected != actual:
- return "expected %s" % (repr(expected))
+ return "expected %s but found %s " % (repr(expected), repr(actual))
return PASS
@@ -451,7 +464,7 @@ def namedtuple_compare(expected, actual):
def clean_slashes(item):
"""clean_slashes()"""
if isinstance(item, str):
- return item.replace("\\", "/").replace("/", os.path.sep)
+ return type(item)(item.replace("\\", "/").replace("/", os.path.sep))
elif item == None or isinstance(item, (type, int, float, bool)):
return item
elif isinstance(item, (list, tuple, set)) or is_namedtuple(item):
@@ -560,7 +573,7 @@ def flip_dict_of_lists(item):
new_item.append(new_dict)
return new_item
-def compare_flip_dicts(expected, actual, obj="lists"):
+def compare_flip_dicts(expected, actual):
"""compare_flip_dicts(expected, actual) flips a dict of lists (or dicts) into
a list of dicts (or dict of dicts) and then compares the list ignoring order."""
msg = PASS
@@ -583,7 +596,7 @@ def compare_flip_dicts(expected, actual, obj="lists"):
for key in expected:
expected_category[key] = expected[key][cat_key]
actual_category[key] = actual[key][cat_key]
- val = list_compare_unordered(flip_dict_of_lists(expected), flip_dict_of_lists(actual), "category " + repr(cat_key))
+ val = list_compare_unordered(flip_dict_of_lists(expected_category), flip_dict_of_lists(actual_category), "category " + repr(cat_key))
if val != PASS:
return val
return msg
@@ -744,11 +757,6 @@ def check(qnum, actual):
else:
expected = _expected_json[qnum]
- if SLASHES in q_format:
- q_format = q_format.replace(SLASHES, "").strip("_ ")
- expected = clean_slashes(expected)
- actual = clean_slashes(actual)
-
if msg != PASS:
print(msg)
else:
diff --git a/p11/README.md b/p11/README.md
index 23274b5..f37944b 100644
--- a/p11/README.md
+++ b/p11/README.md
@@ -3,7 +3,7 @@
## Corrections and clarifications:
-* None yet.
+* **(11/15/2023 - 10:50 AM)**: `public_tests.py` updated. Please redownload this file if you are using MacOS.
**Find any issues?** Report to us:
diff --git a/p11/p11.ipynb b/p11/p11.ipynb
index 43f524d..4629e31 100644
--- a/p11/p11.ipynb
+++ b/p11/p11.ipynb
@@ -3,7 +3,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "0d4e51a4",
+ "id": "39744d00",
"metadata": {
"cell_type": "code",
"deletable": false,
@@ -23,10 +23,10 @@
"metadata": {
"editable": false,
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:14.125503Z",
- "iopub.status.busy": "2023-11-15T01:29:14.125503Z",
- "iopub.status.idle": "2023-11-15T01:29:17.250329Z",
- "shell.execute_reply": "2023-11-15T01:29:17.249320Z"
+ "iopub.execute_input": "2023-11-15T16:44:13.795563Z",
+ "iopub.status.busy": "2023-11-15T16:44:13.794563Z",
+ "iopub.status.idle": "2023-11-15T16:44:16.464230Z",
+ "shell.execute_reply": "2023-11-15T16:44:16.463220Z"
}
},
"outputs": [],
@@ -40,10 +40,10 @@
"id": "db59b584",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:17.254332Z",
- "iopub.status.busy": "2023-11-15T01:29:17.254332Z",
- "iopub.status.idle": "2023-11-15T01:29:17.259617Z",
- "shell.execute_reply": "2023-11-15T01:29:17.258611Z"
+ "iopub.execute_input": "2023-11-15T16:44:16.469243Z",
+ "iopub.status.busy": "2023-11-15T16:44:16.468243Z",
+ "iopub.status.idle": "2023-11-15T16:44:16.473554Z",
+ "shell.execute_reply": "2023-11-15T16:44:16.472543Z"
}
},
"outputs": [],
@@ -294,10 +294,10 @@
"id": "3c7058fc",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:17.265639Z",
- "iopub.status.busy": "2023-11-15T01:29:17.264624Z",
- "iopub.status.idle": "2023-11-15T01:29:17.939313Z",
- "shell.execute_reply": "2023-11-15T01:29:17.938304Z"
+ "iopub.execute_input": "2023-11-15T16:44:16.478565Z",
+ "iopub.status.busy": "2023-11-15T16:44:16.477564Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.109739Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.108726Z"
},
"tags": []
},
@@ -326,10 +326,10 @@
"id": "d8f07acf",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:17.944332Z",
- "iopub.status.busy": "2023-11-15T01:29:17.943313Z",
- "iopub.status.idle": "2023-11-15T01:29:17.951509Z",
- "shell.execute_reply": "2023-11-15T01:29:17.950496Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.115737Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.113737Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.121322Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.120313Z"
},
"tags": []
},
@@ -344,10 +344,10 @@
"id": "d055f32e",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:17.955526Z",
- "iopub.status.busy": "2023-11-15T01:29:17.955526Z",
- "iopub.status.idle": "2023-11-15T01:29:17.961302Z",
- "shell.execute_reply": "2023-11-15T01:29:17.960291Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.125324Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.125324Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.131482Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.130469Z"
},
"tags": []
},
@@ -362,10 +362,10 @@
"id": "3e9faed4",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:17.965320Z",
- "iopub.status.busy": "2023-11-15T01:29:17.965320Z",
- "iopub.status.idle": "2023-11-15T01:29:17.984198Z",
- "shell.execute_reply": "2023-11-15T01:29:17.983183Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.134479Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.134479Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.146161Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.145152Z"
},
"tags": []
},
@@ -380,10 +380,10 @@
"id": "84ff604d",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:17.988213Z",
- "iopub.status.busy": "2023-11-15T01:29:17.988213Z",
- "iopub.status.idle": "2023-11-15T01:29:17.996929Z",
- "shell.execute_reply": "2023-11-15T01:29:17.995916Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.150183Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.150183Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.158936Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.157921Z"
},
"tags": []
},
@@ -398,10 +398,10 @@
"id": "4edbb641",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.000867Z",
- "iopub.status.busy": "2023-11-15T01:29:18.000867Z",
- "iopub.status.idle": "2023-11-15T01:29:18.192401Z",
- "shell.execute_reply": "2023-11-15T01:29:18.191391Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.162953Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.162953Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.280314Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.279304Z"
},
"tags": []
},
@@ -416,10 +416,10 @@
"id": "a29bb092",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.197404Z",
- "iopub.status.busy": "2023-11-15T01:29:18.196412Z",
- "iopub.status.idle": "2023-11-15T01:29:18.205324Z",
- "shell.execute_reply": "2023-11-15T01:29:18.204313Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.284335Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.284335Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.290460Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.289419Z"
},
"tags": []
},
@@ -434,10 +434,10 @@
"id": "fc05e373",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.210324Z",
- "iopub.status.busy": "2023-11-15T01:29:18.209325Z",
- "iopub.status.idle": "2023-11-15T01:29:18.216864Z",
- "shell.execute_reply": "2023-11-15T01:29:18.215850Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.295434Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.294454Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.300421Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.299391Z"
},
"tags": []
},
@@ -452,10 +452,10 @@
"id": "9d2d74f3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.221870Z",
- "iopub.status.busy": "2023-11-15T01:29:18.220862Z",
- "iopub.status.idle": "2023-11-15T01:29:18.245578Z",
- "shell.execute_reply": "2023-11-15T01:29:18.244569Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.303390Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.303390Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.316981Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.315972Z"
},
"tags": []
},
@@ -470,10 +470,10 @@
"id": "9a3837f3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.251580Z",
- "iopub.status.busy": "2023-11-15T01:29:18.251580Z",
- "iopub.status.idle": "2023-11-15T01:29:18.262762Z",
- "shell.execute_reply": "2023-11-15T01:29:18.261751Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.320981Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.320981Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.332186Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.331154Z"
},
"tags": []
},
@@ -488,10 +488,10 @@
"id": "48873401",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.268762Z",
- "iopub.status.busy": "2023-11-15T01:29:18.267763Z",
- "iopub.status.idle": "2023-11-15T01:29:18.416600Z",
- "shell.execute_reply": "2023-11-15T01:29:18.415591Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.337166Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.336170Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.410102Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.409089Z"
},
"tags": []
},
@@ -517,10 +517,10 @@
"id": "82659dd6",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.421621Z",
- "iopub.status.busy": "2023-11-15T01:29:18.420600Z",
- "iopub.status.idle": "2023-11-15T01:29:18.427262Z",
- "shell.execute_reply": "2023-11-15T01:29:18.426251Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.414120Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.414120Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.419706Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.418693Z"
},
"tags": []
},
@@ -540,10 +540,10 @@
"id": "9e6ac2ea",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.432275Z",
- "iopub.status.busy": "2023-11-15T01:29:18.431264Z",
- "iopub.status.idle": "2023-11-15T01:29:18.438610Z",
- "shell.execute_reply": "2023-11-15T01:29:18.437599Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.423716Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.423716Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.429719Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.428707Z"
},
"tags": []
},
@@ -607,10 +607,10 @@
"id": "3c5fdc49",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.442612Z",
- "iopub.status.busy": "2023-11-15T01:29:18.442612Z",
- "iopub.status.idle": "2023-11-15T01:29:18.452697Z",
- "shell.execute_reply": "2023-11-15T01:29:18.451684Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.433731Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.433731Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.442379Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.441370Z"
},
"tags": []
},
@@ -622,7 +622,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "1f6d1457",
+ "id": "dbd0bd29",
"metadata": {
"deletable": false,
"editable": false
@@ -662,10 +662,10 @@
"id": "ccc96a1d",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.506669Z",
- "iopub.status.busy": "2023-11-15T01:29:18.506669Z",
- "iopub.status.idle": "2023-11-15T01:29:18.515069Z",
- "shell.execute_reply": "2023-11-15T01:29:18.514057Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.485295Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.485295Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.491330Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.491330Z"
},
"tags": []
},
@@ -677,7 +677,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "655f8b11",
+ "id": "89c60a3a",
"metadata": {
"deletable": false,
"editable": false
@@ -725,10 +725,10 @@
"id": "41e7253b",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.560414Z",
- "iopub.status.busy": "2023-11-15T01:29:18.560414Z",
- "iopub.status.idle": "2023-11-15T01:29:18.569612Z",
- "shell.execute_reply": "2023-11-15T01:29:18.568597Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.531875Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.531875Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.538832Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.538116Z"
},
"tags": []
},
@@ -740,7 +740,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "1073076e",
+ "id": "5f43c083",
"metadata": {
"deletable": false,
"editable": false
@@ -784,10 +784,10 @@
"id": "e12fe649",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.615949Z",
- "iopub.status.busy": "2023-11-15T01:29:18.614948Z",
- "iopub.status.idle": "2023-11-15T01:29:18.624981Z",
- "shell.execute_reply": "2023-11-15T01:29:18.623973Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.579078Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.579078Z",
+ "iopub.status.idle": "2023-11-15T16:44:17.587540Z",
+ "shell.execute_reply": "2023-11-15T16:44:17.586533Z"
},
"tags": []
},
@@ -800,7 +800,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "1ad78e3e",
+ "id": "2a2bf865",
"metadata": {
"deletable": false,
"editable": false
@@ -858,10 +858,10 @@
"id": "1ad0c854",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:18.988940Z",
- "iopub.status.busy": "2023-11-15T01:29:18.987938Z",
- "iopub.status.idle": "2023-11-15T01:29:19.333121Z",
- "shell.execute_reply": "2023-11-15T01:29:19.332111Z"
+ "iopub.execute_input": "2023-11-15T16:44:17.858690Z",
+ "iopub.status.busy": "2023-11-15T16:44:17.858690Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.176964Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.175955Z"
},
"tags": []
},
@@ -887,10 +887,10 @@
"id": "3b99c423",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:19.337121Z",
- "iopub.status.busy": "2023-11-15T01:29:19.337121Z",
- "iopub.status.idle": "2023-11-15T01:29:19.341721Z",
- "shell.execute_reply": "2023-11-15T01:29:19.340710Z"
+ "iopub.execute_input": "2023-11-15T16:44:18.180965Z",
+ "iopub.status.busy": "2023-11-15T16:44:18.180965Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.184377Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.184377Z"
}
},
"outputs": [],
@@ -920,10 +920,10 @@
"id": "f9f6277c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:19.345721Z",
- "iopub.status.busy": "2023-11-15T01:29:19.345721Z",
- "iopub.status.idle": "2023-11-15T01:29:19.356138Z",
- "shell.execute_reply": "2023-11-15T01:29:19.355133Z"
+ "iopub.execute_input": "2023-11-15T16:44:18.185501Z",
+ "iopub.status.busy": "2023-11-15T16:44:18.185501Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.198164Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.197157Z"
},
"tags": []
},
@@ -936,7 +936,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "cbdd1ab0",
+ "id": "96212ef2",
"metadata": {
"deletable": false,
"editable": false
@@ -994,10 +994,10 @@
"id": "0551009d",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:19.731208Z",
- "iopub.status.busy": "2023-11-15T01:29:19.731208Z",
- "iopub.status.idle": "2023-11-15T01:29:20.051737Z",
- "shell.execute_reply": "2023-11-15T01:29:20.050725Z"
+ "iopub.execute_input": "2023-11-15T16:44:18.565165Z",
+ "iopub.status.busy": "2023-11-15T16:44:18.565165Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.845598Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.844568Z"
},
"tags": []
},
@@ -1023,10 +1023,10 @@
"id": "0e64cd0d",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.056750Z",
- "iopub.status.busy": "2023-11-15T01:29:20.055742Z",
- "iopub.status.idle": "2023-11-15T01:29:20.061809Z",
- "shell.execute_reply": "2023-11-15T01:29:20.060797Z"
+ "iopub.execute_input": "2023-11-15T16:44:18.849598Z",
+ "iopub.status.busy": "2023-11-15T16:44:18.849598Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.854290Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.853275Z"
}
},
"outputs": [],
@@ -1071,10 +1071,10 @@
"id": "4c4b8a16",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.066820Z",
- "iopub.status.busy": "2023-11-15T01:29:20.066820Z",
- "iopub.status.idle": "2023-11-15T01:29:20.078396Z",
- "shell.execute_reply": "2023-11-15T01:29:20.077370Z"
+ "iopub.execute_input": "2023-11-15T16:44:18.858309Z",
+ "iopub.status.busy": "2023-11-15T16:44:18.858309Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.879096Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.877083Z"
},
"tags": []
},
@@ -1087,7 +1087,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "a8a0a952",
+ "id": "3e0d0aa6",
"metadata": {
"deletable": false,
"editable": false
@@ -1135,10 +1135,10 @@
"id": "e00b7011",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.113804Z",
- "iopub.status.busy": "2023-11-15T01:29:20.112806Z",
- "iopub.status.idle": "2023-11-15T01:29:20.124825Z",
- "shell.execute_reply": "2023-11-15T01:29:20.123815Z"
+ "iopub.execute_input": "2023-11-15T16:44:18.950152Z",
+ "iopub.status.busy": "2023-11-15T16:44:18.950152Z",
+ "iopub.status.idle": "2023-11-15T16:44:18.965281Z",
+ "shell.execute_reply": "2023-11-15T16:44:18.964271Z"
},
"tags": []
},
@@ -1159,7 +1159,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "f5fc4994",
+ "id": "5ea5a5f7",
"metadata": {
"deletable": false,
"editable": false
@@ -1186,10 +1186,10 @@
"id": "d13cce68",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.168229Z",
- "iopub.status.busy": "2023-11-15T01:29:20.167248Z",
- "iopub.status.idle": "2023-11-15T01:29:20.172479Z",
- "shell.execute_reply": "2023-11-15T01:29:20.171468Z"
+ "iopub.execute_input": "2023-11-15T16:44:19.015474Z",
+ "iopub.status.busy": "2023-11-15T16:44:19.015474Z",
+ "iopub.status.idle": "2023-11-15T16:44:19.019011Z",
+ "shell.execute_reply": "2023-11-15T16:44:19.019011Z"
}
},
"outputs": [],
@@ -1234,10 +1234,10 @@
"id": "e62245f0",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.177478Z",
- "iopub.status.busy": "2023-11-15T01:29:20.176486Z",
- "iopub.status.idle": "2023-11-15T01:29:20.190332Z",
- "shell.execute_reply": "2023-11-15T01:29:20.189319Z"
+ "iopub.execute_input": "2023-11-15T16:44:19.025022Z",
+ "iopub.status.busy": "2023-11-15T16:44:19.024018Z",
+ "iopub.status.idle": "2023-11-15T16:44:19.039046Z",
+ "shell.execute_reply": "2023-11-15T16:44:19.038034Z"
},
"tags": []
},
@@ -1258,7 +1258,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "5297e0b1",
+ "id": "77910e67",
"metadata": {
"deletable": false,
"editable": false
@@ -1316,10 +1316,10 @@
"id": "bb3bdb77",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.252163Z",
- "iopub.status.busy": "2023-11-15T01:29:20.252163Z",
- "iopub.status.idle": "2023-11-15T01:29:20.756306Z",
- "shell.execute_reply": "2023-11-15T01:29:20.755295Z"
+ "iopub.execute_input": "2023-11-15T16:44:19.355076Z",
+ "iopub.status.busy": "2023-11-15T16:44:19.354073Z",
+ "iopub.status.idle": "2023-11-15T16:44:19.844298Z",
+ "shell.execute_reply": "2023-11-15T16:44:19.843288Z"
},
"tags": []
},
@@ -1345,10 +1345,10 @@
"id": "382a8483",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.761304Z",
- "iopub.status.busy": "2023-11-15T01:29:20.760303Z",
- "iopub.status.idle": "2023-11-15T01:29:20.765577Z",
- "shell.execute_reply": "2023-11-15T01:29:20.764569Z"
+ "iopub.execute_input": "2023-11-15T16:44:19.848318Z",
+ "iopub.status.busy": "2023-11-15T16:44:19.848318Z",
+ "iopub.status.idle": "2023-11-15T16:44:19.853061Z",
+ "shell.execute_reply": "2023-11-15T16:44:19.852052Z"
}
},
"outputs": [],
@@ -1389,10 +1389,10 @@
"id": "e05f4d55",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.771576Z",
- "iopub.status.busy": "2023-11-15T01:29:20.771576Z",
- "iopub.status.idle": "2023-11-15T01:29:20.787616Z",
- "shell.execute_reply": "2023-11-15T01:29:20.786604Z"
+ "iopub.execute_input": "2023-11-15T16:44:19.858062Z",
+ "iopub.status.busy": "2023-11-15T16:44:19.857061Z",
+ "iopub.status.idle": "2023-11-15T16:44:19.874782Z",
+ "shell.execute_reply": "2023-11-15T16:44:19.873773Z"
},
"tags": []
},
@@ -1405,7 +1405,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "2498b21f",
+ "id": "17786cee",
"metadata": {
"deletable": false,
"editable": false
@@ -1463,10 +1463,10 @@
"id": "ca05890a",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:20.859828Z",
- "iopub.status.busy": "2023-11-15T01:29:20.858825Z",
- "iopub.status.idle": "2023-11-15T01:29:21.342078Z",
- "shell.execute_reply": "2023-11-15T01:29:21.341065Z"
+ "iopub.execute_input": "2023-11-15T16:44:20.194444Z",
+ "iopub.status.busy": "2023-11-15T16:44:20.194444Z",
+ "iopub.status.idle": "2023-11-15T16:44:20.652586Z",
+ "shell.execute_reply": "2023-11-15T16:44:20.651573Z"
},
"tags": []
},
@@ -1492,10 +1492,10 @@
"id": "f52cd2c2",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:21.346075Z",
- "iopub.status.busy": "2023-11-15T01:29:21.346075Z",
- "iopub.status.idle": "2023-11-15T01:29:21.351143Z",
- "shell.execute_reply": "2023-11-15T01:29:21.350122Z"
+ "iopub.execute_input": "2023-11-15T16:44:20.658604Z",
+ "iopub.status.busy": "2023-11-15T16:44:20.657583Z",
+ "iopub.status.idle": "2023-11-15T16:44:20.662817Z",
+ "shell.execute_reply": "2023-11-15T16:44:20.661787Z"
}
},
"outputs": [],
@@ -1538,10 +1538,10 @@
"id": "2e3308a4",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:21.356136Z",
- "iopub.status.busy": "2023-11-15T01:29:21.355155Z",
- "iopub.status.idle": "2023-11-15T01:29:21.368686Z",
- "shell.execute_reply": "2023-11-15T01:29:21.367680Z"
+ "iopub.execute_input": "2023-11-15T16:44:20.666797Z",
+ "iopub.status.busy": "2023-11-15T16:44:20.666797Z",
+ "iopub.status.idle": "2023-11-15T16:44:20.681752Z",
+ "shell.execute_reply": "2023-11-15T16:44:20.680742Z"
},
"tags": []
},
@@ -1554,7 +1554,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "74c4c4a1",
+ "id": "a2450c2c",
"metadata": {
"deletable": false,
"editable": false
@@ -1608,10 +1608,10 @@
"id": "c961e343",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:21.715379Z",
- "iopub.status.busy": "2023-11-15T01:29:21.714363Z",
- "iopub.status.idle": "2023-11-15T01:29:22.188648Z",
- "shell.execute_reply": "2023-11-15T01:29:22.185648Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.119940Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.119940Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.482938Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.481927Z"
},
"tags": []
},
@@ -1639,10 +1639,10 @@
"id": "93eb0c3e",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.198650Z",
- "iopub.status.busy": "2023-11-15T01:29:22.197649Z",
- "iopub.status.idle": "2023-11-15T01:29:22.205793Z",
- "shell.execute_reply": "2023-11-15T01:29:22.204781Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.486938Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.486938Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.491998Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.490963Z"
}
},
"outputs": [],
@@ -1717,10 +1717,10 @@
"id": "8517fd60",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.215796Z",
- "iopub.status.busy": "2023-11-15T01:29:22.214796Z",
- "iopub.status.idle": "2023-11-15T01:29:22.229237Z",
- "shell.execute_reply": "2023-11-15T01:29:22.227224Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.495999Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.494976Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.502658Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.501641Z"
},
"lines_to_next_cell": 0,
"tags": []
@@ -1740,7 +1740,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "ea279634",
+ "id": "82367c97",
"metadata": {
"deletable": false,
"editable": false
@@ -1771,10 +1771,10 @@
"id": "ea5c9c38",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.320492Z",
- "iopub.status.busy": "2023-11-15T01:29:22.320492Z",
- "iopub.status.idle": "2023-11-15T01:29:22.330760Z",
- "shell.execute_reply": "2023-11-15T01:29:22.329747Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.561428Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.561428Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.568546Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.567533Z"
},
"lines_to_next_cell": 0,
"tags": []
@@ -1787,7 +1787,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "8522e746",
+ "id": "dc0ed862",
"metadata": {
"deletable": false,
"editable": false
@@ -1821,10 +1821,10 @@
"id": "428924ec",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.378535Z",
- "iopub.status.busy": "2023-11-15T01:29:22.377536Z",
- "iopub.status.idle": "2023-11-15T01:29:22.388005Z",
- "shell.execute_reply": "2023-11-15T01:29:22.388005Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.608428Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.608428Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.618673Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.617660Z"
},
"lines_to_next_cell": 0,
"tags": []
@@ -1837,7 +1837,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "bd561cc6",
+ "id": "642883b9",
"metadata": {
"deletable": false,
"editable": false
@@ -1866,10 +1866,10 @@
"id": "48766e8d",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.436159Z",
- "iopub.status.busy": "2023-11-15T01:29:22.436159Z",
- "iopub.status.idle": "2023-11-15T01:29:22.450273Z",
- "shell.execute_reply": "2023-11-15T01:29:22.448256Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.660042Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.659022Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.667002Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.665993Z"
},
"lines_to_next_cell": 0,
"tags": []
@@ -1882,7 +1882,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "7c95e492",
+ "id": "7ead2b54",
"metadata": {
"deletable": false,
"editable": false
@@ -1911,10 +1911,10 @@
"id": "55620533",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.511177Z",
- "iopub.status.busy": "2023-11-15T01:29:22.510178Z",
- "iopub.status.idle": "2023-11-15T01:29:22.527417Z",
- "shell.execute_reply": "2023-11-15T01:29:22.527417Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.707508Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.706509Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.721190Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.720166Z"
},
"lines_to_next_cell": 0,
"tags": []
@@ -1927,7 +1927,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "2b46866b",
+ "id": "e94d15eb",
"metadata": {
"deletable": false,
"editable": false
@@ -1962,10 +1962,10 @@
"id": "543a9fc0",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.560012Z",
- "iopub.status.busy": "2023-11-15T01:29:22.559013Z",
- "iopub.status.idle": "2023-11-15T01:29:22.655574Z",
- "shell.execute_reply": "2023-11-15T01:29:22.654564Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.752806Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.752806Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.810927Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.809918Z"
},
"tags": []
},
@@ -1983,7 +1983,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "c55e646f",
+ "id": "af29d62a",
"metadata": {
"deletable": false,
"editable": false
@@ -2055,10 +2055,10 @@
"id": "842264ba",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.706225Z",
- "iopub.status.busy": "2023-11-15T01:29:22.706225Z",
- "iopub.status.idle": "2023-11-15T01:29:22.710617Z",
- "shell.execute_reply": "2023-11-15T01:29:22.710617Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.866353Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.865354Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.872414Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.871404Z"
},
"tags": []
},
@@ -2070,7 +2070,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "92a40936",
+ "id": "6b31dd41",
"metadata": {
"deletable": false,
"editable": false
@@ -2099,10 +2099,10 @@
"id": "2bee6aae",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.737247Z",
- "iopub.status.busy": "2023-11-15T01:29:22.737247Z",
- "iopub.status.idle": "2023-11-15T01:29:22.745567Z",
- "shell.execute_reply": "2023-11-15T01:29:22.744553Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.895768Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.895768Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.902848Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.901837Z"
},
"tags": []
},
@@ -2114,7 +2114,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "9813b514",
+ "id": "0c0000bc",
"metadata": {
"deletable": false,
"editable": false
@@ -2162,10 +2162,10 @@
"id": "c35f568e",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.789056Z",
- "iopub.status.busy": "2023-11-15T01:29:22.789056Z",
- "iopub.status.idle": "2023-11-15T01:29:22.795966Z",
- "shell.execute_reply": "2023-11-15T01:29:22.794953Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.942552Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.942552Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.948374Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.947365Z"
},
"tags": []
},
@@ -2177,7 +2177,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "9c46526a",
+ "id": "1e0a815f",
"metadata": {
"deletable": false,
"editable": false
@@ -2206,10 +2206,10 @@
"id": "866d7351",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.818560Z",
- "iopub.status.busy": "2023-11-15T01:29:22.818560Z",
- "iopub.status.idle": "2023-11-15T01:29:22.827084Z",
- "shell.execute_reply": "2023-11-15T01:29:22.826075Z"
+ "iopub.execute_input": "2023-11-15T16:44:21.971527Z",
+ "iopub.status.busy": "2023-11-15T16:44:21.971527Z",
+ "iopub.status.idle": "2023-11-15T16:44:21.979310Z",
+ "shell.execute_reply": "2023-11-15T16:44:21.978302Z"
},
"tags": []
},
@@ -2221,7 +2221,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "87703ee8",
+ "id": "0241da49",
"metadata": {
"deletable": false,
"editable": false
@@ -2275,10 +2275,10 @@
"id": "87eedb8c",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.874218Z",
- "iopub.status.busy": "2023-11-15T01:29:22.873219Z",
- "iopub.status.idle": "2023-11-15T01:29:22.880868Z",
- "shell.execute_reply": "2023-11-15T01:29:22.879858Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.019846Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.019846Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.026104Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.025078Z"
},
"tags": []
},
@@ -2290,7 +2290,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "eb780cd3",
+ "id": "42221683",
"metadata": {
"deletable": false,
"editable": false
@@ -2319,10 +2319,10 @@
"id": "8ff90461",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.912979Z",
- "iopub.status.busy": "2023-11-15T01:29:22.911980Z",
- "iopub.status.idle": "2023-11-15T01:29:22.921042Z",
- "shell.execute_reply": "2023-11-15T01:29:22.920030Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.049535Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.048537Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.057285Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.056593Z"
},
"tags": []
},
@@ -2334,7 +2334,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "43fbc4bb",
+ "id": "9490658b",
"metadata": {
"deletable": false,
"editable": false
@@ -2365,10 +2365,10 @@
"id": "571c3099",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:22.967102Z",
- "iopub.status.busy": "2023-11-15T01:29:22.966102Z",
- "iopub.status.idle": "2023-11-15T01:29:22.994935Z",
- "shell.execute_reply": "2023-11-15T01:29:22.993927Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.097673Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.097673Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.120537Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.119528Z"
},
"tags": []
},
@@ -2380,7 +2380,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "3b457b20",
+ "id": "3581e579",
"metadata": {
"deletable": false,
"editable": false
@@ -2428,10 +2428,10 @@
"id": "a6abc3d1",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:23.048013Z",
- "iopub.status.busy": "2023-11-15T01:29:23.048013Z",
- "iopub.status.idle": "2023-11-15T01:29:23.053203Z",
- "shell.execute_reply": "2023-11-15T01:29:23.053203Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.169687Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.169687Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.175373Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.174366Z"
},
"tags": []
},
@@ -2443,7 +2443,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "e2ecd557",
+ "id": "b82666ad",
"metadata": {
"deletable": false,
"editable": false
@@ -2472,10 +2472,10 @@
"id": "add522b3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:23.077256Z",
- "iopub.status.busy": "2023-11-15T01:29:23.077256Z",
- "iopub.status.idle": "2023-11-15T01:29:23.085981Z",
- "shell.execute_reply": "2023-11-15T01:29:23.084966Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.197054Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.196052Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.204952Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.203944Z"
},
"tags": []
},
@@ -2487,7 +2487,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "43e3bce4",
+ "id": "039195fd",
"metadata": {
"deletable": false,
"editable": false
@@ -2516,10 +2516,10 @@
"id": "4a9c9ce3",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:23.138882Z",
- "iopub.status.busy": "2023-11-15T01:29:23.138882Z",
- "iopub.status.idle": "2023-11-15T01:29:23.150591Z",
- "shell.execute_reply": "2023-11-15T01:29:23.149583Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.240123Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.240123Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.256381Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.255371Z"
},
"tags": []
},
@@ -2531,7 +2531,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "6638a57c",
+ "id": "e8f7fde0",
"metadata": {
"deletable": false,
"editable": false
@@ -2577,10 +2577,10 @@
"id": "ec5b1d1b",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:23.200819Z",
- "iopub.status.busy": "2023-11-15T01:29:23.200819Z",
- "iopub.status.idle": "2023-11-15T01:29:23.231240Z",
- "shell.execute_reply": "2023-11-15T01:29:23.230207Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.305700Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.304700Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.334762Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.333750Z"
},
"tags": []
},
@@ -2592,7 +2592,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "e644a763",
+ "id": "f5c725ff",
"metadata": {
"deletable": false,
"editable": false
@@ -2619,10 +2619,10 @@
"id": "e27f6114",
"metadata": {
"execution": {
- "iopub.execute_input": "2023-11-15T01:29:23.288336Z",
- "iopub.status.busy": "2023-11-15T01:29:23.288336Z",
- "iopub.status.idle": "2023-11-15T01:29:23.293012Z",
- "shell.execute_reply": "2023-11-15T01:29:23.291979Z"
+ "iopub.execute_input": "2023-11-15T16:44:22.388317Z",
+ "iopub.status.busy": "2023-11-15T16:44:22.387315Z",
+ "iopub.status.idle": "2023-11-15T16:44:22.392227Z",
+ "shell.execute_reply": "2023-11-15T16:44:22.391220Z"
}
},
"outputs": [],
@@ -2634,7 +2634,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "e573dd76",
+ "id": "55d1f48d",
"metadata": {
"deletable": false,
"editable": false
@@ -2647,7 +2647,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "9648a334",
+ "id": "7fe35ef8",
"metadata": {
"deletable": false,
"editable": false
@@ -2659,7 +2659,7 @@
},
{
"cell_type": "markdown",
- "id": "dd1b15c0",
+ "id": "1e9efce3",
"metadata": {
"deletable": false,
"editable": false
@@ -2682,7 +2682,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "0fe20ac9",
+ "id": "9aa4abeb",
"metadata": {
"cell_type": "code",
"deletable": false,
@@ -2698,7 +2698,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "31ca3fde",
+ "id": "3ad25124",
"metadata": {
"cell_type": "code",
"deletable": false,
@@ -2712,7 +2712,7 @@
{
"cell_type": "code",
"execution_count": null,
- "id": "4acd40b3",
+ "id": "9b9cfa44",
"metadata": {
"cell_type": "code",
"deletable": false,
@@ -2726,7 +2726,7 @@
},
{
"cell_type": "markdown",
- "id": "02e78338",
+ "id": "3441a17b",
"metadata": {
"deletable": false,
"editable": false
diff --git a/p11/public_tests.py b/p11/public_tests.py
index 2cf8408..f27c185 100644
--- a/p11/public_tests.py
+++ b/p11/public_tests.py
@@ -202,6 +202,19 @@ def compare(expected, actual, q_format=TEXT_FORMAT):
"""compare(expected, actual) is used to compare when the format of
the expected answer is known for certain."""
try:
+ if SLASHES in q_format:
+ q_format = q_format.replace(SLASHES, "").strip("_ ")
+ if q_format == TEXT_FORMAT_ORDERED_LIST:
+ if expected == sorted(expected):
+ expected = sorted(clean_slashes(expected))
+ elif expected == sorted(expected, reverse=True):
+ expected = sorted(clean_slashes(expected), reverse=True)
+ else:
+ expected = clean_slashes(expected)
+ else:
+ expected = clean_slashes(expected)
+ actual = clean_slashes(actual)
+
if q_format == TEXT_FORMAT:
return simple_compare(expected, actual)
elif q_format == TEXT_FORMAT_UNORDERED_LIST:
@@ -225,7 +238,7 @@ def compare(expected, actual, q_format=TEXT_FORMAT):
return "expected %s but found %s " % (repr(expected), repr(actual))
except:
if expected != actual:
- return "expected %s" % (repr(expected))
+ return "expected %s but found %s " % (repr(expected), repr(actual))
return PASS
@@ -658,7 +671,7 @@ def flip_dict_of_lists(item):
new_item.append(new_dict)
return new_item
-def compare_flip_dicts(expected, actual, obj="lists"):
+def compare_flip_dicts(expected, actual):
"""compare_flip_dicts(expected, actual) flips a dict of lists (or dicts) into
a list of dicts (or dict of dicts) and then compares the list ignoring order."""
msg = PASS
@@ -681,7 +694,7 @@ def compare_flip_dicts(expected, actual, obj="lists"):
for key in expected:
expected_category[key] = expected[key][cat_key]
actual_category[key] = actual[key][cat_key]
- val = list_compare_unordered(flip_dict_of_lists(expected), flip_dict_of_lists(actual), "category " + repr(cat_key))
+ val = list_compare_unordered(flip_dict_of_lists(expected_category), flip_dict_of_lists(actual_category), "category " + repr(cat_key))
if val != PASS:
return val
return msg
@@ -846,11 +859,6 @@ def check(qnum, actual):
else:
expected = _expected_json[qnum]
- if SLASHES in q_format:
- q_format = q_format.replace(SLASHES, "").strip("_ ")
- expected = clean_slashes(expected)
- actual = clean_slashes(actual)
-
if msg != PASS:
print(msg)
else:
--
GitLab