Merge remote-tracking branch 'origin/main'

This commit is contained in:
Tammo.Weber
2026-02-09 11:45:29 +01:00
8 changed files with 1390 additions and 5702 deletions

View File

@@ -1,7 +1,9 @@
import numpy as np
from numpy import sin, cos
from numpy.typing import NDArray
from ellipsoide import EllipsoidTriaxial
from GHA_triaxial.gha1_ana import gha1_ana
from GHA_triaxial.utils import func_sigma_ell, louville_constant
from GHA_triaxial.utils import func_sigma_ell, louville_constant, pq_ell
import plotly.graph_objects as go
import winkelumrechnungen as wu

View File

@@ -97,66 +97,44 @@ def get_random_examples_umbilics_end(num: int, seed: int = None) -> List:
def get_random_examples_gamma(group: str, num: int, seed: int = None, length: str = None) -> List:
eps = 1e-20
long_short = 1.5
long_short = 2
if seed is not None:
random.seed(seed)
with open(r"C:\Users\moell\OneDrive\Desktop\Vorlesungen\Master-Projekt\Python_Masterprojekt\GHA_triaxial\Karney_2024_Testset.txt") as datei:
lines = datei.readlines()
examples = []
while len(examples) < num:
i = 0
while len(examples) < num and i < len(lines):
example = line2example(lines[random.randint(0, len(lines) - 1)])
if example in examples:
continue
i += 1
beta0, lamb0, alpha0_ell, beta1, lamb1, alpha1_ell, s = example
gamma = jacobi_konstante(beta0, lamb0, alpha0_ell, ell)
if group == "a":
if 1 >= gamma >= 0.1:
if length == "short":
if example[6] < long_short:
examples.append(example)
elif length == "long":
if example[6] >= long_short:
examples.append(example)
else:
examples.append(example)
if group == "b":
if 0.1 > gamma > eps:
if length == "short":
if example[6] < long_short:
examples.append(example)
elif length == "long":
if example[6] >= long_short:
examples.append(example)
else:
examples.append(example)
if group == "c":
if abs(gamma) <= eps:
if length == "short":
if example[6] < long_short:
examples.append(example)
elif length == "long":
if example[6] >= long_short:
examples.append(example)
else:
examples.append(example)
if group == "de":
if eps > gamma > -1e-17:
if length == "short":
if example[6] < long_short:
examples.append(example)
elif length == "long":
if example[6] >= long_short:
examples.append(example)
else:
examples.append(example)
if group == "e":
if -1e-17 >= gamma >= -1:
if length == "short":
if example[6] < long_short:
examples.append(example)
elif length == "long":
if example[6] >= long_short:
examples.append(example)
else:
examples.append(example)
if group not in ["a", "b", "c", "d", "e"]:
break
elif group == "a" and not 1 >= gamma >= 0.01:
continue
elif group == "b" and not 0.01 > gamma > eps:
continue
elif group == "c" and not abs(gamma) <= eps:
continue
elif group == "d" and not -eps > gamma > -1e-17:
continue
elif group == "e" and not -1e-17 >= gamma >= -1:
continue
if length == "short":
if example[6] < long_short:
examples.append(example)
elif length == "long":
if example[6] >= long_short:
examples.append(example)
else:
examples.append(example)
return examples