Merge remote-tracking branch 'origin/main'

.idea/Masterprojekt-Campusnetz.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.14 (Masterprojekt)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.14" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="PY-252.28238.29">
+  <component name="dataSourceStorageLocal" created-in="PY-252.27397.106">
     <data-source name="Campusnetz.db" uuid="c385b2f5-c801-4154-bc11-62182a8396b3">
       <database-info product="SQLite" version="3.45.1" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.45.1.0" dbms="SQLITE" exact-version="3.45.1" exact-driver-version="3.45">
         <identifier-quote-string>&quot;</identifier-quote-string>
@@ -27,5 +27,18 @@
         </introspection-scope>
       </schema-mapping>
     </data-source>
+    <data-source name="Campusnetz.db [3]" uuid="bf3bfb54-ef6e-4a90-8cb8-69f52581bab9">
+      <database-info product="SQLite" version="3.45.1" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.45.1.0" dbms="SQLITE" exact-version="3.45.1" exact-driver-version="3.45">
+        <identifier-quote-string>&quot;</identifier-quote-string>
+      </database-info>
+      <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
+      <secret-storage>master_key</secret-storage>
+      <auth-provider>no-auth</auth-provider>
+      <schema-mapping>
+        <introspection-scope>
+          <node kind="schema" qname="@" />
+        </introspection-scope>
+      </schema-mapping>
+    </data-source>
   </component>
 </project>

.idea/dataSources.xml

@@ -15,5 +15,12 @@
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/Campusnetz.db</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="Campusnetz.db [3]" uuid="bf3bfb54-ef6e-4a90-8cb8-69f52581bab9">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/Campusnetz.db</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>

.idea/dataSources/bf3bfb54-ef6e-4a90-8cb8-69f52581bab9/storage_v2/_src_/schema/main.uQUzAA.meta

@@ -0,0 +1,2 @@
+#n:main
+!<md> [0, 0, null, null, -2147483648, -2147483648]

.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.14" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14 (Masterprojekt)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14" project-jdk-type="Python SDK" />
 </project>

Datumsfestlegung.py

@@ -0,0 +1,14 @@
+import sympy as sp
+
+def auswahlmatrix_E(u: int, aktive_unbekannte_indices: Iterable[int]) -> sp.Matrix:
+    E = sp.zeros(u, u)
+    for idx in aktive_unbekannte_indices:
+        E[int(idx), int(idx)] = 1
+    return E
+
+def raenderungsmatric_G():
+
+
+def teilspurminimierung_Gi(G: sp.Matrix, E: sp.Matrix) -> sp.Matrix:
+    Gi = E * G
+    return Gi

Parameterschaetzung.py

@@ -37,4 +37,4 @@ def ausgleichung(A, dl, stoch_modell: StochastischesModell):
 
     Export.Export.ausgleichung_to_datei(r"Zwischenergebnisse\Ausgleichung_Iteration0.csv", dict_ausgleichung)
 
-    return dict_ausgleichung
+    return dict_ausgleichung, dx

Stochastisches_Modell.py

@@ -36,19 +36,22 @@ class StochastischesModell:
                 self.sigma0_gruppe[g] = 1.0
 
 
-    def berechne_Qll_P(self) -> Tuple[sp.Matrix, sp.Matrix]:
+    def berechne_Qll(self) -> Tuple[sp.Matrix, sp.Matrix]:
         n = self.n_beob
         Q_ll = sp.zeros(n, n)
         P = sp.zeros(n, n)
         for i in range(self.n_beob):
             sigma_i = self.sigma_beob[i, 0]         #σ-Wert der i-ten Beobachtung holen
-            g = int(self.gruppe_beob[i, 0])          #Gruppenzugehörigkeit der Beobachtung bestimmen
+            g = int(self.gruppe_beob[i, 0])         #Gruppenzugehörigkeit der Beobachtung bestimmen
             sigma0_sq = self.sigma0_gruppe[g]       #Den Varianzfaktor der Gruppe holen
             q_ii = sigma_i**2                       #σ² berechnen
             Q_ll[i, i] = q_ii                       #Diagonale
             P[i, i] = 1 / (sigma0_sq * q_ii)        #durch VKS nicht mehr P=Qll^-1
-        return Q_ll, P
+        return Q_ll
 
+    def berechne_P(Q_ll):
+        P = Q_ll.inv()
+        return P
 
     def berechne_Qvv(self, A: sp.Matrix, P: sp.Matrix, Q_xx: sp.Matrix) -> sp.Matrix:
         Q_vv = P.inv() - A * Q_xx * A.T