Cleanups in tests

Signed-off-by: Johannes Mueller <[email protected]>

tests/stress/rainflow/test_fkm_nonlinear.py

@@ -1090,12 +1090,8 @@ def test_history_guideline_at_split(split_point):
     pd.testing.assert_frame_equal(df, expected, rtol=1e-1)
 
 
-def test_epsilon_max_LF_unclosed_hysteresis():
-    # Fig 2.3 FKM NL Guideline
-
-    signal = pd.Series([0.0, -100.0, 100.0, 0.0, 200.0, 100.0])
-    signal.index.name = "load_step"
-
+@pytest.fixture
+def unitdetector():
     recorder = RFR.FKMNonlinearRecorder()
     E = 1.0    # [MPa] Young's modulus
     K = 1e6     # 1184 [MPa]
@@ -1105,78 +1101,32 @@ def test_epsilon_max_LF_unclosed_hysteresis():
     # initialize notch approximation law
     extended_neuber = NAL.ExtendedNeuber(E, K, n, K_p)
 
-    detector = FKMNonlinearDetector(recorder=recorder, notch_approximation_law=extended_neuber)
+    return FKMNonlinearDetector(recorder=recorder, notch_approximation_law=extended_neuber)
 
-    detector.process(signal)
 
-    print(detector.recorder.loads_min)
-    print(detector.recorder.loads_max)
-    print(detector.recorder.epsilon_min_LF)
-    print(detector.recorder.epsilon_max_LF)
-
-    print(detector.recorder.collective)
-    print(detector.history())
+def test_epsilon_max_LF_unclosed_hysteresis(unitdetector):
+    signal = pd.Series([0.0, -100.0, 100.0, 0.0, 200.0, 100.0])
+    signal.index.name = "load_step"
 
-    print([np.diff(recorder.epsilon_min_LF) <= 0.0])
-    assert np.all([np.diff(recorder.epsilon_min_LF) <= 0.0])
+    unitdetector.process(signal)
 
-    print([np.diff(recorder.epsilon_max_LF) >= 0.0])
-    assert np.all([np.diff(recorder.epsilon_max_LF) >= 0.0])
+    assert np.all([np.diff(unitdetector.recorder.epsilon_min_LF) <= 0.0])
+    assert np.all([np.diff(unitdetector.recorder.epsilon_max_LF) >= 0.0])
 
 
-def test_epsilon_min_LF_flip():
+def test_epsilon_min_LF_flip(unitdetector):
     signal = pd.Series([10.0, -1.0, 260.0, -250.0, 60.0, -280.0, -100.0])
     signal.index.name = "load_step"
 
-    recorder = RFR.FKMNonlinearRecorder()
-    E = 1.0    # [MPa] Young's modulus
-    K = 1e6     # 1184 [MPa]
-    n = 1.0    # [-]
-    K_p = 1.0    # [-] (de: Traglastformzahl) K_p = F_plastic / F_yield (3.1.1)
+    unitdetector.process(signal)
 
-    # initialize notch approximation law
-    extended_neuber = NAL.ExtendedNeuber(E, K, n, K_p)
+    assert np.all([np.diff(unitdetector.recorder.epsilon_min_LF) <= 0.0])
 
-    detector = FKMNonlinearDetector(recorder=recorder, notch_approximation_law=extended_neuber)
 
-    detector.process(signal)
-
-    print(detector.recorder.loads_min)
-    print(detector.recorder.loads_max)
-    print(detector.recorder.epsilon_min_LF)
-    print(detector.recorder.epsilon_max_LF)
-
-    print(detector.recorder.collective)
-    print(detector.history())
-
-    print([np.diff(recorder.epsilon_min_LF) <= 0.0])
-    assert np.all([np.diff(recorder.epsilon_min_LF) <= 0.0])
-
-
-def test_epsilon_max_LF_flip():
+def test_epsilon_max_LF_flip(unitdetector):
     signal = -1.0 * pd.Series([10.0, -1.0, 260.0, -250.0, 60.0, -280.0, -100.0])
     signal.index.name = "load_step"
 
-    recorder = RFR.FKMNonlinearRecorder()
-    E = 1.0    # [MPa] Young's modulus
-    K = 1e6     # 1184 [MPa]
-    n = 1.0    # [-]
-    K_p = 1.0    # [-] (de: Traglastformzahl) K_p = F_plastic / F_yield (3.1.1)
-
-    # initialize notch approximation law
-    extended_neuber = NAL.ExtendedNeuber(E, K, n, K_p)
-
-    detector = FKMNonlinearDetector(recorder=recorder, notch_approximation_law=extended_neuber)
-
-    detector.process(signal)
-
-    print(detector.recorder.loads_min)
-    print(detector.recorder.loads_max)
-    print(detector.recorder.epsilon_min_LF)
-    print(detector.recorder.epsilon_max_LF)
-
-    print(detector.recorder.collective)
-    print(detector.history())
+    unitdetector.process(signal)
 
-    print([np.diff(recorder.epsilon_max_LF) >= 0.0])
-    assert np.all([np.diff(recorder.epsilon_max_LF) >= 0.0])
+    assert np.all([np.diff(unitdetector.recorder.epsilon_max_LF) >= 0.0])