deploy: 372e1de

zsarnoczay · Feb 4, 2025 · 9c22b47 · 9c22b47
1 parent 9be9273
commit 9c22b47
Show file tree

Hide file tree

Showing 7 changed files with 207 additions and 209 deletions.
diff --git a/_modules/pelicun/assessment.html b/_modules/pelicun/assessment.html
@@ -238,7 +238,6 @@ <h1>Source code for pelicun.assessment</h1><div class="highlight"><pre>
         <span class="s1">&#39;3_excessiveRID&#39;</span><span class="p">:</span> <span class="p">{</span><span class="s1">&#39;DS1&#39;</span><span class="p">:</span> <span class="s1">&#39;irreparable_DS1&#39;</span><span class="p">},</span>
         <span class="s1">&#39;4_irreparable&#39;</span><span class="p">:</span> <span class="p">{</span><span class="s1">&#39;DS1&#39;</span><span class="p">:</span> <span class="s1">&#39;ALL_NA&#39;</span><span class="p">},</span>
         <span class="s1">&#39;5_irreparable&#39;</span><span class="p">:</span> <span class="p">{</span><span class="s1">&#39;DS1&#39;</span><span class="p">:</span> <span class="s1">&#39;collapse_DS0&#39;</span><span class="p">},</span>
-
     <span class="p">},</span>
     <span class="c1"># TODO(AZ): expand with ground failure logic</span>
     <span class="s1">&#39;Hazus Earthquake&#39;</span><span class="p">:</span> <span class="p">{</span>
@@ -1175,9 +1174,7 @@ <h1>Source code for pelicun.assessment</h1><div class="highlight"><pre>
             <span class="n">component_db</span> <span class="o">=</span> <span class="p">[]</span>
 
         <span class="k">if</span> <span class="n">component_database_path</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-
             <span class="k">if</span> <span class="s1">&#39;CustomDLDataFolder&#39;</span> <span class="ow">in</span> <span class="n">component_database_path</span><span class="p">:</span>
-
                 <span class="k">if</span> <span class="n">custom_model_dir</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
                     <span class="n">msg</span> <span class="o">=</span> <span class="p">(</span>
                         <span class="s1">&#39;`custom_model_dir` needs to be specified &#39;</span>
@@ -1702,9 +1699,7 @@ <h1>Source code for pelicun.assessment</h1><div class="highlight"><pre>
             <span class="n">conseq_df</span> <span class="o">=</span> <span class="n">pd</span><span class="o">.</span><span class="n">DataFrame</span><span class="p">()</span>
 
         <span class="k">if</span> <span class="n">consequence_database_path</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-
             <span class="k">if</span> <span class="s1">&#39;CustomDLDataFolder&#39;</span> <span class="ow">in</span> <span class="n">consequence_database_path</span><span class="p">:</span>
-
                 <span class="k">if</span> <span class="n">custom_model_dir</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
                     <span class="n">msg</span> <span class="o">=</span> <span class="p">(</span>
                         <span class="s1">&#39;When `consequence_database_path` includes CustomDLDataFolder, &#39;</span>

diff --git a/_modules/pelicun/tools/DL_calculation.html b/_modules/pelicun/tools/DL_calculation.html
@@ -1001,8 +1001,12 @@ <h1>Source code for pelicun.tools.DL_calculation</h1><div class="highlight"><pre
 
     <span class="c1"># Ensure `DL/Damage/CollapseFragility` contains all required keys.</span>
     <span class="k">if</span> <span class="n">is_specified</span><span class="p">(</span><span class="n">config</span><span class="p">,</span> <span class="s1">&#39;DL/Damage/CollapseFragility&#39;</span><span class="p">):</span>
-        <span class="k">if</span> <span class="n">is_unspecified</span><span class="p">(</span><span class="n">config</span><span class="p">,</span><span class="s1">&#39;DL/Damage/CollapseFragility/CapacityDistribution&#39;</span><span class="p">):</span>
-            <span class="n">config</span><span class="p">[</span><span class="s1">&#39;DL&#39;</span><span class="p">][</span><span class="s1">&#39;Damage&#39;</span><span class="p">][</span><span class="s1">&#39;CollapseFragility&#39;</span><span class="p">][</span><span class="s1">&#39;CapacityDistribution&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;deterministic&#39;</span>
+        <span class="k">if</span> <span class="n">is_unspecified</span><span class="p">(</span>
+            <span class="n">config</span><span class="p">,</span> <span class="s1">&#39;DL/Damage/CollapseFragility/CapacityDistribution&#39;</span>
+        <span class="p">):</span>
+            <span class="n">config</span><span class="p">[</span><span class="s1">&#39;DL&#39;</span><span class="p">][</span><span class="s1">&#39;Damage&#39;</span><span class="p">][</span><span class="s1">&#39;CollapseFragility&#39;</span><span class="p">][</span><span class="s1">&#39;CapacityDistribution&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span>
+                <span class="s1">&#39;deterministic&#39;</span>
+            <span class="p">)</span>
             <span class="n">config</span><span class="p">[</span><span class="s1">&#39;DL&#39;</span><span class="p">][</span><span class="s1">&#39;Damage&#39;</span><span class="p">][</span><span class="s1">&#39;CollapseFragility&#39;</span><span class="p">][</span><span class="s1">&#39;Theta_1&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;N/A&#39;</span>
 
         <span class="k">for</span> <span class="n">thing</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;CapacityDistribution&#39;</span><span class="p">,</span> <span class="s1">&#39;CapacityMedian&#39;</span><span class="p">,</span> <span class="s1">&#39;Theta_1&#39;</span><span class="p">):</span>
@@ -1012,7 +1016,6 @@ <h1>Source code for pelicun.tools.DL_calculation</h1><div class="highlight"><pre
                     <span class="sa">f</span><span class="s1">&#39; in the configuration file.&#39;</span>
                 <span class="p">)</span>
                 <span class="k">raise</span> <span class="n">PelicunInvalidConfigError</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
-
 
     <span class="c1"># Ensure `DL/Damage/IrreparableDamage` contains all required keys.</span>
     <span class="k">if</span> <span class="n">is_specified</span><span class="p">(</span><span class="n">config</span><span class="p">,</span> <span class="s1">&#39;DL/Damage/IrreparableDamage&#39;</span><span class="p">):</span>

diff --git a/examples/notebooks/example_1.ipynb b/examples/notebooks/example_1.ipynb
@@ -2,15 +2,15 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "id": "b5156749",
+   "id": "0ca20d1e",
    "metadata": {},
    "source": [
     "# Example 1: Simple loss function."
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "d3aa70fa",
+   "id": "b9d6421d",
    "metadata": {
     "cell_marker": "\"\"\""
    },
@@ -22,13 +22,13 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "id": "6a5ca0a7",
+   "id": "a739e074",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.263499Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.263025Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.857418Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.856826Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.060868Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.060653Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.716859Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.716217Z"
     }
    },
    "outputs": [],
@@ -44,13 +44,13 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "id": "cffd877f",
+   "id": "26873346",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.859929Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.859449Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.862565Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.862037Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.719472Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.719028Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.722193Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.721644Z"
     }
    },
    "outputs": [],
@@ -61,13 +61,13 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "id": "b66389d7",
+   "id": "9876e760",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.864361Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.864171Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.868507Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.868004Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.724298Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.723823Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.728070Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.727522Z"
     }
    },
    "outputs": [],
@@ -79,13 +79,13 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "id": "02e1e38f",
+   "id": "e37983ee",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.870600Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.870234Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.922328Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.921769Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.730011Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.729815Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.787594Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.787011Z"
     }
    },
    "outputs": [],
