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 31d21e8..e01f82a 100644 Binary files a/Campusnetz.db and b/Campusnetz.db differ diff --git a/Campusnetz.ipynb b/Campusnetz.ipynb index 198ea87..e1d99db 100644 --- a/Campusnetz.ipynb +++ b/Campusnetz.ipynb @@ -3,8 +3,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.461376Z", - "start_time": "2025-12-29T17:28:48.679433Z" + "end_time": "2025-12-29T18:03:16.073849Z", + "start_time": "2025-12-29T18:03:14.475001Z" } }, "cell_type": "code", @@ -31,8 +31,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.510175Z", - "start_time": "2025-12-29T17:28:49.504956Z" + "end_time": "2025-12-29T18:03:16.139092Z", + "start_time": "2025-12-29T18:03:16.079052Z" } }, "cell_type": "code", @@ -54,8 +54,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.519660Z", - "start_time": "2025-12-29T17:28:49.514976Z" + "end_time": "2025-12-29T18:03:16.174678Z", + "start_time": "2025-12-29T18:03:16.144981Z" } }, "cell_type": "code", @@ -70,7 +70,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Der Import wurde abgebrochen, weil mindestens ein Teil der Punktnummern aus der Datei Daten\\campsnetz_koordinaten_bereinigt.csv bereits in der Datenbank vorhanden ist. Bitte in der Datei ändern und Import wiederholen.\n" + "Der Import der Näherungskoordinaten wurde erfolgreich abgeschlossen\n" ] } ], @@ -79,8 +79,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.536891Z", - "start_time": "2025-12-29T17:28:49.524431Z" + "end_time": "2025-12-29T18:03:16.243613Z", + "start_time": "2025-12-29T18:03:16.194620Z" } }, "cell_type": "code", @@ -282,8 +282,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.556529Z", - "start_time": "2025-12-29T17:28:49.542177Z" + "end_time": "2025-12-29T18:03:16.257794Z", + "start_time": "2025-12-29T18:03:16.249750Z" } }, "cell_type": "code", @@ -299,205 +299,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "{'10009': Matrix([\n", - "[3794767.4719546097],\n", - "[ 546740.0869962516],\n", - "[ 5080165.952124462]]), '10006': Matrix([\n", - "[3794766.3557482935],\n", - "[ 546707.6385009313],\n", - "[5080169.7334700795]]), '10010': Matrix([\n", - "[3794758.6366199246],\n", - "[ 546767.6665772106],\n", - "[5080169.4644999765]]), '10018': Matrix([\n", - "[3794762.2481267513],\n", - "[ 546797.6912507551],\n", - "[ 5080163.980380166]]), '10008': Matrix([\n", - "[3794783.8581],\n", - "[ 546746.6347],\n", - "[5080152.7404]]), '10005': Matrix([\n", - "[3794793.841662743],\n", - "[546722.3209011297],\n", - "[5080147.930942906]]), '10003': Matrix([\n", - "[3794841.051609108],\n", - "[546735.1152754558],\n", - "[5080111.543399332]]), '10004': Matrix([\n", - "[3794803.4594055074],\n", - "[ 546714.1406417021],\n", - "[ 5080141.382390101]]), '10007': Matrix([\n", - "[3794831.046531049],\n", - "[546758.7254701178],\n", - "[5080116.663324944]]), '10001': Matrix([\n", - "[3794901.5252],\n", - "[ 546745.559],\n", - "[5080065.7672]]), '10002': Matrix([\n", - "[3794866.9711],\n", - "[ 546729.5958],\n", - "[5080092.6364]]), '10016': Matrix([\n", - "[3794826.658374741],\n", - "[546788.7275390101],\n", - "[5080116.868237535]]), '10011': Matrix([\n", - "[3794894.922579663],\n", - "[546833.1159754294],\n", - "[5080061.151341954]]), '10026': Matrix([\n", - "[3794753.8595],\n", - "[ 546827.4296],\n", - "[5080167.0938]]), '10027': Matrix([\n", - "[3794757.591261769],\n", - "[546874.3314003296],\n", - "[5080159.317534195]]), '10043': Matrix([\n", - "[3794747.2737986287],\n", - "[ 546919.1497828952],\n", - "[ 5080162.149716094]]), '10044': Matrix([\n", - "[3794752.6696],\n", - "[ 546958.3218],\n", - "[5080154.2579]]), '10021': Matrix([\n", - "[3794776.0295716925],\n", - "[ 546833.7406948799],\n", - "[ 5080150.012973846]]), '10020': Matrix([\n", - "[ 3794782.610580881],\n", - "[ 546834.470509102],\n", - "[5080145.0361413695]]), '10024': Matrix([\n", - "[3794772.816135807],\n", - "[ 546857.095708699],\n", - "[5080149.834714163]]), '10025': Matrix([\n", - "[3794774.2085619094],\n", - "[ 546871.8107307912],\n", - "[ 5080147.359175114]]), '10022': Matrix([\n", - "[3794778.3371531744],\n", - "[ 546841.7501872958],\n", - "[ 5080147.275074134]]), '10023': Matrix([\n", - "[3794780.7952114563],\n", - "[ 546848.1012091675],\n", - "[ 5080144.924922213]]), '10019': Matrix([\n", - "[3794800.0946706245],\n", - "[ 546833.3239614451],\n", - "[ 5080131.724532257]]), '10033': Matrix([\n", - "[3794800.0160474544],\n", - "[ 546874.6524563388],\n", - "[ 5080127.204744104]]), '10017': Matrix([\n", - "[3794825.016154114],\n", - "[546831.6998861503],\n", - "[5080113.374792286]]), '10052': Matrix([\n", - "[3794743.6262089056],\n", - "[ 546984.415934838],\n", - "[ 5080157.831166813]]), '10042': Matrix([\n", - "[ 3794758.957179171],\n", - "[ 546937.0599021759],\n", - "[5080151.6103044115]]), '10053': Matrix([\n", - "[ 3794748.14608301],\n", - "[547017.5748381803],\n", - "[5080150.930072506]]), '10037': Matrix([\n", - "[3794800.5693],\n", - "[ 546960.7477],\n", - "[ 5080117.665]]), '10040': Matrix([\n", - "[3794780.720877459],\n", - "[546956.4249913145],\n", - "[5080133.161471092]]), '10041': Matrix([\n", - "[3794778.153328699],\n", - "[ 546925.877928891],\n", - "[5080138.722313838]]), '10038': Matrix([\n", - "[3794806.3233483736],\n", - "[ 546929.7308726012],\n", - "[ 5080116.89880491]]), '10051': Matrix([\n", - "[3794767.0574626415],\n", - "[ 546988.6993708528],\n", - "[ 5080139.997874675]]), '10036': Matrix([\n", - "[3794815.0546409036],\n", - "[ 546969.5966706082],\n", - "[ 5080106.064114862]]), '10035': Matrix([\n", - "[3794845.948751911],\n", - "[ 546961.512678588],\n", - "[5080084.087510971]]), '10039': Matrix([\n", - "[3794804.1623731344],\n", - "[ 546914.7316360716],\n", - "[ 5080120.139242563]]), '10059': Matrix([\n", - "[3794736.9649],\n", - "[ 547079.4678],\n", - "[5080152.3224]]), '10050': Matrix([\n", - "[3794766.7719544796],\n", - "[ 547012.5266236273],\n", - "[ 5080137.484970744]]), '10013': Matrix([\n", - "[3794849.6087244693],\n", - "[ 546826.8685540904],\n", - "[ 5080095.43002485]]), '10028': Matrix([\n", - "[3794889.7348],\n", - "[ 546908.7636],\n", - "[5080056.9381]]), '10012': Matrix([\n", - "[3794853.6002710722],\n", - "[ 546805.2364847381],\n", - "[ 5080094.889461209]]), '10014': Matrix([\n", - "[3794838.7464],\n", - "[ 546812.3658],\n", - "[ 5080105.2]]), '10031': Matrix([\n", - "[3794821.7594477106],\n", - "[ 546877.5480584177],\n", - "[ 5080110.746046175]]), '10015': Matrix([\n", - "[3794839.4650256806],\n", - "[ 546793.5165545414],\n", - "[5080106.7712153485]]), '10032': Matrix([\n", - "[3794807.848210704],\n", - "[546888.4861254627],\n", - "[5080119.745908576]]), '10030': Matrix([\n", - "[3794845.353156385],\n", - "[546901.0274418414],\n", - "[5080090.356531718]]), '10029': Matrix([\n", - "[3794845.026354165],\n", - "[546914.9167077399],\n", - "[5080089.099946169]]), '10034': Matrix([\n", - "[3794886.104894752],\n", - "[546965.6987415539],\n", - "[ 5080053.40592357]]), '10045': Matrix([\n", - "[3794881.900452307],\n", - "[547019.7835874384],\n", - "[5080050.715777841]]), '10049': Matrix([\n", - "[3794786.8907962884],\n", - "[ 547021.0765699627],\n", - "[ 5080121.444681106]]), '10048': Matrix([\n", - "[3794809.106679632],\n", - "[547017.3023106218],\n", - "[5080105.014391199]]), '10047': Matrix([\n", - "[3794831.5349817923],\n", - "[ 547018.2393882351],\n", - "[ 5080088.124038595]]), '10046': Matrix([\n", - "[3794846.5803718665],\n", - "[ 547012.9971156706],\n", - "[ 5080077.440420756]]), '10057': Matrix([\n", - "[3794800.819370702],\n", - "[ 547078.671611169],\n", - "[ 5080104.57270624]]), '10055': Matrix([\n", - "[3794838.851977278],\n", - "[ 547081.903863645],\n", - "[5080075.698247853]]), '10054': Matrix([\n", - "[3794889.0494],\n", - "[ 547086.9874],\n", - "[5080038.1528]]), '10058': Matrix([\n", - "[3794766.1088143717],\n", - "[ 547091.7542871874],\n", - "[ 5080129.120881729]]), '10056': Matrix([\n", - "[3794825.041003442],\n", - "[547094.8115741647],\n", - "[5080084.488768324]]), '0645': Matrix([\n", - "[3793994.4529],\n", - "[ 495758.0093],\n", - "[5085958.2047]]), '0648': Matrix([\n", - "[3762551.5682],\n", - "[ 538424.8576],\n", - "[5104809.1503]]), '0656': Matrix([\n", - "[3794838.5802],\n", - "[ 546995.3112],\n", - "[5080116.5503]]), '0995': Matrix([\n", - "[3794519.9177],\n", - "[ 588539.9138],\n", - "[5075743.9332]]), '1675': Matrix([\n", - "[3813621.0427],\n", - "[ 566004.8947],\n", - "[ 5064056.93]]), 'ESTE': Matrix([\n", - "[3816914.711],\n", - "[ 507636.812],\n", - "[5067733.467]]), 'GNA2': Matrix([\n", - "[3767530.6335],\n", - "[ 597990.0978],\n", - "[5094563.5073]])}\n" + "{}\n" ] } ], @@ -506,8 +308,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.570872Z", - "start_time": "2025-12-29T17:28:49.562519Z" + "end_time": "2025-12-29T18:03:16.298646Z", + "start_time": "2025-12-29T18:03:16.275510Z" } }, "cell_type": "code", @@ -539,8 +341,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.602748Z", - "start_time": "2025-12-29T17:28:49.576618Z" + "end_time": "2025-12-29T18:03:16.341188Z", + "start_time": "2025-12-29T18:03:16.310007Z" } }, "cell_type": "code", @@ -571,8 +373,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:28:49.610830Z", - "start_time": "2025-12-29T17:28:49.607819Z" + "end_time": "2025-12-29T18:03:16.350823Z", + "start_time": "2025-12-29T18:03:16.347168Z" } }, "cell_type": "code", @@ -606,8 +408,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.256623Z", - "start_time": "2025-12-29T17:28:49.615348Z" + "end_time": "2025-12-29T18:03:19.437273Z", + "start_time": "2025-12-29T18:03:16.356718Z" } }, "cell_type": "code", @@ -708,167 +510,71 @@ "d(p2,p1)= 46.60388451996242\n", "d(P2,P1)= 46.59145296840883\n", "m0 ~ 0.999733250743331\n", - "Anzahl Ratios: 1711\n", - "min/mean/max: 0.9966158797615429 0.9999420515348254 1.0007101135088199\n", - "std: 0.0001589676515447617\n", - "S_loc: Matrix([[956.308098305085], [1838.78964237288], [99.9601016949153]])\n", - "S_ecef: Matrix([[3794806.8636068002], [546895.7494793105], [5080119.9940889809]])\n", - "Delta: Matrix([[3.79385e+6], [545057.], [5.08002e+6]])\n", - "10059 0.0006\n", - "10058 0.0004\n", + "Anzahl Ratios: 45\n", + "min/mean/max: 0.9986498495467658 0.9999468893556359 1.0004164038548047\n", + "std: 0.00025301851725699595\n", + "S_loc: Matrix([[937.945990000000], [1847.25831000000], [99.9451600000000]])\n", + "S_ecef: Matrix([[3794821.39483000], [546885.587320000], [5080110.27740000]])\n", + "Delta: Matrix([[3.79388e+6], [545038.], [5.08001e+6]])\n", "10054 0.0004\n", - "10055 0.0003\n", - "10057 0.0003\n", - "10056 0.0002\n", + "10059 0.0004\n", "10037 0.0002\n", - "10049 0.0002\n", - "10048 0.0001\n", - "10028 0.0001\n", + "10028 0.0002\n", "10044 0.0001\n", - "10040 0.0001\n", - "10036 0.0001\n", - "10047 0.0001\n", - "10014 0.0001\n", - "10046 0.0001\n", - "10026 0.0001\n", - "10050 0.0001\n", - "10029 0.0001\n", - "10051 0.0001\n", - "10030 0.0001\n", - "10035 0.0001\n", - "10045 0.0001\n", - "10038 0.0001\n", - "10034 0.0001\n", - "10012 0.0001\n", - "10052 0.0001\n", "10001 0.0001\n", - "10053 0.0001\n", - "10041 0.0001\n", - "10039 0.0001\n", - "10013 0.0001\n", - "10042 0.0001\n", - "10018 0.0001\n", - "10031 0.0001\n", - "10032 0.0001\n", - "10043 0.0001\n", - "10008 0.0001\n", + "10014 0.0001\n", "10002 0.0001\n", - "10011 0.0001\n", - "10017 0.0001\n", - "10027 0.0001\n", - "10033 0.0001\n", - "10024 0.0001\n", - "10025 0.0\n", - "10016 0.0\n", - "10023 0.0\n", - "10019 0.0\n", - "10022 0.0\n", - "10010 0.0\n", - "10020 0.0\n", - "10021 0.0\n", - "10005 0.0\n", - "10015 0.0\n", - "10007 0.0\n", - "10003 0.0\n", - "10004 0.0\n", - "10009 0.0\n", - "10006 0.0\n", - "Anzahl gemeinsame Punkte: 59\n", + "10026 0.0001\n", + "10008 0.0001\n", + "Anzahl gemeinsame Punkte: 10\n", "\n", "Erste Zielpunkte:\n", "10001 [3794901.5252, 546745.559, 5080065.7672]\n", "10002 [3794866.9711, 546729.5958, 5080092.6364]\n", - "10003 [3794841.051609108, 546735.1152754558, 5080111.543399332]\n", - "10004 [3794803.4594055074, 546714.1406417021, 5080141.3823901005]\n", - "10005 [3794793.841662743, 546722.3209011297, 5080147.930942906]\n", + "10008 [3794783.8581, 546746.6347, 5080152.7404]\n", + "10014 [3794838.7464, 546812.3658, 5080105.2]\n", + "10026 [3794753.8595, 546827.4296, 5080167.0938]\n", "\n", "Erste Ausgangspunkte:\n", "10001 [833.9439, 1978.3737, 99.8946]\n", "10002 [875.9684, 1998.5174, 99.5867]\n", - "10003 [908.4312, 1996.1248, 99.7403]\n", - "10004 [954.1536, 2021.6822, 99.4916]\n", - "10005 [966.5154, 2014.6496, 99.72]\n", - "min/mean/max: 0.9966158797615429 0.9999420515348254 1.0007101135088199\n", - "R ist nicht Orthonormal!\n", + "10008 [979.7022, 1991.401, 99.732]\n", + "10014 [913.9706, 1918.7731, 99.8872]\n", + "10026 [1020.0059, 1913.8703, 100.3059]\n", + "min/mean/max: 0.9986498495467658 0.9999468893556359 1.0004164038548047\n", + "R ist Orthonormal!\n", "Iteration Nr.1 abgeschlossen\n", - "Matrix([[-12.2], [2.70], [-2.05], [-0.0294], [-0.302], [0.0123], [0.236]])\n", + "Matrix([[-11.6], [6.17], [1.24], [-0.0287], [-0.303], [0.0131], [0.234]])\n", "Iteration Nr.2 abgeschlossen\n", - "Matrix([[5.71], [-4.20], [-6.60], [0.0294], [-0.00421], [-0.0138], [0.00255]])\n", + "Matrix([[6.69], [-7.21], [-7.49], [0.0287], [-0.00526], [-0.0136], [0.00423]])\n", "Iteration Nr.3 abgeschlossen\n", - "Matrix([[-0.0369], [0.0586], [0.0315], [2.78e-5], [0.000148], [0.000408], [-0.000136]])\n", + "Matrix([[-0.0296], [0.0719], [0.0282], [4.06e-5], [0.000189], [0.000386], [-0.000202]])\n", "Iteration Nr.4 abgeschlossen\n", - "Matrix([[-6.79e-5], [4.31e-5], [-7.44e-6], [3.17e-8], [1.62e-8], [2.83e-8], [-5.66e-8]])\n", + "Matrix([[-0.000141], [3.72e-5], [-0.000110], [4.57e-8], [-8.87e-9], [9.87e-8], [-5.50e-8]])\n", "Iteration Nr.5 abgeschlossen\n", - "Matrix([[-8.17e-10], [2.40e-10], [3.50e-10], [-4.99e-15], [6.67e-13], [2.62e-12], [3.47e-13]])\n", - "Matrix([[3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6]])\n", - "Matrix([[3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6]])\n", + "Matrix([[-2.01e-8], [-2.70e-9], [-2.25e-8], [-4.34e-14], [-5.16e-12], [2.79e-11], [5.62e-12]])\n", + "Iteration Nr.6 abgeschlossen\n", + "Matrix([[5.49e-10], [-9.92e-10], [-2.05e-9], [1.18e-13], [-8.18e-13], [1.23e-12], [1.45e-12]])\n", + "Matrix([[3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6]])\n", + "Matrix([[3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6], [3.79e+6], [5.47e+5], [5.08e+6]])\n", "x = Matrix([[3.80e+6], [5.49e+5], [5.08e+6], [1.00], [-0.156], [0.627], [3.26]])\n", "\n", "l_berechnet_final:\n", "10001: 3794901.510, 546745.579, 5080065.739\n", "10002: 3794867.000, 546729.613, 5080092.680\n", - "10003: 3794841.052, 546735.115, 5080111.543\n", - "10004: 3794803.459, 546714.141, 5080141.382\n", - "10005: 3794793.842, 546722.321, 5080147.931\n", - "10006: 3794766.356, 546707.639, 5080169.733\n", - "10007: 3794831.047, 546758.725, 5080116.663\n", "10008: 3794783.863, 546746.642, 5080152.749\n", - "10009: 3794767.472, 546740.087, 5080165.952\n", - "10010: 3794758.637, 546767.667, 5080169.464\n", - "10011: 3794894.923, 546833.116, 5080061.151\n", - "10012: 3794853.600, 546805.236, 5080094.889\n", - "10013: 3794849.609, 546826.869, 5080095.430\n", "10014: 3794838.739, 546812.364, 5080105.171\n", - "10015: 3794839.465, 546793.517, 5080106.771\n", - "10016: 3794826.658, 546788.728, 5080116.868\n", - "10017: 3794825.016, 546831.700, 5080113.375\n", - "10018: 3794762.248, 546797.691, 5080163.980\n", - "10019: 3794800.095, 546833.324, 5080131.725\n", - "10020: 3794782.611, 546834.471, 5080145.036\n", - "10021: 3794776.030, 546833.741, 5080150.013\n", - "10022: 3794778.337, 546841.750, 5080147.275\n", - "10023: 3794780.795, 546848.101, 5080144.925\n", - "10024: 3794772.816, 546857.096, 5080149.835\n", - "10025: 3794774.209, 546871.811, 5080147.359\n", "10026: 3794753.855, 546827.443, 5080167.088\n", - "10027: 3794757.591, 546874.331, 5080159.318\n", "10028: 3794889.666, 546908.762, 5080056.912\n", - "10029: 3794845.026, 546914.917, 5080089.100\n", - "10030: 3794845.353, 546901.027, 5080090.357\n", - "10031: 3794821.759, 546877.548, 5080110.746\n", - "10032: 3794807.848, 546888.486, 5080119.746\n", - "10033: 3794800.016, 546874.652, 5080127.205\n", - "10034: 3794886.105, 546965.699, 5080053.406\n", - "10035: 3794845.949, 546961.513, 5080084.088\n", - "10036: 3794815.055, 546969.597, 5080106.064\n", "10037: 3794800.626, 546960.749, 5080117.708\n", - "10038: 3794806.323, 546929.731, 5080116.899\n", - "10039: 3794804.162, 546914.732, 5080120.139\n", - "10040: 3794780.721, 546956.425, 5080133.161\n", - "10041: 3794778.153, 546925.878, 5080138.722\n", - "10042: 3794758.957, 546937.060, 5080151.610\n", - "10043: 3794747.274, 546919.150, 5080162.150\n", "10044: 3794752.687, 546958.324, 5080154.240\n", - "10045: 3794881.900, 547019.784, 5080050.716\n", - "10046: 3794846.580, 547012.997, 5080077.440\n", - "10047: 3794831.535, 547018.239, 5080088.124\n", - "10048: 3794809.107, 547017.302, 5080105.014\n", - "10049: 3794786.891, 547021.077, 5080121.445\n", - "10050: 3794766.772, 547012.527, 5080137.485\n", - "10051: 3794767.057, 546988.699, 5080139.998\n", - "10052: 3794743.626, 546984.416, 5080157.831\n", - "10053: 3794748.146, 547017.575, 5080150.930\n", "10054: 3794889.165, 547086.950, 5080038.116\n", - "10055: 3794838.852, 547081.904, 5080075.698\n", - "10056: 3794825.041, 547094.812, 5080084.489\n", - "10057: 3794800.819, 547078.672, 5080104.573\n", - "10058: 3794766.109, 547091.754, 5080129.121\n", "10059: 3794736.836, 547079.449, 5080152.372\n", "Streckendifferenzen:\n", - "[0.037854, 0.054708, 0.0, 0.0, 0.0, 0.0, 0.0, 0.012057, 0.0, 0.0, 0.0, 0.0, 0.0, 0.029525, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.015332, 0.0, 0.073156, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.071369, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.025069, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.127425, 0.0, 0.0, 0.0, 0.0, 0.139397]\n", + "[0.037854, 0.054708, 0.012057, 0.029525, 0.015332, 0.073156, 0.071369, 0.025069, 0.127425, 0.139397]\n", "\n", "Differenz Schwerpunkt (Vektor):\n", - "Matrix([[7.73e-11], [9.13e-12], [-5.84e-10]])\n", + "Matrix([[7.45e-10], [-1.16e-11], [8.38e-10]])\n", "Betrag der Schwerpunkt-Differenz:\n", "0.000m\n" ] @@ -879,8 +585,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.432824Z", - "start_time": "2025-12-29T17:29:08.414129Z" + "end_time": "2025-12-29T18:03:19.638942Z", + "start_time": "2025-12-29T18:03:19.598219Z" } }, "cell_type": "code", @@ -897,7 +603,154 @@ "name": "stdout", "output_type": "stream", "text": [ - "{}\n" + "{'10003': Matrix([\n", + "[3794841.05160911],\n", + "[546735.115275456],\n", + "[5080111.54339933]]), '10004': Matrix([\n", + "[3794803.45940551],\n", + "[546714.140641702],\n", + "[ 5080141.3823901]]), '10005': Matrix([\n", + "[3794793.84166274],\n", + "[ 546722.32090113],\n", + "[5080147.93094291]]), '10006': Matrix([\n", + "[3794766.35574829],\n", + "[546707.638500931],\n", + "[5080169.73347008]]), '10007': Matrix([\n", + "[3794831.04653105],\n", + "[546758.725470118],\n", + "[5080116.66332494]]), '10009': Matrix([\n", + "[3794767.47195461],\n", + "[546740.086996252],\n", + "[5080165.95212446]]), '10010': Matrix([\n", + "[3794758.63661992],\n", + "[546767.666577211],\n", + "[5080169.46449998]]), '10011': Matrix([\n", + "[3794894.92257966],\n", + "[546833.115975429],\n", + "[5080061.15134195]]), '10012': Matrix([\n", + "[3794853.60027107],\n", + "[546805.236484738],\n", + "[5080094.88946121]]), '10013': Matrix([\n", + "[3794849.60872447],\n", + "[ 546826.86855409],\n", + "[5080095.43002485]]), '10015': Matrix([\n", + "[3794839.46502568],\n", + "[546793.516554541],\n", + "[5080106.77121535]]), '10016': Matrix([\n", + "[3794826.65837474],\n", + "[ 546788.72753901],\n", + "[5080116.86823753]]), '10017': Matrix([\n", + "[3794825.01615411],\n", + "[ 546831.69988615],\n", + "[5080113.37479229]]), '10018': Matrix([\n", + "[3794762.24812675],\n", + "[546797.691250755],\n", + "[5080163.98038017]]), '10019': Matrix([\n", + "[3794800.09467062],\n", + "[546833.323961445],\n", + "[5080131.72453226]]), '10020': Matrix([\n", + "[3794782.61058088],\n", + "[546834.470509102],\n", + "[5080145.03614137]]), '10021': Matrix([\n", + "[3794776.02957169],\n", + "[ 546833.74069488],\n", + "[5080150.01297385]]), '10022': Matrix([\n", + "[3794778.33715317],\n", + "[546841.750187296],\n", + "[5080147.27507413]]), '10023': Matrix([\n", + "[3794780.79521146],\n", + "[546848.101209168],\n", + "[5080144.92492221]]), '10024': Matrix([\n", + "[3794772.81613581],\n", + "[546857.095708699],\n", + "[5080149.83471416]]), '10025': Matrix([\n", + "[3794774.20856191],\n", + "[546871.810730791],\n", + "[5080147.35917511]]), '10027': Matrix([\n", + "[3794757.59126177],\n", + "[ 546874.33140033],\n", + "[ 5080159.3175342]]), '10029': Matrix([\n", + "[3794845.02635416],\n", + "[ 546914.91670774],\n", + "[5080089.09994617]]), '10030': Matrix([\n", + "[3794845.35315639],\n", + "[546901.027441841],\n", + "[5080090.35653172]]), '10031': Matrix([\n", + "[3794821.75944771],\n", + "[546877.548058418],\n", + "[5080110.74604618]]), '10032': Matrix([\n", + "[ 3794807.8482107],\n", + "[546888.486125463],\n", + "[5080119.74590858]]), '10033': Matrix([\n", + "[3794800.01604745],\n", + "[546874.652456339],\n", + "[ 5080127.2047441]]), '10034': Matrix([\n", + "[3794886.10489475],\n", + "[546965.698741554],\n", + "[5080053.40592357]]), '10035': Matrix([\n", + "[3794845.94875191],\n", + "[546961.512678588],\n", + "[5080084.08751097]]), '10036': Matrix([\n", + "[ 3794815.0546409],\n", + "[546969.596670608],\n", + "[5080106.06411486]]), '10038': Matrix([\n", + "[3794806.32334837],\n", + "[546929.730872601],\n", + "[5080116.89880491]]), '10039': Matrix([\n", + "[3794804.16237313],\n", + "[546914.731636072],\n", + "[5080120.13924256]]), '10040': Matrix([\n", + "[3794780.72087746],\n", + "[546956.424991315],\n", + "[5080133.16147109]]), '10041': Matrix([\n", + "[ 3794778.1533287],\n", + "[546925.877928891],\n", + "[5080138.72231384]]), '10042': Matrix([\n", + "[3794758.95717917],\n", + "[546937.059902176],\n", + "[5080151.61030441]]), '10043': Matrix([\n", + "[3794747.27379863],\n", + "[546919.149782895],\n", + "[5080162.14971609]]), '10045': Matrix([\n", + "[3794881.90045231],\n", + "[547019.783587438],\n", + "[5080050.71577784]]), '10046': Matrix([\n", + "[3794846.58037187],\n", + "[547012.997115671],\n", + "[5080077.44042076]]), '10047': Matrix([\n", + "[3794831.53498179],\n", + "[547018.239388235],\n", + "[5080088.12403859]]), '10048': Matrix([\n", + "[3794809.10667963],\n", + "[547017.302310622],\n", + "[ 5080105.0143912]]), '10049': Matrix([\n", + "[3794786.89079629],\n", + "[547021.076569963],\n", + "[5080121.44468111]]), '10050': Matrix([\n", + "[3794766.77195448],\n", + "[547012.526623627],\n", + "[5080137.48497074]]), '10051': Matrix([\n", + "[3794767.05746264],\n", + "[546988.699370853],\n", + "[5080139.99787468]]), '10052': Matrix([\n", + "[3794743.62620891],\n", + "[546984.415934838],\n", + "[5080157.83116681]]), '10053': Matrix([\n", + "[3794748.14608301],\n", + "[ 547017.57483818],\n", + "[5080150.93007251]]), '10055': Matrix([\n", + "[3794838.85197728],\n", + "[547081.903863645],\n", + "[5080075.69824785]]), '10056': Matrix([\n", + "[3794825.04100344],\n", + "[547094.811574165],\n", + "[5080084.48876832]]), '10057': Matrix([\n", + "[ 3794800.8193707],\n", + "[547078.671611169],\n", + "[5080104.57270624]]), '10058': Matrix([\n", + "[3794766.10881437],\n", + "[547091.754287187],\n", + "[5080129.12088173]])}\n" ] } ], @@ -906,8 +759,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.442532Z", - "start_time": "2025-12-29T17:29:08.437891Z" + "end_time": "2025-12-29T18:03:19.671976Z", + "start_time": "2025-12-29T18:03:19.651093Z" } }, "cell_type": "code", @@ -924,8 +777,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.459163Z", - "start_time": "2025-12-29T17:29:08.450531Z" + "end_time": "2025-12-29T18:03:19.710354Z", + "start_time": "2025-12-29T18:03:19.677187Z" } }, "cell_type": "code", @@ -945,10 +798,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Das Instrument Trimble S9 ist bereits in der Datenbank vorhanden.\n", - "Es hat die ID 1\n", - "Das Instrument Trimble DiNi 0.3 ist bereits in der Datenbank vorhanden.\n", - "Es hat die ID 2\n" + "Das Instrument Trimble S9 wurde erfolgreich hinzugefügt.\n", + "Das Instrument Trimble DiNi 0.3 wurde erfolgreich hinzugefügt.\n" ] }, { @@ -967,8 +818,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.471099Z", - "start_time": "2025-12-29T17:29:08.464146Z" + "end_time": "2025-12-29T18:03:19.755859Z", + "start_time": "2025-12-29T18:03:19.715224Z" } }, "cell_type": "code", @@ -992,9 +843,9 @@ "name": "stdout", "output_type": "stream", "text": [ - "Die Genauigkeitsangabe ist bereits in der Datenbank vorhanden.\n", - "Die Genauigkeitsangabe ist bereits in der Datenbank vorhanden.\n", - "Die Genauigkeitsangabe ist bereits in der Datenbank vorhanden.\n" + "Die Genauigkeitsangabe für die Beobachtungsart Tachymeter_Richtung des Instrumentes Trimble S9 wurde erfolgreich hinzugefügt.\n", + "Die Genauigkeitsangabe für die Beobachtungsart Tachymeter_Strecke des Instrumentes Trimble S9 wurde erfolgreich hinzugefügt.\n", + "Die Genauigkeitsangabe für die Beobachtungsart Tachymeter_Zenitwinkel des Instrumentes Trimble S9 wurde erfolgreich hinzugefügt.\n" ] } ], @@ -1003,8 +854,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.482507Z", - "start_time": "2025-12-29T17:29:08.477411Z" + "end_time": "2025-12-29T18:03:19.801660Z", + "start_time": "2025-12-29T18:03:19.767976Z" } }, "cell_type": "code", @@ -1023,7 +874,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "Der Import wurde abgebrochen, weil die Beobachtungen aus der Datei Daten\\campsnetz_beobachtungen_bereinigt.csv bereits in der Datenbank vorhanden sind.\n" + "Der Import der Datei Daten\\campsnetz_beobachtungen_bereinigt.csv wurde erfolgreich abgeschlossen.\n" ] } ], @@ -1032,8 +883,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.507643Z", - "start_time": "2025-12-29T17:29:08.490170Z" + "end_time": "2025-12-29T18:03:19.832236Z", + "start_time": "2025-12-29T18:03:19.813806Z" } }, "cell_type": "code", @@ -1051,7 +902,7 @@ { "data": { "text/plain": [ - "'Der HFP 666 wurde aktualisiert.\\nDer HFP 812 wurde aktualisiert.\\nDer HFP 816 wurde aktualisiert.'" + "'Der HFP 666 wurde neu hinzugefügt.\\nDer HFP 812 wurde neu hinzugefügt.\\nDer HFP 816 wurde neu hinzugefügt.'" ] }, "execution_count": 15, @@ -1064,8 +915,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:08.519187Z", - "start_time": "2025-12-29T17:29:08.512286Z" + "end_time": "2025-12-29T18:03:19.849073Z", + "start_time": "2025-12-29T18:03:19.843210Z" } }, "cell_type": "code", @@ -1080,75 +931,7 @@ { "data": { "text/plain": [ - "[('10009', 4.1228),\n", - " ('10006', 3.700452),\n", - " ('10010', 4.042865),\n", - " ('10018', 4.37204),\n", - " ('10008', 3.84784),\n", - " ('10005', 3.837325),\n", - " ('10003', 3.86254),\n", - " ('10004', 3.61063),\n", - " ('10007', 4.032877),\n", - " ('10001', 4.011375),\n", - " ('10002', 3.70914),\n", - " ('10016', 4.17165),\n", - " ('10011', 3.9289),\n", - " ('10026', 4.417013),\n", - " ('10027', 4.44308),\n", - " ('10043', 4.42904),\n", - " ('10044', 4.656675),\n", - " ('10021', 4.465185),\n", - " ('10020', 4.451425),\n", - " ('10024', 4.416225),\n", - " ('10025', 4.52817),\n", - " ('10022', 4.332345),\n", - " ('10023', 4.455445),\n", - " ('10019', 4.08987),\n", - " ('10033', 3.968025),\n", - " ('10017', 4.08287),\n", - " ('10052', 4.39907),\n", - " ('10042', 4.46707),\n", - " ('10053', 4.386353),\n", - " ('10037', 4.10459),\n", - " ('10040', 4.277468),\n", - " ('10041', 4.59913),\n", - " ('10038', 4.19912),\n", - " ('10051', 4.395635),\n", - " ('10036', 4.11213),\n", - " ('10035', 4.18675),\n", - " ('10039', 4.207075),\n", - " ('10059', 4.143315),\n", - " ('10050', 4.27416),\n", - " ('10013', 3.912175),\n", - " ('10028', 3.9),\n", - " ('10012', 4.007365),\n", - " ('10014', 4.01094),\n", - " ('10031', 3.974038),\n", - " ('10015', 4.09836),\n", - " ('10032', 3.839305),\n", - " ('10030', 3.686305),\n", - " ('10029', 3.65702),\n", - " ('10034', 3.846134),\n", - " ('10045', 3.829975),\n", - " ('10049', 4.104995),\n", - " ('10048', 3.897465),\n", - " ('10047', 3.707345),\n", - " ('10046', 3.64526),\n", - " ('10057', 3.87817),\n", - " ('10055', 3.56299),\n", - " ('10054', 3.8132),\n", - " ('10058', 3.980515),\n", - " ('10056', 3.537135),\n", - " ('666', 3.891),\n", - " ('812', 3.999),\n", - " ('816', 3.995),\n", - " ('FH14', 4.119355),\n", - " ('FH11', 4.06521),\n", - " ('FH13', 4.54882),\n", - " ('FH3', 4.71028),\n", - " ('FH4', 4.72869),\n", - " ('FH15', 4.73323),\n", - " ('FH5', 4.71542)]" + "[('666', 3.891), ('812', 3.999), ('816', 3.995)]" ] }, "execution_count": 16, @@ -1161,8 +944,8 @@ { "metadata": { "ExecuteTime": { - "end_time": "2025-12-29T17:29:09.171902Z", - "start_time": "2025-12-29T17:29:08.525309Z" + "end_time": "2025-12-29T18:03:19.884873Z", + "start_time": "2025-12-29T18:03:19.860522Z" } }, "cell_type": "code", @@ -1179,18 +962,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "Der Import wurde abgebrochen, weil die Beobachtungen aus der Datei Daten\\Niv_bereinigt.DAT.csv bereits in der Datenbank vorhanden sind.\n" - ] - }, - { - "ename": "TypeError", - "evalue": "cannot unpack non-iterable NoneType object", - "output_type": "error", - "traceback": [ - "\u001B[31m---------------------------------------------------------------------------\u001B[39m", - "\u001B[31mTypeError\u001B[39m Traceback (most recent call last)", - "\u001B[36mCell\u001B[39m\u001B[36m \u001B[39m\u001B[32mIn[17]\u001B[39m\u001B[32m, line 5\u001B[39m\n\u001B[32m 3\u001B[39m importlib.reload(Import)\n\u001B[32m 4\u001B[39m imp = Import.Import(pfad_datenbank)\n\u001B[32m----> \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": {},