From d68fb901faaa8366133eee3558aedc3f0f70a4c2 Mon Sep 17 00:00:00 2001 From: "Ryan C. Cooper" Date: Tue, 5 Sep 2017 14:20:19 -0400 Subject: [PATCH] added HW1 and extra credit 1 --- .../lecture_03-checkpoint.ipynb | 204 ++---------------- 03_Intro to matlab-octave/lecture_03.ipynb | 203 +---------------- 2 files changed, 16 insertions(+), 391 deletions(-) diff --git a/03_Intro to matlab-octave/.ipynb_checkpoints/lecture_03-checkpoint.ipynb b/03_Intro to matlab-octave/.ipynb_checkpoints/lecture_03-checkpoint.ipynb index 19c8d4b..822a27a 100644 --- a/03_Intro to matlab-octave/.ipynb_checkpoints/lecture_03-checkpoint.ipynb +++ b/03_Intro to matlab-octave/.ipynb_checkpoints/lecture_03-checkpoint.ipynb @@ -5601,204 +5601,26 @@ }, "outputs": [], "source": [ - "data=dlmread('US_energy_by_sector.csv',',',2,0);;" + "data=dlmread('US_energy_by_sector.csv',',',2,0);" ] }, { "cell_type": "code", - "execution_count": 35, + "execution_count": null, "metadata": { "collapsed": false }, - "outputs": [ - { - "data": { - "image/svg+xml": [ - "\n", - "\n", - "Gnuplot\n", - "Produced by GNUPLOT 5.0 patchlevel 3 \n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t \n", - "\t \n", - "\t\n", - "\t\n", - "\t \n", - "\t \n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\t\t\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\t\t\n", - "\t\t5000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t10000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t15000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t20000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t25000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t30000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1940\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1950\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1960\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1970\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1980\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1990\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t2000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t2010\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t2020\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\n", - "\t\n", - "\t\ttrillions of btus\n", - "\t\n", - "\n", - "\n", - "\t\n", - "\t\tyear\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\tresidential totals\n", - "\n", - "\n", - "\n", - "\t\n", - "\t\tresidential totals\n", - "\t\n", - "\n", - "\n", - "\t\n", - "\t\n", - "\ttransportation totals\n", - "\n", - "\t\n", - "\t\ttransportation totals\n", - "\t\n", - "\n", - "\n", - "\t\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "setdefaults;\n", - "plot(data(:,1),data(:,3),data(:,1),data(:,8))\n", - "xlabel('year')\n", - "ylabel('trillions of btus')\n", - "legend('residential totals','transportation totals')" - ] + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/03_Intro to matlab-octave/lecture_03.ipynb b/03_Intro to matlab-octave/lecture_03.ipynb index 13ce5f9..822a27a 100644 --- a/03_Intro to matlab-octave/lecture_03.ipynb +++ b/03_Intro to matlab-octave/lecture_03.ipynb @@ -5606,209 +5606,12 @@ }, { "cell_type": "code", - "execution_count": 38, + "execution_count": null, "metadata": { "collapsed": false }, - "outputs": [ - { - "data": { - "image/svg+xml": [ - "\n", - "\n", - "Gnuplot\n", - "Produced by GNUPLOT 5.0 patchlevel 3 \n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t\n", - "\t \n", - "\t \n", - "\t\n", - "\t\n", - "\t \n", - "\t \n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\t\t\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\t\t\n", - "\t\t0\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t0.2\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t0.4\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t0.6\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t0.8\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1.2\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1.4\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1940\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1950\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1960\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1970\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1980\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t1990\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t2000\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t2010\n", - "\t\n", - "\n", - "\n", - "\t\t\n", - "\t\t2020\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\n", - "\t\n", - "\t\ttrillions of btus\n", - "\t\n", - "\n", - "\n", - "\t\n", - "\t\tyear\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\t\n", - "\tresidential totals\n", - "\n", - "\n", - "\n", - "\t\n", - "\t\tresidential totals\n", - "\t\n", - "\n", - "\n", - "\t\n", - "\t\n", - "\ttransportation totals\n", - "\n", - "\t\n", - "\t\ttransportation totals\n", - "\t\n", - "\n", - "\n", - "\t\n", - "\t\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "setdefaults;\n", - "plot(data(:,1),cumsum(data(:,3))/1e6,data(:,1),cumsum(data(:,8))/1e6)\n", - "xlabel('year')\n", - "ylabel('trillions of btus')\n", - "legend('residential totals','transportation totals','Location','Northwest')" - ] + "outputs": [], + "source": [] }, { "cell_type": "code",