More fixes to imports, missing files and much more

GEMScienceTools · Apr 28, 2017 · 947ae04 · 947ae04
1 parent f60d21e
commit 947ae04
Show file tree

Hide file tree

Showing 18 changed files with 449 additions and 1,014 deletions.
diff --git a/notebooks/plotting/collapse_maps/plot_collapse_maps.ipynb b/notebooks/plotting/collapse_maps/plot_collapse_maps.ipynb
diff --git a/notebooks/plotting/damage_dist/plot_damage_dist.ipynb b/notebooks/plotting/damage_dist/plot_damage_dist.ipynb
@@ -2,7 +2,10 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "# Plot Damage Distribution\n",
     "\n",
@@ -21,12 +24,14 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "import plot_damage_dist as plotdd\n",
+    "from rmtk.plotting.damage_dist import plot_damage_dist as plotdd\n",
     "tax_dmg_dist_file = '../sample_outputs/scenario_damage/dmg_dist_per_taxonomy.xml'\n",
     "\n",
     "taxonomy_list=[]\n",
@@ -38,7 +43,10 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Total damage distribution\n",
     "\n",
@@ -49,7 +57,9 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
@@ -76,7 +86,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.9"
+   "version": "2.7.13"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/plotting/hazard_outputs/plot_hazard_curves.ipynb b/notebooks/plotting/hazard_outputs/plot_hazard_curves.ipynb
@@ -2,7 +2,10 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "# Hazard Curves and Uniform Hazard Spectra \n",
     "\n",
@@ -15,21 +18,26 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
     "import matplotlib.pyplot as plt\n",
-    "from plot_hazard_outputs import HazardCurve, UniformHazardSpectra\n",
+    "from rmtk.plotting.hazard_outputs.plot_hazard_outputs import HazardCurve, UniformHazardSpectra\n",
     "\n",
     "hazard_curve_file = \"../sample_outputs/hazard/hazard_curve.xml\"\n",
     "hazard_curves = HazardCurve(hazard_curve_file)"
    ]
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Hazard Curve"
    ]
@@ -38,7 +46,9 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
@@ -49,7 +59,9 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
@@ -58,7 +70,10 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "## Uniform Hazard Spectra"
    ]
@@ -67,7 +82,9 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
@@ -93,7 +110,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.9"
+   "version": "2.7.13"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/plotting/hazard_outputs/plot_hazard_maps.ipynb b/notebooks/plotting/hazard_outputs/plot_hazard_maps.ipynb
@@ -2,7 +2,10 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "# Hazard Maps\n",
     "\n",
@@ -19,12 +22,14 @@
    "execution_count": null,
    "metadata": {
     "collapsed": false,
+    "deletable": true,
+    "editable": true,
     "scrolled": true
    },
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "from plot_hazard_outputs import HazardMap\n",
+    "from rmtk.plotting.hazard_outputs.plot_hazard_outputs import HazardMap\n",
     "\n",
     "hazard_map_file = \"../sample_outputs/hazard/hazard_map-poe_0.02.xml\"\n",
     "\n",
@@ -55,7 +60,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.9"
+   "version": "2.7.13"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/plotting/loss_curves/plot_loss_curves.ipynb b/notebooks/plotting/loss_curves/plot_loss_curves.ipynb
@@ -2,7 +2,10 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "# Plot Loss Curves\n",
     "\n",
@@ -15,12 +18,14 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": false
+    "collapsed": false,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "import plot_loss_curves as plotlc\n",
+    "from rmtk.plotting.loss_curves import plot_loss_curves as plotlc\n",
     "\n",
     "loss_curves_file = '../sample_outputs/classical_risk/loss-curves-structural.xml'\n",
     "assets_list = ['a1', 'a10', 'a100']\n",
@@ -48,7 +53,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.9"
+   "version": "2.7.13"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/plotting/risk_maps/plot_risk_maps.ipynb b/notebooks/plotting/risk_maps/plot_risk_maps.ipynb
@@ -2,7 +2,10 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "deletable": true,
+    "editable": true
+   },
    "source": [
     "# Plot Risk Maps\n",
     "\n",
@@ -21,12 +24,14 @@
    "execution_count": null,
    "metadata": {
     "collapsed": false,
+    "deletable": true,
+    "editable": true,
     "scrolled": false
    },
    "outputs": [],
    "source": [
     "%matplotlib inline\n",
-    "import plot_risk_maps as plotrm\n",
+    "import rmtk.plotting.risk_maps.plot_risk_maps as plotrm\n",
     "\n",
     "loss_map_file = '../sample_outputs/scenario_risk/loss-maps-structural.xml'\n",
     "exposure_model = '../input_models/exposure_model_nepal.xml'\n",
@@ -44,7 +49,9 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true
+    "collapsed": true,
+    "deletable": true,
+    "editable": true
    },
    "outputs": [],
    "source": []
@@ -66,7 +73,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.9"
+   "version": "2.7.13"
   }
  },
  "nbformat": 4,