delta-theory 6.10.1__py3-none-any.whl → 6.10.5__py3-none-any.whl

core/__init__.py

@@ -7,7 +7,7 @@ Modules:
     - unified_yield_fatigue_v6_9: Main yield + fatigue model (v6.9b)
     - dbt_unified: Ductile-Brittle Transition Temperature prediction
     - materials: Material database
-    - fatigue_redis_api: FatigueData-AM2022 Redis API
+    - fatigue_redis_api: FatigueData-AM2022 Redis API (optional)
 """
 
 from .unified_yield_fatigue_v6_9 import (
@@ -31,9 +31,13 @@ from .dbt_unified import (
 
 from .materials import MaterialGPU
 
-from .fatigue_redis_api import FatigueDB  # ← 追加！
+# Optional: FatigueDB (requires upstash-redis)
+try:
+    from .fatigue_redis_api import FatigueDB
+except ImportError:
+    FatigueDB = None  # upstash-redis not installed
 
-__version__ = "6.10.1"  # ← バージョンも上げる！
+__version__ = "6.10.1"
 __author__ = "Masamichi Iizumi & Tamaki"
 
 __all__ = [
@@ -54,6 +58,6 @@ __all__ = [
     "MATERIAL_FE",
     # Materials
     "MaterialGPU",
-    # FatigueDB
-    "FatigueDB",  # ← 追加！
+    # FatigueDB (optional)
+    "FatigueDB",
 ]

core/unified_yield_fatigue_v6_9.py

@@ -432,12 +432,14 @@ def fatigue_life_const_amp(
     C_class: float = C_CLASS_DEFAULT,
     bcc_w110: float = DEFAULT_BCC_W110,
     apply_C_class_hcp: bool = False,
+    r_th_override: float | None = None,
+    n_override: float | None = None,
 ) -> Dict[str, float | str]:
     """Fatigue life under constant amplitude for the chosen loading mode."""
 
-    preset = FATIGUE_CLASS_PRESET.get(mat.structure, FATIGUE_CLASS_PRESET['FCC'])
-    r_th = preset['r_th']
-    n = preset['n']
+    preset = FATIGUE_CLASS_PRESET[mat.structure]
+    r_th = r_th_override if r_th_override is not None else preset['r_th']
+    n = n_override if n_override is not None else preset['n']
 
     A_int = A_INT_DB.get(mat.name, 1.0)
     A_eff = A_int * A_ext
@@ -485,6 +487,8 @@ def generate_sn_curve(
     C_class: float = C_CLASS_DEFAULT,
     bcc_w110: float = DEFAULT_BCC_W110,
     apply_C_class_hcp: bool = False,
+    r_th_override: float | None = None,
+    n_override: float | None = None,
 ) -> np.ndarray:
     Ns = []
     for s in sigmas_MPa:
@@ -498,6 +502,8 @@ def generate_sn_curve(
             C_class=C_class,
             bcc_w110=bcc_w110,
             apply_C_class_hcp=apply_C_class_hcp,
+            r_th_override=r_th_override,
+            n_override=n_override,
         )
         Ns.append(out['N_fail'])
     return np.array(Ns, dtype=float)
@@ -576,6 +582,8 @@ def cmd_point(args: argparse.Namespace) -> None:
             C_class=args.C_class,
             bcc_w110=args.bcc_w110,
             apply_C_class_hcp=args.apply_C_class_hcp,
+            r_th_override=args.r_th,
+            n_override=args.n_exp,
         )
     else:
         out = None
@@ -670,8 +678,9 @@ def cmd_calibrate(args: argparse.Namespace) -> None:
         )
         sigma_y = y['sigma_y']
 
-    preset = FATIGUE_CLASS_PRESET.get(mat.structure, FATIGUE_CLASS_PRESET['FCC'])
-    r_th, n = preset['r_th'], preset['n']
+    preset = FATIGUE_CLASS_PRESET[mat.structure]
+    r_th = args.r_th if args.r_th is not None else preset['r_th']
+    n = args.n_exp if args.n_exp is not None else preset['n']
 
     y_mode, _ = yield_by_mode(
         mat,
@@ -755,6 +764,8 @@ def cmd_sn(args: argparse.Namespace) -> None:
         C_class=args.C_class,
         bcc_w110=args.bcc_w110,
         apply_C_class_hcp=args.apply_C_class_hcp,
+        r_th_override=args.r_th,
+        n_override=args.n_exp,
     )
 
     label = f"structure={mat.structure}" if args.structure_only else f"metal={mat.name} ({mat.structure})"
@@ -818,6 +829,8 @@ def build_parser() -> argparse.ArgumentParser:
         sp.add_argument('--mode', choices=['tensile', 'compression', 'shear'], default='tensile')
         sp.add_argument('--A_ext', type=float, default=2.46e-4, help='external factor (1-point calibration)')
         sp.add_argument('--D_fail', type=float, default=0.5)
+        sp.add_argument('--r_th', type=float, default=None, help='Override r_th (fatigue threshold ratio)')
+        sp.add_argument('--n_exp', type=float, default=None, help='Override n (fatigue exponent)')
 
     sp_point = sub.add_parser('point', help='compute yield (+ optional fatigue life)')
     add_common(sp_point)

{delta_theory-6.10.1.dist-info → delta_theory-6.10.5.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: delta-theory
-Version: 6.10.1
+Version: 6.10.5
 Summary: Unified materials strength and fatigue prediction based on geometric first principles
 Author: Tamaki
 Author-email: Masamichi Iizumi <m.iizumi@miosync.email>
-Maintainer-email: Masamichi Iizumi <masamichi@miosync.com>
+Maintainer-email: Masamichi Iizumi <m.iizumi@miosync.email>
 License: MIT
 Project-URL: Homepage, https://github.com/miosync/delta-theory
 Project-URL: Documentation, https://github.com/miosync/delta-theory#readme

{delta_theory-6.10.1.dist-info → delta_theory-6.10.5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 apps/__init__.py,sha256=Jjt0FwRjaPFkffK1I4OUp2M0IR2oeh9yaeLPRhyPCxw,95
 apps/delta_fatigue_app.py,sha256=2lDdKF9NeyzQB7VyH0-vSZF7IveSrNAIwtRpYPekFNM,12448
 core/Universal_Lindemann.py,sha256=lEDhhSzE3sVhwSqaG1EeNCr1PuCRLaYj0C6faISGaO0,14227
-core/__init__.py,sha256=AhxBl6fUFp0nQ63wqHfHDh3ifSU6gD_f2AhJmlcr5ac,1297
+core/__init__.py,sha256=ALNGXTtGoiq0lQaQ67PMxEL6HrWRr7KlEMvId9Se8yg,1375
 core/dbt_unified.py,sha256=m-tO6mDnEmpWfmuWKSAyX_0wLhPiXJ5VWQ0uUpNWuSY,23042
 core/fatigue_redis_api.py,sha256=4fXVhDuXPads_CjBkqQex2YUOjw2WxdTgZo2SxpbWvc,16274
 core/materials.py,sha256=FLVQWOrQ_CooDr-wi3S6GJnTGDV15RpHGCnbVIEy0q0,17051
-core/unified_yield_fatigue_v6_9.py,sha256=SnzNMT2yDxfyeRxii7W334X_0MQ0eKNgBmpuLqiv9nQ,32833
-delta_theory-6.10.1.dist-info/licenses/LICENSE,sha256=8dVpjRFTkE7BbLXxN9C2jwYio3jR9mD3q-DRcnqsQQo,1211
-delta_theory-6.10.1.dist-info/METADATA,sha256=iNDpJY-QUZpLUgfi2oYfyfTHt7YXxX2b5Et9x33_jVM,16829
-delta_theory-6.10.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-delta_theory-6.10.1.dist-info/entry_points.txt,sha256=SbfW_U3JII-Ygfnfx1qRw7-zdXUf7f2h8ZAUxxKxWu0,103
-delta_theory-6.10.1.dist-info/top_level.txt,sha256=y2DGPXIOL_UZHy6CTjK7_CvOytT9zdBpsg7BW5R6mxQ,10
-delta_theory-6.10.1.dist-info/RECORD,,
+core/unified_yield_fatigue_v6_9.py,sha256=r9QfN8SjFG9G-NGRNPRMnV45Gu9s8ug3iXHyHcG0R-w,33516
+delta_theory-6.10.5.dist-info/licenses/LICENSE,sha256=8dVpjRFTkE7BbLXxN9C2jwYio3jR9mD3q-DRcnqsQQo,1211
+delta_theory-6.10.5.dist-info/METADATA,sha256=nyNFcYVOXFdZQMMeYLsXjEA-XcjPPxYs-kPwsv3e7RY,16830
+delta_theory-6.10.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+delta_theory-6.10.5.dist-info/entry_points.txt,sha256=SbfW_U3JII-Ygfnfx1qRw7-zdXUf7f2h8ZAUxxKxWu0,103
+delta_theory-6.10.5.dist-info/top_level.txt,sha256=y2DGPXIOL_UZHy6CTjK7_CvOytT9zdBpsg7BW5R6mxQ,10
+delta_theory-6.10.5.dist-info/RECORD,,