sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup notebooks

Browse Source
pull/31124/head
Cameron Clough 1 year ago
parent 82ba958eff
commit bf1526fbc4
2 changed files with 43 additions and 196 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 149
      selfdrive/car/ford/tests/ford_fuzzy_fingerprint.ipynb
  2. 90
      selfdrive/car/ford/tests/test_match.ipynb

149
selfdrive/car/ford/tests/ford_fuzzy_fingerprint.ipynb
Unescape View File

@ -30,7 +30,7 @@
{ {
"data": { "data": {
"application/vnd.jupyter.widget-view+json": { "application/vnd.jupyter.widget-view+json": {
"model_id": "1f0a7e43c6374bafa78941befed85958", "model_id": "9ddb0675cd4a4f46a23b608252324ed4",
"version_major": 2, "version_major": 2,
"version_minor": 0 "version_minor": 0
}, },
@ -86,23 +86,7 @@
" engine b'PZ6A-14C204-JE'\n", " engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n", " eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n", " fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n", "Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n", "Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n", "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n", " source: fw\n",
@ -145,38 +129,6 @@
" engine b'PZ6A-14C204-JE'\n", " engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n", " eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n", " fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E34PRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n", "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n", " source: fw\n",
" fuzzy: True\n", " fuzzy: True\n",
@ -186,6 +138,7 @@
" eps b'NZ6C-14D003-AL'\n", " eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n", " fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n", "Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n", "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n", " source: fw\n",
" fuzzy: True\n", " fuzzy: True\n",
@ -210,23 +163,7 @@
" engine b'PZ6A-14C204-JE'\n", " engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n", " eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n", " fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n", "Success rate: 95.70%\n"
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
" car_fw:\n",
" abs b'PZ6C-2D053-ED'\n",
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"Success rate: 92.58%\n"
] ]
}, },
{ {
@ -267,61 +204,61 @@
" <tr>\n", " <tr>\n",
" <th>1</th>\n", " <th>1</th>\n",
" <td>fw</td>\n", " <td>fw</td>\n",
" <td>FORD MAVERICK 1ST GEN</td>\n",
" <td>mock</td>\n",
" <td>False</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
" <td>fw</td>\n",
" <td>FORD ESCAPE 4TH GEN</td>\n", " <td>FORD ESCAPE 4TH GEN</td>\n",
" <td>FORD ESCAPE 4TH GEN</td>\n", " <td>FORD ESCAPE 4TH GEN</td>\n",
" <td>True</td>\n", " <td>True</td>\n",
" </tr>\n", " </tr>\n",
" <tr>\n", " <tr>\n",
" <th>6</th>\n", " <th>5</th>\n",
" <td>fw</td>\n",
" <td>FORD FOCUS 4TH GEN</td>\n",
" <td>FORD FOCUS 4TH GEN</td>\n",
" <td>True</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
" <td>fixed</td>\n", " <td>fixed</td>\n",
" <td>FORD EXPLORER 6TH GEN</td>\n", " <td>FORD EXPLORER 6TH GEN</td>\n",
" <td>FORD EXPLORER 6TH GEN</td>\n", " <td>FORD EXPLORER 6TH GEN</td>\n",
" <td>True</td>\n", " <td>True</td>\n",
" </tr>\n", " </tr>\n",
" <tr>\n", " <tr>\n",
" <th>10</th>\n", " <th>8</th>\n",
" <td>fw</td>\n", " <td>fw</td>\n",
" <td>FORD EXPLORER 6TH GEN</td>\n", " <td>FORD EXPLORER 6TH GEN</td>\n",
" <td>FORD EXPLORER 6TH GEN</td>\n", " <td>FORD EXPLORER 6TH GEN</td>\n",
" <td>True</td>\n", " <td>True</td>\n",
" </tr>\n", " </tr>\n",
" <tr>\n", " <tr>\n",
" <th>19</th>\n", " <th>11</th>\n",
" <td>fw</td>\n", " <td>fw</td>\n",
" <td>FORD MAVERICK 1ST GEN</td>\n", " <td>FORD MAVERICK 1ST GEN</td>\n",
" <td>FORD MAVERICK 1ST GEN</td>\n", " <td>FORD MAVERICK 1ST GEN</td>\n",
" <td>True</td>\n", " <td>True</td>\n",
" </tr>\n", " </tr>\n",
" <tr>\n", " <tr>\n",
" <th>41</th>\n", " <th>12</th>\n",
" <td>fw</td>\n", " <td>fw</td>\n",
" <td>FORD F-150 LIGHTNING 1ST GEN</td>\n", " <td>FORD MAVERICK 1ST GEN</td>\n",
" <td>FORD F-150 LIGHTNING 1ST GEN</td>\n", " <td>mock</td>\n",
" <td>False</td>\n",
" </tr>\n",
" <tr>\n",
" <th>17</th>\n",
" <td>fw</td>\n",
" <td>FORD FOCUS 4TH GEN</td>\n",
" <td>FORD FOCUS 4TH GEN</td>\n",
" <td>True</td>\n", " <td>True</td>\n",
" </tr>\n", " </tr>\n",
" <tr>\n", " <tr>\n",
" <th>52</th>\n", " <th>103</th>\n",
" <td>fixed</td>\n", " <td>fixed</td>\n",
" <td>FORD MAVERICK 1ST GEN</td>\n", " <td>FORD MAVERICK 1ST GEN</td>\n",
" <td>FORD MAVERICK 1ST GEN</td>\n", " <td>FORD MAVERICK 1ST GEN</td>\n",
" <td>True</td>\n", " <td>True</td>\n",
" </tr>\n", " </tr>\n",
" <tr>\n", " <tr>\n",
" <th>113</th>\n", " <th>119</th>\n",
" <td>fw</td>\n",
" <td>FORD F-150 LIGHTNING 1ST GEN</td>\n",
" <td>FORD F-150 LIGHTNING 1ST GEN</td>\n",
" <td>True</td>\n",
" </tr>\n",
" <tr>\n",
" <th>149</th>\n",
" <td>fw</td>\n", " <td>fw</td>\n",
" <td>FORD MUSTANG MACH-E 1ST GEN</td>\n", " <td>FORD MUSTANG MACH-E 1ST GEN</td>\n",
" <td>FORD MUSTANG MACH-E 1ST GEN</td>\n", " <td>FORD MUSTANG MACH-E 1ST GEN</td>\n",
@ -334,27 +271,27 @@
"text/plain": [ "text/plain": [
" source expected fuzzy \\\n", " source expected fuzzy \\\n",
"0 fw FORD BRONCO SPORT 1ST GEN FORD BRONCO SPORT 1ST GEN \n", "0 fw FORD BRONCO SPORT 1ST GEN FORD BRONCO SPORT 1ST GEN \n",
"1 fw FORD MAVERICK 1ST GEN mock \n", "1 fw FORD ESCAPE 4TH GEN FORD ESCAPE 4TH GEN \n",
"4 fw FORD ESCAPE 4TH GEN FORD ESCAPE 4TH GEN \n", "5 fixed FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n",
"6 fw FORD FOCUS 4TH GEN FORD FOCUS 4TH GEN \n", "8 fw FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n",
"7 fixed FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n", "11 fw FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n",
"10 fw FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n", "12 fw FORD MAVERICK 1ST GEN mock \n",
"19 fw FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n", "17 fw FORD FOCUS 4TH GEN FORD FOCUS 4TH GEN \n",
"41 fw FORD F-150 LIGHTNING 1ST GEN FORD F-150 LIGHTNING 1ST GEN \n", "103 fixed FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n",
"52 fixed FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n", "119 fw FORD F-150 LIGHTNING 1ST GEN FORD F-150 LIGHTNING 1ST GEN \n",
"113 fw FORD MUSTANG MACH-E 1ST GEN FORD MUSTANG MACH-E 1ST GEN \n", "149 fw FORD MUSTANG MACH-E 1ST GEN FORD MUSTANG MACH-E 1ST GEN \n",
"\n", "\n",
" correct \n", " correct \n",
"0 True \n", "0 True \n",
"1 False \n", "1 True \n",
"4 True \n", "5 True \n",
"6 True \n", "8 True \n",
"7 True \n", "11 True \n",
"10 True \n", "12 False \n",
"19 True \n", "17 True \n",
"41 True \n", "103 True \n",
"52 True \n", "119 True \n",
"113 True " "149 True "
] ]
}, },
"execution_count": 3, "execution_count": 3,

