Update load.py

load.py

@@ -43,6 +43,34 @@ def convergence_suppressor(inputs):
 def clip_modulation(x):
     return tf.clip_by_value(x, 0.7, 1.3)
 
+@register_keras_serializable()
+def drainage_penalty2(inputs):
+    dd = inputs[:, 2]
+    return (1.0 - 0.4 * tf.sigmoid((dd - 3.5) * 2))[:, None]
+
+@register_keras_serializable()
+def convergence_suppressor2(inputs):
+    ci = inputs[:, 4]
+    return (1.0 + 0.3 * tf.sigmoid((ci - 0.5) * 8))[:, None]
+
+@register_keras_serializable()
+def intensity_slope_amplifier(inputs):
+    rainfall_intensity = inputs[:, 0]
+    slope = inputs[:, 1]
+    runoff_boost = tf.sigmoid((rainfall_intensity - 75) * 0.08)
+    slope_boost = tf.sigmoid((slope - 10) * 0.05)
+    return (1.0 + 0.35 * runoff_boost * slope_boost)[:, None]
+
+def clip_modulation2(x):
+    return tf.clip_by_value(x, 0.7, 1.3)
+
+CUSTOM_OBJECTS2 = {
+    'drainage_penalty': drainage_penalty2,
+    'intensity_slope_amplifier': intensity_slope_amplifier,
+    'convergence_suppressor': convergence_suppressor2,
+    'clip_modulation': clip_modulation2
+}
+
 CUSTOM_OBJECTS = {
     'drainage_penalty': drainage_penalty,
     'convergence_suppressor': convergence_suppressor,
@@ -63,7 +91,7 @@ PV_FloodNet = tf.keras.models.load_model(get_path("sharktide", "PV-FloodNet"), s
 PV_FloodTrustNet = hft.load_model("sharktide", "PV-FloodTrustNet", "tf_model.h5", True)
 PV_FloodScaler = joblib.load("scalers/PV-floodtrust_scaler.pkl")
 
-FlashFloodNet = hft.load_model("sharktide", "FlashFloodNet", "tf_model.h5", True)
+FlashFloodNet = tf.keras.models.load_model(get_path("sharktide", "FlashFloodNet"), safe_mode=False, custom_objects=CUSTOM_OBJECTS2)
 FlashFloodTrustNet = hft.load_model("sharktide", "FlashFloodTrustNet", "tf_model.h5", True)
 FlashFloodScaler = joblib.load("scalers/flashFloodtrustscaler.pkl")