From 28b24c25c2ab61b60c66435ff3960a0ebd1a9191 Mon Sep 17 00:00:00 2001 From: fabia Date: Mon, 29 Dec 2025 19:09:03 +0100 Subject: [PATCH] Test --- .idea/Masterprojekt_V2.iml | 6 +- Campusnetz.db | Bin 151552 -> 151552 bytes Campusnetz.ipynb | 764 ++++++++++++++----------------------- 3 files changed, 295 insertions(+), 475 deletions(-) diff --git a/.idea/Masterprojekt_V2.iml b/.idea/Masterprojekt_V2.iml index f571432..89b2bd1 100644 --- a/.idea/Masterprojekt_V2.iml +++ b/.idea/Masterprojekt_V2.iml @@ -1,8 +1,10 @@ - - + + + + \ No newline at end of file diff --git a/Campusnetz.db b/Campusnetz.db index 31d21e840404e29d72bce7619a36cb39b7d9458b..e01f82a9de0a62abdc4c3e5502bed40fea221aa5 100644 GIT binary patch delta 93 zcmZozz}c{XbAmLZ&_o$$Mxl)f7iJ0U*4{Pa9S;YCJ3Bi&0}xLZ6j7NRHC1AA&FoC& sZ|atsZ!M)=1cVtNfSrSb1IV&4G;-kovqRiiDW{oZ&UTJDj6XI50N)oG-~a#s delta 93 zcmZozz}c{XbAmLZ_(U0JM)8da7iI|@nZ5LJ2oDE?J3Bi&0}xLZ6j7NRHC1AA&FoC& suZQ|$G`>l@2naJk06PZ<2asi9Xym~E_wzQ_g{PZ2=4|Jf!}wz}04*6D \u001B[39m\u001B[32m5\u001B[39m dict_punkthoehen_naeherung_niv, liste_punkte_in_db = imp.vorbereitung_import_beobachtungen_nivellement_naeherung_punkthoehen(\u001B[33mr\u001B[39m\u001B[33m\"\u001B[39m\u001B[33mDaten\u001B[39m\u001B[33m\\\u001B[39m\u001B[33mNiv_bereinigt.DAT.csv\u001B[39m\u001B[33m\"\u001B[39m, \u001B[32m2\u001B[39m)\n", - "\u001B[31mTypeError\u001B[39m: cannot unpack non-iterable NoneType object" + "Für folgende Nivellementpunkte werden die Höhen in der Ausgleichung berechnet: ['812', '10047', '10046', '10045', '10034', '10035', '10029', '10030', '10031', '10017', '10013', '10012', '10014', '10015', '10016', '10007', '666', '10054', '10056', '10058', '10052', '10043', '10026', '10010', '10006', '816', '10048', '10049', '10053', '10050', '10051', '10040', '10037', '10038', '10039', '10032', '10033', '10025', '10024', '10023', '10022', '10021', '10020', '10019', '10036', '10028', '10011', '10001', '10003', '10008', '10005', '10004', '10002', '10055', '10057', '10059', '10044', '10041', '10042', '10027', '10018', '10009']\n", + "Für folgende Punkte wird aktuell keine Höhe in der Ausgleichung berechnet: ['FH14', '80001', 'FH11', 'FH13', '80002', '90001', '90002', '90003', '90004', '90005', '90006', '90007', '90008', '90009', '90010', '90011', '90012', '90013', '90014', 'FH3', 'FH4', '70001', 'FH15', '70002', '60001', 'FH5', '60002', '60003', '60004', '60005', '60006', '60007', '60008', '60009', '60010', '30001', '30002', '30003', '30004', '30005', '30006', '30007', '30008']. Bei Bedarf im folgenden Schritt ändern!\n" ] } ], @@ -1199,8 +972,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:36:25.442729Z", - "start_time": "2025-12-29T17:36:25.419285Z" + "end_time": "2025-12-29T18:03:19.909451Z", + "start_time": "2025-12-29T18:03:19.891228Z" } }, "cell_type": "code", @@ -1215,21 +988,35 @@ "id": "6c909b9792861b30", "outputs": [ { - "ename": "NameError", - "evalue": "name 'dict_punkthoehen_naeherung_niv' is not defined", - "output_type": "error", - "traceback": [ - "\u001B[31m---------------------------------------------------------------------------\u001B[39m", - "\u001B[31mNameError\u001B[39m Traceback (most recent call last)", - "\u001B[36mCell\u001B[39m\u001B[36m \u001B[39m\u001B[32mIn[18]\u001B[39m\u001B[32m, line 6\u001B[39m\n\u001B[32m 4\u001B[39m imp = Import.Import(pfad_datenbank)\n\u001B[32m 5\u001B[39m liste_hoehenpunkte_hinzufuegen = [\u001B[33m'\u001B[39m\u001B[33mFH14\u001B[39m\u001B[33m'\u001B[39m, \u001B[33m'\u001B[39m\u001B[33mFH11\u001B[39m\u001B[33m'\u001B[39m, \u001B[33m'\u001B[39m\u001B[33mFH13\u001B[39m\u001B[33m'\u001B[39m, \u001B[33m'\u001B[39m\u001B[33mFH3\u001B[39m\u001B[33m'\u001B[39m, \u001B[33m'\u001B[39m\u001B[33mFH4\u001B[39m\u001B[33m'\u001B[39m, \u001B[33m'\u001B[39m\u001B[33mFH15\u001B[39m\u001B[33m'\u001B[39m, \u001B[33m'\u001B[39m\u001B[33mFH5\u001B[39m\u001B[33m'\u001B[39m]\n\u001B[32m----> \u001B[39m\u001B[32m6\u001B[39m imp.import_beobachtungen_nivellement_naeherung_punkthoehen(\u001B[43mdict_punkthoehen_naeherung_niv\u001B[49m, liste_punkte_in_db, liste_hoehenpunkte_hinzufuegen)\n", - "\u001B[31mNameError\u001B[39m: name 'dict_punkthoehen_naeherung_niv' is not defined" + "name": "stdout", + "output_type": "stream", + "text": [ + "Neu hinzugefügt (7): ['FH14', 'FH11', 'FH13', 'FH3', 'FH4', 'FH15', 'FH5']\n", + "Bereits vorhanden (0): []\n", + "Geändert (62): ['812', '10047', '10046', '10045', '10034', '10035', '10029', '10030', '10031', '10017', '10013', '10012', '10014', '10015', '10016', '10007', '666', '10054', '10056', '10058', '10052', '10043', '10026', '10010', '10006', '816', '10048', '10049', '10053', '10050', '10051', '10040', '10037', '10038', '10039', '10032', '10033', '10025', '10024', '10023', '10022', '10021', '10020', '10019', '10036', '10028', '10011', '10001', '10003', '10008', '10005', '10004', '10002', '10055', '10057', '10059', '10044', '10041', '10042', '10027', '10018', '10009']\n", + "\n" ] + }, + { + "data": { + "text/plain": [ + "\"Für folgende Punkte werden die Höhen Ausgeglichen: ['FH14', 'FH11', 'FH13', 'FH3', 'FH4', 'FH15', 'FH5', '812', '10047', '10046', '10045', '10034', '10035', '10029', '10030', '10031', '10017', '10013', '10012', '10014', '10015', '10016', '10007', '666', '10054', '10056', '10058', '10052', '10043', '10026', '10010', '10006', '816', '10048', '10049', '10053', '10050', '10051', '10040', '10037', '10038', '10039', '10032', '10033', '10025', '10024', '10023', '10022', '10021', '10020', '10019', '10036', '10028', '10011', '10001', '10003', '10008', '10005', '10004', '10002', '10055', '10057', '10059', '10044', '10041', '10042', '10027', '10018', '10009']\"" + ] + }, + "execution_count": 18, + "metadata": {}, + "output_type": "execute_result" } ], "execution_count": 18 }, { - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2025-12-29T18:03:19.943437Z", + "start_time": "2025-12-29T18:03:19.923627Z" + } + }, "cell_type": "code", "source": [ "# Nivellement-Beobachtungen Importieren Teil 3\n", @@ -1238,11 +1025,27 @@ "imp.import_beobachtungen_nivellement_RVVR(r\"Daten\\Niv_bereinigt.DAT.csv\", 2)" ], "id": "4c06b9c4cd78e7b7", - "outputs": [], - "execution_count": null + "outputs": [ + { + "data": { + "text/plain": [ + "'Die Beobachtungen aus der Datei Daten\\\\Niv_bereinigt.DAT.csv wurden erfolgreich importiert.'" + ] + }, + "execution_count": 19, + "metadata": {}, + "output_type": "execute_result" + } + ], + "execution_count": 19 }, { - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2025-12-29T18:06:37.026587Z", + "start_time": "2025-12-29T18:03:19.955140Z" + } + }, "cell_type": "code", "source": [ "# Jacobimatrix aufstellen\n", @@ -1264,10 +1067,15 @@ ], "id": "c9367690f5b73953", "outputs": [], - "execution_count": null + "execution_count": 20 }, { - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2025-12-29T18:08:10.305113Z", + "start_time": "2025-12-29T18:08:00.999260Z" + } + }, "cell_type": "code", "source": [ "importlib.reload(Datenbank)\n", @@ -1279,10 +1087,15 @@ ], "id": "163fa2e24923b40", "outputs": [], - "execution_count": null + "execution_count": 21 }, { - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2025-12-29T18:08:10.428867Z", + "start_time": "2025-12-29T18:08:10.310723Z" + } + }, "cell_type": "code", "source": [ "importlib.reload(Funktionales_Modell)\n", @@ -1292,10 +1105,15 @@ ], "id": "80e8325721c950f8", "outputs": [], - "execution_count": null + "execution_count": 22 }, { - "metadata": {}, + "metadata": { + "ExecuteTime": { + "end_time": "2025-12-29T18:08:15.091487Z", + "start_time": "2025-12-29T18:08:10.434224Z" + } + }, "cell_type": "code", "source": [ "importlib.reload(Funktionales_Modell)\n", @@ -1305,7 +1123,7 @@ ], "id": "33e9fbd465c577e4", "outputs": [], - "execution_count": null + "execution_count": 23 }, { "metadata": {},