Merge pull request Geosyntec#36 from phobson/kill-megafigs

Remove obsolete code
phobson · Feb 24, 2016 · 016e4fd · 016e4fd
2 parents 6108b8d + 1434d4c
commit 016e4fd
Show file tree

Hide file tree

Showing 16 changed files with 1,323 additions and 1,598 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ install:
   - pip install .
 
 script:
-  - nosetests --with-coverage --cover-package=pycvc --verbose
+  - python tests.py --with-coverage --cover-package=pycvc --verbose
 
 after_success:
   - if [ ${COVERAGE} = true ]; then coveralls; fi
diff --git a/examples/1a - Prepare Tidy Data (simple method).ipynb b/examples/1a - Prepare Tidy Data (simple method).ipynb
@@ -381,8 +381,7 @@
    "source": [
     "## Export project-wide tidy datasets\n",
     "\n",
-    "### Hydrologic (storm) data\n",
-    "The big event from July 8, 2013 is *retained* in this step"
+    "### Hydrologic (storm) data"
    ]
   },
   {
@@ -404,8 +403,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Water quality data\n",
-    "The loads from the big event on July 8, 2013 are *removed* in this step"
+    "### Water quality data"
    ]
   },
   {
@@ -423,114 +421,6 @@
     "wq.to_csv('output/tidy/wq_simple.csv', index=False)"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Water Quality Comparison Plots"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "site_lists = [\n",
-    "    [ED1],\n",
-    "    [LV1, LV2, LV4],\n",
-    "]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Individual"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": false,
-    "scrolled": true
-   },
-   "outputs": [],
-   "source": [
-    "seaborn.set(style='ticks', context='paper')\n",
-    "pybmpdb.setMPLStyle()\n",
-    "\n",
-    "for sl in site_lists:\n",
-    "    print('\\n----Comparing {}----'.format(', '.join([s.siteid for s in sl])))\n",
-    "    for poc in POCs:\n",
-    "        print('  ' + poc)\n",
-    "        \n",
-    "        wqcomp = pycvc.summary.WQComparison(sl, 'composite', poc, nsqdata, bmpdb)\n",
-    "        \n",
-    "        wqcomp.seasonalBoxplots(load=False, finalOutput=True)\n",
-    "        wqcomp.seasonalBoxplots(load=True, finalOutput=True)\n",
-    "        \n",
-    "        wqcomp.landuseBoxplots(finalOutput=True)\n",
-    "        wqcomp.bmpCategoryBoxplots(finalOutput=True)\n",
-    "        \n",
-    "        wqcomp.parameterStatPlot(finalOutput=True)\n",
-    "        wqcomp.parameterStatPlot(load=True, finalOutput=True)\n",
-    "        \n",
-    "        wqcomp.parameterTimeSeries(finalOutput=True)  \n",
-    "        wqcomp.parameterTimeSeries(load=True, finalOutput=True)  \n",
-    "\n",
-    "        plt.close('all')"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Combined"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
-   "outputs": [],
-   "source": [
-    "seaborn.set(style='ticks', context='paper')\n",
-    "pybmpdb.setMPLStyle()\n",
-    "\n",
-    "for sl in site_lists:\n",
-    "    print('\\n----Megafigs with {}----'.format(', '.join([s.siteid for s in sl])))\n",
-    "    \n",
-    "    # construct the megafigures\n",
-    "    mf1 = pycvc.summary.WQMegaFigure(sl, 'composite', POCs[:6], 1, nsqdata, bmpdb)\n",
-    "    mf2 = pycvc.summary.WQMegaFigure(sl, 'composite', POCs[6:], 2, nsqdata, bmpdb)\n",
-    "    for n, mf in enumerate([mf1, mf2]):\n",
-    "        print('\\tTime Series {0}'.format(n+1))\n",
-    "        mf.timeseriesFigure(load=False)\n",
-    "        mf.timeseriesFigure(load=True)\n",
-    "\n",
-    "        print('\\tStat plots {0}'.format(n+1))\n",
-    "        mf.statplotFigure(load=False)\n",
-    "        mf.statplotFigure(load=True)\n",
-    "\n",
-    "        print('\\tBMPDB Boxplots {0}'.format(n+1))\n",
-    "        mf.bmpCategoryBoxplotFigure()\n",
-    "\n",
-    "        print('\\tNSQD Boxplots {0}'.format(n+1))\n",
-    "        mf.landuseBoxplotFigure()\n",
-    "\n",
-    "        print('\\tSeasonal Boxplots {0}'.format(n+1))\n",
-    "        mf.seasonalBoxplotFigure(load=False)\n",
-    "        mf.seasonalBoxplotFigure(load=True)\n",
-    "     \n",
-    "    plt.close('all')"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/examples/1b - Prepare Tidy Data (SWMM models).ipynb b/examples/1b - Prepare Tidy Data (SWMM models).ipynb
@@ -437,6 +437,27 @@
     ")\n",
     "wq.to_csv('output/tidy/wq_swmm.csv', index=False)   "
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Individual Storm Reports\n",
+    "(requires $\\LaTeX$)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "for site in [ED1, LV1, LV2, LV4]:\n",
+    "    print('\\n----Compiling ISR for {0}----'.format(site.siteid))\n",
+    "    site.allISRs('composite', version='draft')"
+   ]
   }
  ],
  "metadata": {