update calc_functions from master #146

bl-young · 2021-06-18T18:07:47Z

No description provided.

…d summary level

…for consistency, but the file contents are the same

Deleted USEEIOv2.0i-GHG.yml (replaced by USEEIOv2.0i-GHG_nodisagg.yml); Deleted USEEIOv2.0is-GHG.yml (replaced USEEIOv2.0is-GHG_nodisagg.yml)

… complete Use table is created

…remove those that belong only to industry models if its an industry model

…type

…k that contains model original schema

-as categories for items. For now use supporting data, component data, metadata, component matrix, result matrix -migrate matrix formats from https://github.com/USEPA/USEEIO_API/blob/master/doc/data_format.md -language simplifications

…ion, remove DQ matrices

…aics in the relevant rows.

…sectors by adding a new column for a new schema for disaggregated models

…nfiguration to getConfiguration and pass it "model" or "disagg"

… in the first letter of function name to lower case.

… generateDomesticUse, improve docstrings

…Codes

…eandCategory from FlowMapping

…ions.R,Margins.R->LoadMargins.R

…r fix in viz function

…ScoresbySector

…eck()

MoLi7 and others added 30 commits April 5, 2021 09:37

Move unused margin functions to refac_margin branch

2045a96

Update model format metadata

96e0c59

Add line in scatter plot to improve readability of comparable points

1e492c0

Update links to LCIA methods on data commons

fb1de1e

Added No-disagg versions of industry yml model files at the detail an…

b4c4bce

…d summary level

Changed USEEIOv2.0-GHG.yml filename into USEEIOv2.0-GHG_nodisagg.yml …

d1d5fbc

…for consistency, but the file contents are the same

Deleted USEEIOv2.0-GHG.yml (replaced by USEEIOv2.0-GHG_nodisagg.yml);

d573035

Deleted USEEIOv2.0i-GHG.yml (replaced by USEEIOv2.0i-GHG_nodisagg.yml); Deleted USEEIOv2.0is-GHG.yml (replaced USEEIOv2.0is-GHG_nodisagg.yml)

Keep orginal final demand (by-commodity format) as model object until…

d2c3e32

… complete Use table is created

In final cleanup in buildModel, only append to vector of matrices to …

3d1bf21

…remove those that belong only to industry models if its an industry model

Update dplyr requirement to >=1.0.6, fixes #134

7430b8b

Address #135

167edc2

Update writing of q and x in writeModelmatrices

2f5735b

in writeModeltoXLSX, write q and x regardless of commoditybyindustry …

957029e

…type

Replace NA with 0 in model$U and model$U_d, fixes #136

bbff557

Merge branch 'master' into refac_margin

079687b

Merge pull request #138 from USEPA/refac_margin

aad07d2

Add prepareModelSectorCrosswalk function to prepare a sector crosswal…

96b0423

…k that contains model original schema

Add stop() after logerror() in functions; update function documentation

9e6272e

Do not subset years for Rho and Phi in writeModeltoXLSX, resolves #137

747fafa

Add years fields to USEEIO API

606c0e3

Add newline to end of USEEIO_API.yaml

1b0c2d5

Add writing of years to metadata

a618b1e

Major revison

aea74f2

-as categories for items. For now use supporting data, component data, metadata, component matrix, result matrix -migrate matrix formats from https://github.com/USEPA/USEEIO_API/blob/master/doc/data_format.md -language simplifications

Update main README file

f0e413b

-model.md header, notes, internal links, sat table and indicator sect…

3c737a9

…ion, remove DQ matrices

Updated the model crosswalk disaggregation to include the 2-5 digit n…

181883b

…aics in the relevant rows.

cleaning up comments in disaggregateMasterCrosswalk

09fb836

Updated prepareModelSectorCrosswalk function to handle disaggregated …

7f23795

…sectors by adding a new column for a new schema for disaggregated models

MOVE model and disagg config files into subfolders; revise getModelCo…

7c8a71c

…nfiguration to getConfiguration and pass it "model" or "disagg"

fix missing s breaking getConfiguration

dd6660d

jvendries and others added 28 commits June 4, 2021 19:45

Changed function names in DisaggregateFunctions.R that had upper case…

60df398

… in the first letter of function name to lower case.

Update disaggregation docs per jvendries changes

60c497b

(Cont') Update disaggregation docs per jvendries changes

1274b94

Remove export tags from functions where export is not needed

6968859

Add header, remove old non-scrap ratios function, correct spelling of…

4d7f6fd

… generateDomesticUse, improve docstrings

-Correct spelling of generateDomesticUse; remove BEA$TotalConsumption…

402d79c

…Codes

Merge branch 'master' of https://github.com/USEPA/useeior

403303e

Remove listOriginalSources, mapFlowByNameandCategory, andmapFlowByCod…

8ff9597

…eandCategory from FlowMapping

Renames demand_vector_fxn_registry to DemandVectorFunctionRegistry

2e7be19

Rename DataQuality.R->DataQualityFunctions.R, NAICS.R->CrosswalkFunct…

542b39d

…ions.R,Margins.R->LoadMargins.R

Update DQ docs

12e0f9c

Update crosswalk function docs

384be8b

Update demand function docs

17cd42e

Add comments to first line of R files; add doc for matrices object

a2c02c1

Update date of description

6310821

Remove extra new line in USEEIO_API_fields breaking reading

78e6650

Change based file path for model writing to useeior

c3e9f17

Add model writing directory if not existing in writeModeltoXLSX

d56b9a5

Update writeModeltoXLSX

c3f1331

Update validation functions to take up-to-date model components; mino…

fd3c830

…r fix in viz function

Update calculateIndicatorScoresforTotalsBySector and barplotIndicator…

564cd8a

…ScoresbySector

Update compareFlowTotals function

bdaedb4

Delete requirement of validate package in DESCRIPTION

e1dfe56

clean up warnings in DisaggregationFunction docstrings in devtools:ch…

cc7c474

…eck()

Add rlang in DESCRIPTION, fixes #145

ec10141

Add '_nodisagg' to modelname in model config files

b46de9b

fix typo in hazardous waste

3cd41ba

Merge branch 'calc_functions' into calc_functions-1

595493f

bl-young merged commit 5c42fdb into calc_functions Jun 18, 2021

bl-young deleted the calc_functions-1 branch June 18, 2021 18:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update calc_functions from master #146

update calc_functions from master #146

bl-young commented Jun 18, 2021

update calc_functions from master #146

update calc_functions from master #146

Conversation

bl-young commented Jun 18, 2021