Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VE RSPM State Revisions #232

Merged
merged 189 commits into from
Feb 27, 2019
Merged

VE RSPM State Revisions #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
189 commits
Select commit Hold shift + click to select a range
3b846cd
Remove optional input file extraneous message about modifying relativ…
gregorbj Dec 19, 2018
f735072
Remove unneeded input files from RSPM/Test1
gregorbj Dec 19, 2018
17f4573
Remove temporary input files from VERSPM/Test1
gregorbj Dec 19, 2018
1a43fde
Check and build packages
gregorbj Dec 19, 2018
1ed3af7
Remove test datastore files from VETravelPerformance
gregorbj Dec 19, 2018
38111c6
Remove test logs from VETravelPerformance
gregorbj Dec 19, 2018
fa88155
Remove test ModelState.Rda file
gregorbj Dec 19, 2018
7a3290b
Move SimulateD4cValues.R script temporarily to tests/scripts in VETra…
gregorbj Dec 19, 2018
08cb52a
Remove temporary figures
gregorbj Dec 19, 2018
53a3556
Remove temporary file
gregorbj Dec 19, 2018
8b12d4f
Add documentation
gregorbj Dec 19, 2018
ec2e1fc
Updated model
gregorbj Dec 19, 2018
18c3764
Remove binary files that are different than origin
gregorbj Dec 20, 2018
3b36e55
Remove binary files that differ from origin
gregorbj Dec 20, 2018
7deef2c
Remove binary files that differ from origin
gregorbj Dec 20, 2018
dd08589
Add /data to gitignore
gregorbj Dec 20, 2018
57a9630
Copied .rda files in data/ from remote so can complete a merge
gregorbj Dec 20, 2018
f75d61e
Merge branch 'develop' of https://github.com/gregorbj/VisionEval into…
gregorbj Dec 20, 2018
55cb17d
Merge branch 'develop' of https://github.com/gregorbj/VisionEval into…
gregorbj Dec 20, 2018
337aaa1
Gitignore .rda files in the data directory
gregorbj Dec 20, 2018
fd75151
Change .gitignore back to original not ignoring data/*.rda. Wait for …
gregorbj Dec 21, 2018
0760396
Remove temporary files
gregorbj Dec 21, 2018
101aa88
Remove temporary files
gregorbj Dec 21, 2018
fee781e
Remove temporary file
gregorbj Dec 21, 2018
f1e2381
Change .gitignore
gregorbj Dec 21, 2018
81542e0
Revise DivertSovTravel module to limit diversion to households in urb…
gregorbj Dec 21, 2018
39ec220
Update DESCRIPTION date and version for VEHouseholdTravel to account …
gregorbj Dec 21, 2018
7d3165e
New loadPackageDataset function which loads a named dataset from the …
gregorbj Jan 2, 2019
026b9bc
Add code which creates data frames which identify the correspondence …
gregorbj Jan 2, 2019
0eedc86
Update NAMESPACE and object documentation to reflect changes that ena…
gregorbj Jan 2, 2019
9cf67e0
Change "hard-wired" references to package modules and datasets to "so…
gregorbj Jan 2, 2019
a1e3b7f
Remove dependencies on devtools, VEHouseholdTravel and VEPowertrainsA…
gregorbj Jan 2, 2019
ce92e09
Remove dependency on devtools package
gregorbj Jan 2, 2019
adbaa9d
Rebuild package with module changes to implement "soft" rather than "…
gregorbj Jan 2, 2019
d3a8389
Remove package dependency on devtools and VEHouseholdTravel packages
gregorbj Jan 2, 2019
81b2942
Rebuild package with changes to replace "hard-wired" references to pa…
gregorbj Jan 2, 2019
41cc193
Remove dependencies on devtools and VEHouseholdTravel packages
gregorbj Jan 2, 2019
ec7973d
Rebuild package with replacement of "hard-wired" references to packag…
gregorbj Jan 2, 2019
f4dd0fb
Build package with replacements of "hard-wired" references to package…
gregorbj Jan 2, 2019
8ece28d
Modify checkModuleSpecs to eliminate check of Call specification whic…
gregorbj Jan 2, 2019
8075aa2
Correct error to add package identification to "soft" call spec modul…
gregorbj Jan 2, 2019
073310e
Build VEScenario package
gregorbj Jan 2, 2019
d28b0b8
Remove Geo field because there is no need as it is a region input file
gregorbj Jan 2, 2019
c264b44
Add input for average vehicle age for commercial service vehicles
gregorbj Jan 3, 2019
52e2671
Modify module test code to handle module call references that are sim…
gregorbj Jan 3, 2019
51e7224
Add checks to make sure that all required parameters are present in t…
gregorbj Jan 3, 2019
6bd02ab
Add creation of ModulesByPackage_df and DatasetsByPackage_df to modul…
gregorbj Jan 3, 2019
c68481f
Use required packages from RequiredVEPackages rather than from parsin…
gregorbj Jan 3, 2019
f8ba503
Remove unused model parameters from model_parameters.json test file.
gregorbj Jan 3, 2019
6e81ba8
Add RequiredVEPackages parameter to test run_parameters.json file.
gregorbj Jan 3, 2019
b159edf
Identify installed packages so can check whether required VE packages…
gregorbj Jan 3, 2019
eae54cc
Add RequiredVEPackages parameter to run_parameters.json file so that …
gregorbj Jan 3, 2019
bd3fe6b
Add RequiredVEPackages parameter to run_parameters.json file so that …
gregorbj Jan 3, 2019
13fba71
Add code for calculating vehicle age range for commercial service veh…
gregorbj Jan 3, 2019
80a6c7f
Update run_parameters.json in test/defs to include RequiredVEPackages…
gregorbj Jan 3, 2019
710191d
Check for presence of OtherOpsEffectiveness data and if not present, …
gregorbj Jan 4, 2019
99b8f8c
Check for consistency between other_ops_effectiveness.csv input and o…
gregorbj Jan 4, 2019
bb6e9a6
Enable CO2e cost as optional user input
gregorbj Jan 4, 2019
a98bb3d
Enable checking of consistency between presence of optional other_ops…
gregorbj Jan 4, 2019
f16c53d
Add region_co2e_costs.csv test file
gregorbj Jan 4, 2019
77f8f74
Remove other_ops_effectiveness.csv test input and replace with temp_o…
gregorbj Jan 4, 2019
2556d4d
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
44986eb
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
f90e90d
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
2664fd9
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
fabb7e5
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
5dd3f5e
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
d8dfe57
Modify test run_parameters.json to include RequiredVEPackages parameter
gregorbj Jan 4, 2019
0bc247e
Fix code to enable 'soft' references in module calls and package data…
gregorbj Jan 24, 2019
8361dc6
Enable 'soft' module calls and references to package data.
gregorbj Jan 24, 2019
b6737e2
Change units specs in Set specs for OwnCostPerMile and InsCost in Adj…
gregorbj Jan 24, 2019
bd21674
Update descriptions of HighCarSvcCost and LowCarSvcCost inputs to add…
gregorbj Jan 24, 2019
5891e7c
Update version and date and correct spelling in description.
gregorbj Jan 24, 2019
8dd616c
Update package NAMESPACE file
gregorbj Jan 24, 2019
2e19272
Document module. Modify to address urban and non-urban proportions of…
gregorbj Jan 24, 2019
70f1e4f
New module to balance road costs and revenues
gregorbj Jan 24, 2019
79a4a81
Redo budget model and document module.
gregorbj Jan 24, 2019
833b515
Remove CalculateBaseRoadDvmt. Is not replaced by CalculateRoadDvmt.
gregorbj Jan 24, 2019
7da6bb4
Add documentation. Change names of variables fetched from datastore t…
gregorbj Jan 24, 2019
39d3ef0
CalculateFutureRoadDvmt module is replaced by CalculateRoadDvmt module.
gregorbj Jan 24, 2019
18fa3c5
Document. Modify to calculate adjustment factors for non-urban areas …
gregorbj Jan 24, 2019
ed5afcf
Add documentation.
gregorbj Jan 24, 2019
5940b60
New CalculateRoadDvmt module to replace CalculateBaseRoadDvmt and Cal…
gregorbj Jan 24, 2019
858ab93
Add documentation. Add model to calculate non-urban road speed.
gregorbj Jan 24, 2019
a0166f5
Add documentation.
gregorbj Jan 24, 2019
4304f02
Add documentation. Add a number of input data checks.
gregorbj Jan 24, 2019
f55f139
Add processing and saving table of rural vmt by state, vehicle type, …
gregorbj Jan 24, 2019
edad896
Build package
gregorbj Jan 24, 2019
0d1cf6f
Remove unneeded figures
gregorbj Jan 24, 2019
474a4c4
Remove unneeded consumer expenditure survey data inputs.
gregorbj Jan 24, 2019
e01a08d
New script to download and process consumer expenditure survey data.
gregorbj Jan 24, 2019
af27783
New consumer expenditure survey files used to estimate budget model
gregorbj Jan 24, 2019
11e6a5b
Update externality cost documentation
gregorbj Jan 24, 2019
5d93fb8
New urban-rural trip length and duration file to use in estimating ru…
gregorbj Jan 24, 2019
973569c
Module documentation
gregorbj Jan 24, 2019
8c6e187
Module documentation image files.
gregorbj Jan 24, 2019
9ea42bd
Module documentation figures.
gregorbj Jan 24, 2019
2d7d939
R object documentation files
gregorbj Jan 24, 2019
97db91d
Test datastore and model state files after testing VETravelPerformanc…
gregorbj Jan 24, 2019
9a35cc4
Updated VETravelPerformance modules test script
gregorbj Jan 24, 2019
3a148dd
Updated input test files
gregorbj Jan 24, 2019
a156bf7
Updated files from running module tests.
gregorbj Jan 24, 2019
3a3296f
Modify test files structure. Separate RPAT test files from RSPM. Modi…
gregorbj Jan 24, 2019
18bda73
Run verspm tests in VELandUse package
gregorbj Jan 24, 2019
0b021c8
Update VE-RSPM test directory datastore from testing VETransportSuppl…
gregorbj Jan 24, 2019
a4c433b
Add input files needed by the VETransportSupply RSPM modules to the V…
gregorbj Jan 24, 2019
ef09696
Reorganize VETransportSupply tests to separate RSPM and RPAT module t…
gregorbj Jan 24, 2019
d7ae51e
Rebuild package
gregorbj Jan 24, 2019
68a6baf
Modify the test.R script to source the verspm_test.R script
gregorbj Jan 24, 2019
390407e
Run tests
gregorbj Jan 24, 2019
c77f4e7
Incorporate bug fixes in test_functions.R file that were fixed in the…
gregorbj Jan 24, 2019
314d6e6
Rerun tests
gregorbj Jan 24, 2019
fcafcec
Create test.R script which sources the verspm_test.R and verpat_test.…
gregorbj Jan 24, 2019
af5f335
Rebuild package after updating test script and running.
gregorbj Jan 24, 2019
32f0fcf
Rebuild package after revising and running tests.
gregorbj Jan 24, 2019
c1e2e2b
Set up test.R script to source the verspm_test.R script and the verpa…
gregorbj Jan 24, 2019
5188b85
Change run_parameters.json files to include RequiredVEPackages parame…
gregorbj Jan 24, 2019
a70f1ad
Change testing structure to separate module tests for RPAT and RSPM m…
gregorbj Jan 24, 2019
0a58b99
Separate testing scripts and files for RPAT and RSPM. Run tests. Rebu…
gregorbj Jan 25, 2019
8ef58ec
Move module tests to new system operating off common datastore, input…
gregorbj Jan 25, 2019
7be6bb2
Test script with SaveDatastore toggled to FALSE
gregorbj Jan 25, 2019
8045d67
Test functions with change to utilize SaveDatastore parameter
gregorbj Jan 25, 2019
cc0d9e2
Modify test scripts and setup for new approach which uses central dat…
gregorbj Jan 25, 2019
f01b871
Change verspm test script to test modules without saving results to c…
gregorbj Jan 25, 2019
3e2f4e6
Build package
gregorbj Jan 25, 2019
ed1da03
Update test functions and restructure tests accordingly. Rerun tests.
gregorbj Jan 25, 2019
b1dd1b5
Rebuild package
gregorbj Jan 25, 2019
19a47d6
Update test function and script and rerun tests.
gregorbj Jan 25, 2019
3d10d87
Rebuild package
gregorbj Jan 25, 2019
a8284c6
Update test function and script. Rerun tests.
gregorbj Jan 25, 2019
84f01e2
Rebuild package
gregorbj Jan 25, 2019
fd4e6f4
Update the test functions and scripts and rerun tests.
gregorbj Jan 25, 2019
52255d5
Rebuild package
gregorbj Jan 25, 2019
df1a775
Modify test functions and test script. Rerun tests.
gregorbj Jan 25, 2019
24b63bb
Rebuild package
gregorbj Jan 25, 2019
28239c4
Update test functions and test script. Rerun module tests.
gregorbj Jan 25, 2019
0a6daf1
Rebuild package
gregorbj Jan 25, 2019
21d0ac7
Modify initializeModel to put Initialize module entries in the proper…
gregorbj Jan 25, 2019
fe6c25c
Correct TYPE and UNITS specs for LdvFwyDvmt and LdvArtDvmt
gregorbj Jan 25, 2019
ed5ef33
Correct TYPE and UNITS specifications for LdvFwyDvmt and LdvArtDvmt
gregorbj Jan 25, 2019
8d101f4
Move calculation of base year regional heavy truck and marea roadway …
gregorbj Jan 27, 2019
b81bb0a
Delete files from VERSPM test
gregorbj Jan 27, 2019
f877362
Remove code to process Get specifications in Initialize modules. This…
gregorbj Jan 27, 2019
7c2f6bd
Rerun tests with visioneval code that does not allow Initialize modul…
gregorbj Jan 27, 2019
3754dc4
Modify run_parameters.json file to include 'RequiredVEPackages' param…
gregorbj Jan 27, 2019
5359d43
Update VERSPM Test 2 input files to be consistent with latest model m…
gregorbj Jan 27, 2019
3ea75c2
Update VERSPM Test2 model and run parameters files to be consistent w…
gregorbj Jan 27, 2019
72369c2
Update VERSPM Test2 run_model.R file to be consistent with Test1 file
gregorbj Jan 27, 2019
5d90540
Change .travel.yml file to run test.R script instead fo verspm_test.R…
gregorbj Jan 27, 2019
9cc6bd8
Rbuildignore
gregorbj Jan 27, 2019
bb09a60
Modify testModule so that ModulesByPackage_df and DatasetsByPackage_d…
gregorbj Jan 28, 2019
96a3430
Update documentation of testModule function.
gregorbj Jan 28, 2019
2fe33f3
Simplify doTests function to use do.call to call testModule with list…
gregorbj Jan 28, 2019
11db2b1
remove ModelState file
gregorbj Jan 28, 2019
0143695
Modify verspm_test file to include identification of required package…
gregorbj Jan 28, 2019
156ca6e
Modify testing code to work with new testModule function
gregorbj Jan 28, 2019
a46c379
Rebuild VETravelPerformance package
gregorbj Jan 28, 2019
34a9085
Modify testing scripts to be consistent with latest testing functions
gregorbj Jan 28, 2019
be5702e
Rebuild VEPowertrainsAndFuels package
gregorbj Jan 28, 2019
04048a6
remove temporary file
gregorbj Jan 28, 2019
30da795
Update module test code and rerun tests.
gregorbj Jan 28, 2019
15635b8
Remove temporary directory
gregorbj Jan 28, 2019
14fd4cd
remove temporary directory
gregorbj Jan 28, 2019
dd6b790
Rebuild VEHouseholdTravel package
gregorbj Jan 28, 2019
738ed86
Update testing code, run tests, and rebuild package
gregorbj Jan 28, 2019
d1dc79a
Update test scripts, retest, rebuild package
gregorbj Jan 28, 2019
cb77c85
Update test code, run tests, rebuild package
gregorbj Jan 28, 2019
8de5e21
Update tests, rerun tests, rebuild package
gregorbj Jan 28, 2019
aa1c6a2
Modify run_parameters.json to add RequiredVEPackages parameter
gregorbj Jan 28, 2019
8ae6f19
Add return from testModule if Initialize module and no inputs. Correc…
gregorbj Jan 29, 2019
32ef5cb
Remove documentation files for removed modules and rebuild package
gregorbj Jan 30, 2019
5b6c8da
Datastore.tar for VE-State testing is too large
gregorbj Feb 19, 2019
0c445c0
Add TestGeoName argument to testModule function to enable selecting w…
gregorbj Feb 19, 2019
192fe02
Add input file checks
gregorbj Feb 19, 2019
364776c
Updated manual pages
gregorbj Feb 19, 2019
72b84a6
VE-State working modules and concurrent changes to make modules work …
gregorbj Feb 19, 2019
5113919
Working VE-State and VE-RSPM models
gregorbj Feb 19, 2019
26910e3
Update documentation of readDatastoreTables function
gregorbj Feb 21, 2019
12dfd55
Remove old documentation that is no longer needed because it is conta…
gregorbj Feb 21, 2019
a440370
Update the visioneval function documentation md files and the functio…
gregorbj Feb 21, 2019
eb9065b
Update Coding_Guidelines
gregorbj Feb 21, 2019
45ced10
Update model_system_design
gregorbj Feb 21, 2019
3650fad
Note that this documentation is there for background purposes
gregorbj Feb 21, 2019
a1d04eb
Remove unused model input files in test datasets
gregorbj Feb 21, 2019
b5f29c5
Revise writeVENameRegistry function so that it doesn't need to have a…
gregorbj Feb 21, 2019
87f39a3
Update the VisionEval name registry - VENameRegistry.json
gregorbj Feb 21, 2019
b3476ba
Update the module_status.csv file
gregorbj Feb 21, 2019
8b79021
Update the update_name_registry.r script to include all the current m…
gregorbj Feb 21, 2019
1139db1
Merge pull request #244 from gregorbj/develop
landisrm Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
.DS_Store
ve-lib
Log_*.txt

4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ env:
- FOLDER=sources/modules/VE2001NHTS SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=
- FOLDER=sources/modules/VEHouseholdTravel SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=VE2001NHTS
- FOLDER=sources/modules/VEHouseholdVehicles SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=VE2001NHTS,VEHouseholdTravel
- FOLDER=sources/modules/VELandUse SCRIPT=tests/scripts/verspm_test.R TYPE=module DEPENDS=VE2001NHTS,VESimHouseholds
- FOLDER=sources/modules/VESimHouseholds SCRIPT=tests/scripts/verspm_test.R TYPE=module DEPENDS=
- FOLDER=sources/modules/VELandUse SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=VE2001NHTS,VESimHouseholds
- FOLDER=sources/modules/VESimHouseholds SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=
- FOLDER=sources/modules/VESyntheticFirms SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=
- FOLDER=sources/modules/VETransportSupply SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=
- FOLDER=sources/modules/VETransportSupplyUse SCRIPT=tests/scripts/test.R TYPE=module DEPENDS=
Expand Down
97 changes: 70 additions & 27 deletions api/Coding_Guidelines.md
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 0 additions & 31 deletions api/Package_Development_Standards.md
View file
Open in desktop

This file was deleted.

Loading