merge mlh with develop #11

mlamherr · 2018-10-17T20:58:18Z

No description provided.

* Fix order of call to fix bug * Add test for call * Converted to md format and added more instructions * Added call to matlab with test. Initial test works with REISE callableMainMatlab branch * Add prereise folder, move files to folder and modify README * Change location of scenariolist.csv to /home/EGM/ * Add setup and adjut __init__.py to make the package user friendly * Added add_path to add gurobi and matpower path to matlab. Made sure setup copies add_path to package install location * Move README to parent folder * Improved README and changed column namings in scenariolist

…lated using Gegner et al. (2016) per capita value

… IPCO does not contribute to CA, based on Balancing Authority Jan 2017 map

…missing data

…a in Dec 2016

…; changed function names

mlamherr · 2018-10-18T21:50:18Z

I've updated all files/folders/readme as requested.

kasparm · 2018-10-18T21:51:37Z

Thank you!

mlamherr · 2018-10-19T21:02:24Z

OK, done with removing the local references. Also checked in small versions of input files for testing. From: kasparm <[email protected]> Sent: Thursday, October 18, 2018 2:52 PM To: intvenlab/PreREISE <[email protected]> Cc: Marissa LaMadrid-Herrmannsfeldt <[email protected]>; Author <[email protected]> Subject: Re: [intvenlab/PreREISE] merge mlh with develop (#11) Thank you! — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_intvenlab_PreREISE_pull_11-23issuecomment-2D431176448&d=DwMCaQ&c=f_hce7QtucnhnFZbRZTIlH6nx5mag1_14FtEFKPmHCI&r=aY4Mni8gddHeKd0zT2kg5Cjtb5K7zighs2wRX1snbmk&m=UZblNlqZeHjxdcaBiqWlveUaO_Slph3SUiqPFo8kAXw&s=5txmEh8_XVL0XRCM9Kwm73r9hBHJ1z1warOxZh3aVZM&e=>, or mute the thread<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AoM-2DJMPRBK-2DzPvJOx1e2R1et2iN5QuqNks5umPfwgaJpZM4XnSIE&d=DwMCaQ&c=f_hce7QtucnhnFZbRZTIlH6nx5mag1_14FtEFKPmHCI&r=aY4Mni8gddHeKd0zT2kg5Cjtb5K7zighs2wRX1snbmk&m=UZblNlqZeHjxdcaBiqWlveUaO_Slph3SUiqPFo8kAXw&s=mafZkeQQ6Vfc77l1o2kv0-m-CQf0WTIi2RQOfB5tSXs&e=>.

…kip since API Key is required

create PR to refactor climate adj section

kasparm and others added 30 commits July 27, 2018 15:47

check missing data in EIA download

861c2e2

download EIA data by API

53dd129

download EIA data by API

72544b1

download EIA demand data by API, relatively finished notebook version

51a9a1f

initial commit

6d227dd

refactored

7802e40

initial commit

6fc1d92

initial gather commit - EIA data collection and test

fc6778c

initial commit

3a24f13

initial commits only

96891e6

almost final

6e882bd

Delete MakeWeightTables.ipynb

f7373d0

documentation added

5727ad2

added documentation

df92702

Merge branch 'mlh' of https://github.com/intvenlab/PreREISE into mlh

52ac43e

cleaned up and added documentation

67a9f17

initial commit

56ac87b

added comparisons between BA-based demand and peak-based demand calcu…

734745b

…lated using Gegner et al. (2016) per capita value

added summary tables and plots

7515628

added minor changes

b6487b0

corrected demand calculation for CAnorth: removed the IPCO term since…

ea931b5

… IPCO does not contribute to CA, based on Balancing Authority Jan 2017 map

corrected demand calculation for CAnorth

3d8216f

added comparison of BA-based demand against retail data and check on …

742f288

…missing data

added to documentation on new BA-county relationship source data

7004c60

added verification and documentation of anomalous Colorado demand dat…

cfcc5d3

…a in Dec 2016

added function for assembling BA data from pre-downloaded excel files…

057b5d3

…; changed function names

added testing for function to assemble data from excel files

b0919c3

for prototyping demand vs line capacity checks, in progress

900c6a1

Update README.md

98ace2d

mlamherr and others added 7 commits October 18, 2018 14:26

removed pytest stuff; should be back to original in branch

17c2076

update readme

875945c

removed prototype folder from repo

f2a37a9

Delete testEIA-checkpoint.ipynb

99ad958

Delete files in .ipynb_checkpoints

96241ab

Delete MakeWeightTables-checkpoint.ipynb

d411d60

Delete OutputDemandProfiles-checkpoint.ipynb

5c0ef02

rouille and others added 7 commits October 18, 2018 15:51

chore: Create __all__

97520bb

style: Format for sphinx

4c028f4

added docstring

76094b8

removed references to local dir and personal tokens

9e62d83

Excel files for running test_from_excel.py

4c9694d

Delete EIA user guide

32b7b6e

Update README.md

f53cb90

kasparm added 9 commits October 19, 2018 17:44

docs: Adapted readme to changes in the test, module and structure

f2d2132

style: move test and demo data into test/data folder

b11f0c1

fix: fixed import in test_call and set test to skip

3772254

chore: Change dir name to lower case changes

58ec3d7

refactor: Changed nameing to follow code convention and simplifyed code

38464b8

refactor: Changes in naming and data folder location

2d8c0c7

refactor: Changed name to follow naming convention and mark test to s…

f345839

…kip since API Key is required

refactor: Adapt to changes in structure and nameing of functions.

970828d

chore: Added package to requirements file

477e028

kasparm merged commit 477e028 into develop Oct 22, 2018

ahurli mentioned this pull request Mar 16, 2021

Develop into Master #155

Merged

danielolsen pushed a commit that referenced this pull request Sep 27, 2021

Merge pull request #11 from mbwaite/evan/ff_model_refactor

29b0315

create PR to refactor climate adj section

jmbott referenced this pull request in SEL-Columbia/PreREISE May 26, 2022

Merge pull request #11 from mbwaite/evan/ff_model_refactor

6d18dd1

create PR to refactor climate adj section

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge mlh with develop #11

merge mlh with develop #11

mlamherr commented Oct 17, 2018

mlamherr commented Oct 18, 2018

kasparm commented Oct 18, 2018

mlamherr commented Oct 19, 2018 via email

merge mlh with develop #11

merge mlh with develop #11

Conversation

mlamherr commented Oct 17, 2018

mlamherr commented Oct 18, 2018

kasparm commented Oct 18, 2018

mlamherr commented Oct 19, 2018 via email