@@ -129,13 +129,13 @@
   {
    "cell_type": "code",
    "execution_count": 5,
-   "id": "9b2942af",
+   "id": "947cadf3",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.924503Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.924119Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.926925Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.926389Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.789648Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.789436Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.792092Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.791583Z"
     }
    },
    "outputs": [],
@@ -150,13 +150,13 @@
   {
    "cell_type": "code",
    "execution_count": 6,
-   "id": "568a64d4",
+   "id": "3eb7e303",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.928602Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.928425Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.938575Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.938072Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.793847Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.793661Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.803831Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.803299Z"
     },
     "lines_to_next_cell": 0
    },
@@ -181,13 +181,13 @@
   {
    "cell_type": "code",
    "execution_count": 7,
-   "id": "55211bd8",
+   "id": "63905be8",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.940546Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.940053Z",
-     "iopub.status.idle": "2025-02-04T23:35:10.943245Z",
-     "shell.execute_reply": "2025-02-04T23:35:10.942583Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.805787Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.805422Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.808637Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.807941Z"
     },
     "lines_to_next_cell": 0,
     "nbsphinx": "hidden"
@@ -200,13 +200,13 @@
   {
    "cell_type": "code",
    "execution_count": 8,
-   "id": "95668709",
+   "id": "18fd7621",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:10.945098Z",
-     "iopub.status.busy": "2025-02-04T23:35:10.944905Z",
-     "iopub.status.idle": "2025-02-04T23:35:11.039771Z",
-     "shell.execute_reply": "2025-02-04T23:35:11.039166Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.810678Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.810217Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.902915Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.902162Z"
     },
     "lines_to_next_cell": 0
    },
@@ -221,13 +221,13 @@
   {
    "cell_type": "code",
    "execution_count": 9,
-   "id": "acdd18ea",
+   "id": "09603a28",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:11.041961Z",
-     "iopub.status.busy": "2025-02-04T23:35:11.041766Z",
-     "iopub.status.idle": "2025-02-04T23:35:11.045177Z",
-     "shell.execute_reply": "2025-02-04T23:35:11.044525Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.905615Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.905080Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.908440Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.907915Z"
     },
     "nbsphinx": "hidden"
    },
@@ -241,13 +241,13 @@
   {
    "cell_type": "code",
    "execution_count": 10,
-   "id": "d91261b2",
+   "id": "cfbce16e",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2025-02-04T23:35:11.046935Z",
-     "iopub.status.busy": "2025-02-04T23:35:11.046752Z",
-     "iopub.status.idle": "2025-02-04T23:35:11.052081Z",
-     "shell.execute_reply": "2025-02-04T23:35:11.051560Z"
+     "iopub.execute_input": "2025-02-04T23:48:15.910299Z",
+     "iopub.status.busy": "2025-02-04T23:48:15.909923Z",
+     "iopub.status.idle": "2025-02-04T23:48:15.915245Z",
+     "shell.execute_reply": "2025-02-04T23:48:15.914750Z"
     },
     "nbsphinx": "hidden"
    },