Merge pull request #150 from boschresearch/143-refactor-notch-approxi…

…mation 143 refactor notch approximation
boschresearch · Feb 6, 2025 · 94d3f8d · 94d3f8d
2 parents 5780dd1 + a3d7452
commit 94d3f8d
Show file tree

Hide file tree

Showing 17 changed files with 1,152 additions and 1,173 deletions.
diff --git a/benchmarks/generate_time_signal.py b/benchmarks/generate_time_signal.py
@@ -2,21 +2,23 @@
 import numpy as np
 import pylife.stress.timesignal as TS
 
-np.random.seed(23424711)
 
-load_signal = TS.TimeSignalGenerator(
-    10,
-    {
-        'number': 50_000,
-        'amplitude_median': 50.0,
-        'amplitude_std_dev': 0.5,
-        'frequency_median': 4,
-        'frequency_std_dev': 3,
-        'offset_median': 0,
-        'offset_std_dev': 0.4,
-    },
-    None,
-    None,
-).query(1_000_000)
+if __name__ == "__main__":
+    np.random.seed(23424711)
 
-np.savetxt('load_signal.csv', load_signal)
+    load_signal = TS.TimeSignalGenerator(
+        10,
+        {
+            'number': 50_000,
+            'amplitude_median': 50.0,
+            'amplitude_std_dev': 0.5,
+            'frequency_median': 4,
+            'frequency_std_dev': 3,
+            'offset_median': 0,
+            'offset_std_dev': 0.4,
+        },
+        None,
+        None,
+    ).query(1_000_000)
+
+    np.savetxt('load_signal.csv', load_signal)
diff --git a/demos/fkm_nonlinear/fkm_nonlinear_full.ipynb b/demos/fkm_nonlinear/fkm_nonlinear_full.ipynb
@@ -215,7 +215,7 @@
     "plt.rcParams.update({'font.size': 22})\n",
     "plt.plot(range(len(scaled_load_sequence)), load_sequence, \"o-\", c=\"g\", lw=3)\n",
     "plt.grid()\n",
-    "plt.ylabel(\"$\\sigma_V$ [MPa]\")"
+    "plt.ylabel(r\"$\\sigma_V$ [MPa]\")"
    ]
   },
   {
@@ -559,18 +559,13 @@
     "load_sequence_list = scaled_load_sequence\n",
     "print(load_sequence_list)\n",
     "\n",
-    "# wrap the notch approximation law by a binning class, which precomputes the values\n",
-    "maximum_absolute_load = max(np.abs(load_sequence_list))\n",
-    "print(f\"maximum_absolute_load: {maximum_absolute_load}\")\n",
-    "extended_neuber_binned = pylife.materiallaws.notch_approximation_law.Binned(\n",
-    "    extended_neuber, maximum_absolute_load, 100)\n",
-    "\n",
     "# create recorder object\n",
     "recorder = pylife.stress.rainflow.recorders.FKMNonlinearRecorder()\n",
     "\n",
     "# create detector object\n",
     "detector = pylife.stress.rainflow.fkm_nonlinear.FKMNonlinearDetector(\n",
-    "    recorder=recorder, notch_approximation_law=extended_neuber_binned)\n",
+    "    recorder=recorder, notch_approximation_law=extended_neuber\n",
+    ")\n",
     "\n",
     "# perform HCM algorithm, first run\n",
     "detector.process(load_sequence_list, flush=False)\n",
@@ -759,18 +754,13 @@
     "load_sequence_list = scaled_load_sequence\n",
     "print(load_sequence_list)\n",
     "\n",
-    "# wrap the notch approximation law by a binning class, which precomputes the values\n",
-    "maximum_absolute_load = max(np.abs(load_sequence_list))\n",
-    "print(f\"maximum_absolute_load: {maximum_absolute_load}\")\n",
-    "seeger_beste_binned = pylife.materiallaws.notch_approximation_law.Binned(\n",
-    "    seeger_beste, maximum_absolute_load, 100)\n",
-    "\n",
     "# create recorder object\n",
     "recorder = pylife.stress.rainflow.recorders.FKMNonlinearRecorder()\n",
     "\n",
     "# create detector object\n",
     "detector = pylife.stress.rainflow.fkm_nonlinear.FKMNonlinearDetector(\n",
-    "    recorder=recorder, notch_approximation_law=seeger_beste_binned)\n",
+    "    recorder=recorder, notch_approximation_law=seeger_beste\n",
+    ")\n",
     "\n",
     "# perform HCM algorithm, first run\n",
     "detector.process(load_sequence_list, flush=False)\n",