he2851/Masterprojekt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nochmal

Browse Source
This commit is contained in:
Hendrik Möllersmann
2026-02-07 22:03:07 +01:00
parent 3fd967e843
commit 02ce0c0b4a
1 changed files with 242 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
Tests/algorithms_test.ipynb
View File

@@ -3,8 +3,8 @@
{ {
"metadata": { "metadata": {
"ExecuteTime": { "ExecuteTime": {
"end_time": "2026-02-07T16:59:00.652440Z", "end_time": "2026-02-07T20:59:57.191051Z",
"start_time": "2026-02-07T16:59:00.121091Z" "start_time": "2026-02-07T20:59:56.829377Z"
} }
}, },
"cell_type": "code", "cell_type": "code",
@@ -14,13 +14,13 @@
], ],
"id": "89aa93e9dbedd113", "id": "89aa93e9dbedd113",
"outputs": [], "outputs": [],
"execution_count": 1 "execution_count": 2
}, },
{ {
"metadata": { "metadata": {
"ExecuteTime": { "ExecuteTime": {
"end_time": "2026-02-07T16:59:02.990888Z", "end_time": "2026-02-07T20:59:59.176074Z",
"start_time": "2026-02-07T16:59:00.668752Z" "start_time": "2026-02-07T20:59:57.791116Z"
} }
}, },
"cell_type": "code", "cell_type": "code",
@@ -56,13 +56,13 @@
], ],
"id": "2005e5a8854eea1e", "id": "2005e5a8854eea1e",
"outputs": [], "outputs": [],
"execution_count": 2 "execution_count": 3
}, },
{ {
"metadata": { "metadata": {
"ExecuteTime": { "ExecuteTime": {
"end_time": "2026-02-07T16:59:03.608664Z", "end_time": "2026-02-07T21:00:00.433740Z",
"start_time": "2026-02-07T16:59:03.014887Z" "start_time": "2026-02-07T21:00:00.217286Z"
} }
}, },
"cell_type": "code", "cell_type": "code",
@@ -75,7 +75,7 @@
], ],
"id": "90f107a11ff0de7e", "id": "90f107a11ff0de7e",
"outputs": [], "outputs": [],
"execution_count": 3 "execution_count": 4
}, },
{ {
"metadata": { "metadata": {
@@ -88,13 +88,13 @@
"source": [ "source": [
"# dsPart = [60, 125, 600, 1250, 6000, 60000] entspricht bei der Erde ca. 100km, 50km, 10km, 5km, 1km, 100m\n", "# dsPart = [60, 125, 600, 1250, 6000, 60000] entspricht bei der Erde ca. 100km, 50km, 10km, 5km, 1km, 100m\n",
"\n", "\n",
"steps_gha1_num = [20, 50, 100, 200, 500, 1000, 5000]\n", "steps_gha1_num = [200, 500, 1000, 5000, 10000]\n",
"maxM_gha1_ana = [20, 50]\n", "maxM_gha1_ana = [20, 50, 80]\n",
"parts_gha1_ana = [2, 8]\n", "parts_gha1_ana = [2, 8, 32]\n",
"dsPart_gha1_ES = [60, 600, 1250]\n", "dsPart_gha1_ES = [60, 600, 1250]\n",
"dsPart_gha1_approx = [600, 1250, 6000]\n", "dsPart_gha1_approx = [600, 1250, 6000]\n",
"\n", "\n",
"steps_gha2_num = [200, 500, 1000]\n", "steps_gha2_num = [200, 500, 1000, 5000, 10000]\n",
"dsPart_gha2_ES = [60, 600, 1250]\n", "dsPart_gha2_ES = [60, 600, 1250]\n",
"dsPart_gha2_approx = [600, 1250, 6000]" "dsPart_gha2_approx = [600, 1250, 6000]"
], ],
@@ -105,16 +105,17 @@
{ {
"metadata": { "metadata": {
"ExecuteTime": { "ExecuteTime": {
"end_time": "2026-02-07T17:00:45.868912Z", "end_time": "2026-02-07T21:00:07.365335Z",
"start_time": "2026-02-07T17:00:44.713991Z" "start_time": "2026-02-07T21:00:07.174675Z"
} }
}, },
"cell_type": "code", "cell_type": "code",
"source": [ "source": [
"# test = \"Karney\"\n", "test = \"Karney\"\n",
"# test = \"Panou\"\n", "# test = \"Panou\"\n",
"test = \"Random\"\n", "# test = \"Random\"\n",
"\n", "\n",
"def build_examples(test):\n",
" if test == \"Karney\":\n", " if test == \"Karney\":\n",
" ell: EllipsoidTriaxial = EllipsoidTriaxial.init_name(\"KarneyTest2024\")\n", " ell: EllipsoidTriaxial = EllipsoidTriaxial.init_name(\"KarneyTest2024\")\n",
" examples = get_examples_karney(4, seed=42)\n", " examples = get_examples_karney(4, seed=42)\n",
@@ -137,21 +138,19 @@
" alpha0_ell = wu.deg2rad(random.randint(0, 359))\n", " alpha0_ell = wu.deg2rad(random.randint(0, 359))\n",
" s = random.randint(10000, int(np.pi*ell.b))\n", " s = random.randint(10000, int(np.pi*ell.b))\n",
" examples.append([beta0, lamb0, alpha0_ell, s])\n", " examples.append([beta0, lamb0, alpha0_ell, s])\n",
" pass" " pass\n",
" return examples\n",
"examples = build_examples(test)"
], ],
"id": "6770dbd57d475127", "id": "6770dbd57d475127",
"outputs": [], "outputs": [],
"execution_count": 9 "execution_count": 5
}, },
{ {
"metadata": { "metadata": {},
"ExecuteTime": {
"end_time": "2026-02-07T17:02:10.182032Z",
"start_time": "2026-02-07T17:01:58.900380Z"
}
},
"cell_type": "code", "cell_type": "code",
"source": [ "source": [
"def execute_results(test, examples):\n",
" results = {}\n", " results = {}\n",
" for i, example in enumerate(examples):\n", " for i, example in enumerate(examples):\n",
" print(f\"----- Beispiel {i+1}/{len(examples)}\")\n", " print(f\"----- Beispiel {i+1}/{len(examples)}\")\n",
@@ -299,30 +298,13 @@
" print(e)\n", " print(e)\n",
" example_results[f\"GHA2_approx_{dsPart}\"] = (nan, nan, nan, nan)\n", " example_results[f\"GHA2_approx_{dsPart}\"] = (nan, nan, nan, nan)\n",
"\n", "\n",
" results[f\"beta0: {wu.rad2deg(beta0):.3f}, lamb0: {wu.rad2deg(lamb0):.3f}, alpha0: {wu.rad2deg(alpha0_ell):.3f}, s: {s}\"] = example_results" " results[f\"beta0: {wu.rad2deg(beta0):.3f}, lamb0: {wu.rad2deg(lamb0):.3f}, alpha0: {wu.rad2deg(alpha0_ell):.3f}, s: {s}\"] = example_results\n",
" return results\n",
"results = execute_results(test, examples)"
], ],
"id": "fc45e0f618a0e4d8", "id": "fc45e0f618a0e4d8",
"outputs": [ "outputs": [],
{ "execution_count": null
"name": "stdout",
"output_type": "stream",
"text": [
"----- Beispiel 1/4\n",
"----- Beispiel 2/4\n",
"----- Beispiel 3/4\n",
"Analytische Methode ist explodiert, Punkt liegt nicht mehr auf dem Ellipsoid\n",
"Analytische Methode ist explodiert, Punkt liegt nicht mehr auf dem Ellipsoid\n",
"Analytische Methode ist explodiert, Punkt liegt nicht mehr auf dem Ellipsoid\n",
"Fehler in der Umrechnung cart2ell\n",
"----- Beispiel 4/4\n",
"Analytische Methode ist explodiert, Punkt liegt nicht mehr auf dem Ellipsoid\n",
"Analytische Methode ist explodiert, Punkt liegt nicht mehr auf dem Ellipsoid\n",
"Analytische Methode ist explodiert, Punkt liegt nicht mehr auf dem Ellipsoid\n",
"Fehler in der Umrechnung cart2ell\n"
]
}
],
"execution_count": 15
}, },
{ {
"metadata": {}, "metadata": {},
@@ -330,31 +312,85 @@
"outputs": [], "outputs": [],
"execution_count": null, "execution_count": null,
"source": [ "source": [
"# with open(f\"gha_results{test}.pkl\", \"wb\") as f:\n", "def save_results(test, results):\n",
"# pickle.dump(results, f)" " with open(f\"gha_results{test}.pkl\", \"wb\") as f:\n",
" pickle.dump(results, f)\n",
"# save_results(test, results)"
], ],
"id": "74fbd4d33c288839" "id": "74fbd4d33c288839"
}, },
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": [
"test = \"Panou\"\n",
"examples_panou = build_examples(test)\n",
"results_panou = execute_results(test, examples_panou)\n",
"save_results(test, results_panou)"
],
"id": "58697308664fa539"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": [
"test = \"Karney\"\n",
"examples_karney = build_examples(test)\n",
"results_karney = execute_results(test, examples_karney)\n",
"save_results(test, results_karney)"
],
"id": "5d35a01ba8d6e2b1"
},
{
"metadata": {},
"cell_type": "code",
"outputs": [],
"execution_count": null,
"source": [
"test = \"Random\"\n",
"examples_random = build_examples(test)\n",
"results_random = execute_results(test, examples_random)\n",
"save_results(test, results_random)"
],
"id": "848eab44283945c6"
},
{ {
"metadata": { "metadata": {
"ExecuteTime": { "ExecuteTime": {
"end_time": "2026-02-06T21:26:49.148361Z", "end_time": "2026-02-07T21:00:12.376487Z",
"start_time": "2026-02-06T21:26:48.975151Z" "start_time": "2026-02-07T21:00:12.071794Z"
} }
}, },
"cell_type": "code", "cell_type": "code",
"source": [ "source": [
"with open(f\"gha_results{test}.pkl\", \"rb\") as f:\n", "with open(f\"gha_results{test}_all.pkl\", \"rb\") as f:\n",
" results = pickle.load(f)" " results = pickle.load(f)"
], ],
"id": "4c20a0579c0f7038", "id": "4c20a0579c0f7038",
"outputs": [], "outputs": [
{
"ename": "FileNotFoundError",
"evalue": "[Errno 2] No such file or directory: 'gha_resultsKarney.pkl'",
"output_type": "error",
"traceback": [
"\u001B[31m---------------------------------------------------------------------------\u001B[39m",
"\u001B[31mFileNotFoundError\u001B[39m Traceback (most recent call last)",
"\u001B[36mCell\u001B[39m\u001B[36m \u001B[39m\u001B[32mIn[6]\u001B[39m\u001B[32m, line 1\u001B[39m\n\u001B[32m----> \u001B[39m\u001B[32m1\u001B[39m \u001B[38;5;28;01mwith\u001B[39;00m \u001B[38;5;28;43mopen\u001B[39;49m\u001B[43m(\u001B[49m\u001B[33;43mf\u001B[39;49m\u001B[33;43m\"\u001B[39;49m\u001B[33;43mgha_results\u001B[39;49m\u001B[38;5;132;43;01m{\u001B[39;49;00m\u001B[43mtest\u001B[49m\u001B[38;5;132;43;01m}\u001B[39;49;00m\u001B[33;43m.pkl\u001B[39;49m\u001B[33;43m\"\u001B[39;49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[33;43m\"\u001B[39;49m\u001B[33;43mrb\u001B[39;49m\u001B[33;43m\"\u001B[39;49m\u001B[43m)\u001B[49m \u001B[38;5;28;01mas\u001B[39;00m f:\n\u001B[32m 2\u001B[39m results = pickle.load(f)\n",
"\u001B[36mFile \u001B[39m\u001B[32m~\\PythonInterpreter\\Lib\\site-packages\\IPython\\core\\interactiveshell.py:343\u001B[39m, in \u001B[36m_modified_open\u001B[39m\u001B[34m(file, *args, **kwargs)\u001B[39m\n\u001B[32m 336\u001B[39m \u001B[38;5;28;01mif\u001B[39;00m file \u001B[38;5;129;01min\u001B[39;00m {\u001B[32m0\u001B[39m, \u001B[32m1\u001B[39m, \u001B[32m2\u001B[39m}:\n\u001B[32m 337\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mValueError\u001B[39;00m(\n\u001B[32m 338\u001B[39m \u001B[33mf\u001B[39m\u001B[33m\"\u001B[39m\u001B[33mIPython won\u001B[39m\u001B[33m'\u001B[39m\u001B[33mt let you open fd=\u001B[39m\u001B[38;5;132;01m{\u001B[39;00mfile\u001B[38;5;132;01m}\u001B[39;00m\u001B[33m by default \u001B[39m\u001B[33m\"\u001B[39m\n\u001B[32m 339\u001B[39m \u001B[33m\"\u001B[39m\u001B[33mas it is likely to crash IPython. If you know what you are doing, \u001B[39m\u001B[33m\"\u001B[39m\n\u001B[32m 340\u001B[39m \u001B[33m\"\u001B[39m\u001B[33myou can use builtins\u001B[39m\u001B[33m'\u001B[39m\u001B[33m open.\u001B[39m\u001B[33m\"\u001B[39m\n\u001B[32m 341\u001B[39m )\n\u001B[32m--> \u001B[39m\u001B[32m343\u001B[39m \u001B[38;5;28;01mreturn\u001B[39;00m \u001B[43mio_open\u001B[49m\u001B[43m(\u001B[49m\u001B[43mfile\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m*\u001B[49m\u001B[43margs\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m*\u001B[49m\u001B[43m*\u001B[49m\u001B[43mkwargs\u001B[49m\u001B[43m)\u001B[49m\n",
"\u001B[31mFileNotFoundError\u001B[39m: [Errno 2] No such file or directory: 'gha_resultsKarney.pkl'"
]
}
],
"execution_count": 6 "execution_count": 6
}, },
{ {
"metadata": { "metadata": {
"ExecuteTime": { "ExecuteTime": {
"end_time": "2026-02-07T17:02:37.451141Z", "end_time": "2026-02-07T20:59:54.841038500Z",
"start_time": "2026-02-07T17:02:15.854020Z" "start_time": "2026-02-07T17:02:15.854020Z"
} }
}, },