90
selfdrive/car/ford/tests/test_match.ipynb
Unescape View File

@ -1,90 +0,0 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 1,
"metadata": {},
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"kj/filesystem-disk-unix.c++:1703: warning: PWD environment variable doesn't match current directory; pwd = /mnt/c/Users/camer/AppData/Local/Programs/Microsoft VS Code\n"
]
},
{
"data": {
"text/plain": [
"(False, {<CAR.BRONCO_SPORT_MK1: 'FORD BRONCO SPORT 1ST GEN'>})"
]
},
"execution_count": 1,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"from cereal import car\n",
"from openpilot.selfdrive.car.fw_versions import match_fw_to_car\n",
"\n",
"Ecu = car.CarParams.Ecu\n",
"\n",
"\n",
"def dict_to_cereal(d):\n",
" car_fw = []\n",
" for (ecu, addr), fws in d.items():\n",
" for fw in fws:\n",
" f = car.CarParams.CarFw.new_message()\n",
" f.ecu = ecu\n",
" f.fwVersion = fw\n",
" f.address = addr\n",
" f.brand = 'ford'\n",
" f.logging = False\n",
" car_fw.append(f)\n",
" return car_fw\n",
"\n",
"\n",
"fw_dict = {\n",
" # (Ecu.debug, 2000): {b'1U5T-14G374-EM\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
" # (Ecu.engine, 2016): {b'P1PA-14C204-AE\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
" # (Ecu.shiftByWire, 1842): {b'PZ1P-14G395-AC\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
" (Ecu.eps, 1840): {b'LX6C-14D003-AL\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
" (Ecu.abs, 1888): {b'LX6C-2D053-RF\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
" (Ecu.fwdCamera, 1798): {b'M1PT-14F397-AD\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
" (Ecu.fwdRadar, 1892): {b'LB5T-14D049-AB\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
"}\n",
"\n",
"\n",
"match_fw_to_car(dict_to_cereal(fw_dict))"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": ".venv",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.4"
}
},
"nbformat": 4,
"nbformat_minor": 2
}
Write Preview
Loading…
Cancel
Save