Cleaned up prior version history

VisionEval · Aug 7, 2020 · d603cbf · d603cbf
1 parent 8d04472
commit d603cbf
Show file tree

Hide file tree

Showing 79 changed files with 0 additions and 0 deletions.
diff --git a/...owertrainsAndFuels-previous/.Rbuildignore → ...s/VEPowertrainsAndFuels-old/.Rbuildignore b/...owertrainsAndFuels-previous/.Rbuildignore → ...s/VEPowertrainsAndFuels-old/.Rbuildignore
diff --git a/...EPowertrainsAndFuels-previous/DESCRIPTION → ...les/VEPowertrainsAndFuels-old/DESCRIPTION b/...EPowertrainsAndFuels-previous/DESCRIPTION → ...les/VEPowertrainsAndFuels-old/DESCRIPTION
diff --git a/...es/VEPowertrainsAndFuels-previous/LICENSE → ...modules/VEPowertrainsAndFuels-old/LICENSE b/...es/VEPowertrainsAndFuels-previous/LICENSE → ...modules/VEPowertrainsAndFuels-old/LICENSE
diff --git a/.../VEPowertrainsAndFuels-previous/NAMESPACE → ...dules/VEPowertrainsAndFuels-old/NAMESPACE b/.../VEPowertrainsAndFuels-previous/NAMESPACE → ...dules/VEPowertrainsAndFuels-old/NAMESPACE
diff --git a/...ls-previous/R/AssignHhVehiclePowertrain.R → ...ndFuels-old/R/AssignHhVehiclePowertrain.R b/...ls-previous/R/AssignHhVehiclePowertrain.R → ...ndFuels-old/R/AssignHhVehiclePowertrain.R
diff --git a/...els-previous/R/CalculateCarbonIntensity.R → ...AndFuels-old/R/CalculateCarbonIntensity.R b/...els-previous/R/CalculateCarbonIntensity.R → ...AndFuels-old/R/CalculateCarbonIntensity.R
diff --git a/...wertrainsAndFuels-previous/R/Initialize.R → .../VEPowertrainsAndFuels-old/R/Initialize.R b/...wertrainsAndFuels-previous/R/Initialize.R → .../VEPowertrainsAndFuels-old/R/Initialize.R
diff --git a/...nsAndFuels-previous/R/LoadDefaultValues.R → ...rtrainsAndFuels-old/R/LoadDefaultValues.R b/...nsAndFuels-previous/R/LoadDefaultValues.R → ...rtrainsAndFuels-old/R/LoadDefaultValues.R
diff --git a/.../VEPowertrainsAndFuels-previous/README.md → ...dules/VEPowertrainsAndFuels-old/README.md b/.../VEPowertrainsAndFuels-previous/README.md → ...dules/VEPowertrainsAndFuels-old/README.md
diff --git a/...signHhVehiclePowertrainSpecifications.rda → ...signHhVehiclePowertrainSpecifications.rda b/...signHhVehiclePowertrainSpecifications.rda → ...signHhVehiclePowertrainSpecifications.rda
diff --git a/...alculateCarbonIntensitySpecifications.rda → ...alculateCarbonIntensitySpecifications.rda b/...alculateCarbonIntensitySpecifications.rda → ...alculateCarbonIntensitySpecifications.rda
diff --git a/...revious/data/InitializeSpecifications.rda → ...els-old/data/InitializeSpecifications.rda b/...revious/data/InitializeSpecifications.rda → ...els-old/data/InitializeSpecifications.rda
diff --git a/...ndFuels-previous/data/PhevElecProp_ls.rda → ...ainsAndFuels-old/data/PhevElecProp_ls.rda b/...ndFuels-previous/data/PhevElecProp_ls.rda → ...ainsAndFuels-old/data/PhevElecProp_ls.rda
diff --git a/...evious/data/PowertrainFuelDefaults_ls.rda → ...ls-old/data/PowertrainFuelDefaults_ls.rda b/...evious/data/PowertrainFuelDefaults_ls.rda → ...ls-old/data/PowertrainFuelDefaults_ls.rda
diff --git a/...xtdata/E&E_Defaults_&_Optional_Inputs.txt → ...xtdata/E&E_Defaults_&_Optional_Inputs.txt b/...xtdata/E&E_Defaults_&_Optional_Inputs.txt → ...xtdata/E&E_Defaults_&_Optional_Inputs.txt
diff --git a/...revious/inst/extdata/carbon_intensity.csv → ...els-old/inst/extdata/carbon_intensity.csv b/...revious/inst/extdata/carbon_intensity.csv → ...els-old/inst/extdata/carbon_intensity.csv
diff --git a/...revious/inst/extdata/carbon_intensity.txt → ...els-old/inst/extdata/carbon_intensity.txt b/...revious/inst/extdata/carbon_intensity.txt → ...els-old/inst/extdata/carbon_intensity.txt
diff --git a/...els-previous/inst/extdata/carsvc_fuel.csv → ...AndFuels-old/inst/extdata/carsvc_fuel.csv b/...els-previous/inst/extdata/carsvc_fuel.csv → ...AndFuels-old/inst/extdata/carsvc_fuel.csv
diff --git a/...els-previous/inst/extdata/carsvc_fuel.txt → ...AndFuels-old/inst/extdata/carsvc_fuel.txt b/...els-previous/inst/extdata/carsvc_fuel.txt → ...AndFuels-old/inst/extdata/carsvc_fuel.txt
diff --git a/...s/inst/extdata/carsvc_powertrain_prop.csv → ...d/inst/extdata/carsvc_powertrain_prop.csv b/...s/inst/extdata/carsvc_powertrain_prop.csv → ...d/inst/extdata/carsvc_powertrain_prop.csv
diff --git a/...s/inst/extdata/carsvc_powertrain_prop.txt → ...d/inst/extdata/carsvc_powertrain_prop.txt b/...s/inst/extdata/carsvc_powertrain_prop.txt → ...d/inst/extdata/carsvc_powertrain_prop.txt
diff --git a/...els-previous/inst/extdata/comsvc_fuel.csv → ...AndFuels-old/inst/extdata/comsvc_fuel.csv b/...els-previous/inst/extdata/comsvc_fuel.csv → ...AndFuels-old/inst/extdata/comsvc_fuel.csv
diff --git a/...els-previous/inst/extdata/comsvc_fuel.txt → ...AndFuels-old/inst/extdata/comsvc_fuel.txt b/...els-previous/inst/extdata/comsvc_fuel.txt → ...AndFuels-old/inst/extdata/comsvc_fuel.txt
diff --git a/...s/inst/extdata/comsvc_powertrain_prop.csv → ...d/inst/extdata/comsvc_powertrain_prop.csv b/...s/inst/extdata/comsvc_powertrain_prop.csv → ...d/inst/extdata/comsvc_powertrain_prop.csv
diff --git a/...s/inst/extdata/comsvc_powertrain_prop.txt → ...d/inst/extdata/comsvc_powertrain_prop.txt b/...s/inst/extdata/comsvc_powertrain_prop.txt → ...d/inst/extdata/comsvc_powertrain_prop.txt
diff --git a/...us/inst/extdata/congestion_efficiency.csv → ...ld/inst/extdata/congestion_efficiency.csv b/...us/inst/extdata/congestion_efficiency.csv → ...ld/inst/extdata/congestion_efficiency.csv
diff --git a/...us/inst/extdata/congestion_efficiency.txt → ...ld/inst/extdata/congestion_efficiency.txt b/...us/inst/extdata/congestion_efficiency.txt → ...ld/inst/extdata/congestion_efficiency.txt
diff --git a/...ndFuels-previous/inst/extdata/hh_fuel.csv → ...ainsAndFuels-old/inst/extdata/hh_fuel.csv b/...ndFuels-previous/inst/extdata/hh_fuel.csv → ...ainsAndFuels-old/inst/extdata/hh_fuel.csv
diff --git a/...ndFuels-previous/inst/extdata/hh_fuel.txt → ...ainsAndFuels-old/inst/extdata/hh_fuel.txt b/...ndFuels-previous/inst/extdata/hh_fuel.txt → ...ainsAndFuels-old/inst/extdata/hh_fuel.txt
diff --git a/...vious/inst/extdata/hh_powertrain_prop.csv → ...s-old/inst/extdata/hh_powertrain_prop.csv b/...vious/inst/extdata/hh_powertrain_prop.csv → ...s-old/inst/extdata/hh_powertrain_prop.csv
diff --git a/...vious/inst/extdata/hh_powertrain_prop.txt → ...s-old/inst/extdata/hh_powertrain_prop.txt b/...vious/inst/extdata/hh_powertrain_prop.txt → ...s-old/inst/extdata/hh_powertrain_prop.txt
diff --git a/...vious/inst/extdata/hvytrk_biofuel_mix.csv → ...s-old/inst/extdata/hvytrk_biofuel_mix.csv b/...vious/inst/extdata/hvytrk_biofuel_mix.csv → ...s-old/inst/extdata/hvytrk_biofuel_mix.csv
diff --git a/...vious/inst/extdata/hvytrk_biofuel_mix.txt → ...s-old/inst/extdata/hvytrk_biofuel_mix.txt b/...vious/inst/extdata/hvytrk_biofuel_mix.txt → ...s-old/inst/extdata/hvytrk_biofuel_mix.txt
diff --git a/...els-previous/inst/extdata/hvytrk_fuel.csv → ...AndFuels-old/inst/extdata/hvytrk_fuel.csv b/...els-previous/inst/extdata/hvytrk_fuel.csv → ...AndFuels-old/inst/extdata/hvytrk_fuel.csv
diff --git a/...els-previous/inst/extdata/hvytrk_fuel.txt → ...AndFuels-old/inst/extdata/hvytrk_fuel.txt b/...els-previous/inst/extdata/hvytrk_fuel.txt → ...AndFuels-old/inst/extdata/hvytrk_fuel.txt
diff --git a/...ata/hvytrk_powertrain_characteristics.csv → ...ata/hvytrk_powertrain_characteristics.csv b/...ata/hvytrk_powertrain_characteristics.csv → ...ata/hvytrk_powertrain_characteristics.csv
diff --git a/...ata/hvytrk_powertrain_characteristics.txt → ...ata/hvytrk_powertrain_characteristics.txt b/...ata/hvytrk_powertrain_characteristics.txt → ...ata/hvytrk_powertrain_characteristics.txt
diff --git a/...s/inst/extdata/hvytrk_powertrain_prop.csv → ...d/inst/extdata/hvytrk_powertrain_prop.csv b/...s/inst/extdata/hvytrk_powertrain_prop.csv → ...d/inst/extdata/hvytrk_powertrain_prop.csv
diff --git a/...s/inst/extdata/hvytrk_powertrain_prop.txt → ...d/inst/extdata/hvytrk_powertrain_prop.txt b/...s/inst/extdata/hvytrk_powertrain_prop.txt → ...d/inst/extdata/hvytrk_powertrain_prop.txt
diff --git a/...previous/inst/extdata/ldv_biofuel_mix.csv → ...uels-old/inst/extdata/ldv_biofuel_mix.csv b/...previous/inst/extdata/ldv_biofuel_mix.csv → ...uels-old/inst/extdata/ldv_biofuel_mix.csv
diff --git a/...previous/inst/extdata/ldv_biofuel_mix.txt → ...uels-old/inst/extdata/ldv_biofuel_mix.txt b/...previous/inst/extdata/ldv_biofuel_mix.txt → ...uels-old/inst/extdata/ldv_biofuel_mix.txt
diff --git a/...xtdata/ldv_powertrain_characteristics.csv → ...xtdata/ldv_powertrain_characteristics.csv b/...xtdata/ldv_powertrain_characteristics.csv → ...xtdata/ldv_powertrain_characteristics.csv
diff --git a/...xtdata/ldv_powertrain_characteristics.txt → ...xtdata/ldv_powertrain_characteristics.txt b/...xtdata/ldv_powertrain_characteristics.txt → ...xtdata/ldv_powertrain_characteristics.txt
diff --git a/...ious/inst/extdata/transit_biofuel_mix.csv → ...-old/inst/extdata/transit_biofuel_mix.csv b/...ious/inst/extdata/transit_biofuel_mix.csv → ...-old/inst/extdata/transit_biofuel_mix.csv
diff --git a/...ious/inst/extdata/transit_biofuel_mix.txt → ...-old/inst/extdata/transit_biofuel_mix.txt b/...ious/inst/extdata/transit_biofuel_mix.txt → ...-old/inst/extdata/transit_biofuel_mix.txt
diff --git a/...ls-previous/inst/extdata/transit_fuel.csv → ...ndFuels-old/inst/extdata/transit_fuel.csv b/...ls-previous/inst/extdata/transit_fuel.csv → ...ndFuels-old/inst/extdata/transit_fuel.csv
diff --git a/...ls-previous/inst/extdata/transit_fuel.txt → ...ndFuels-old/inst/extdata/transit_fuel.txt b/...ls-previous/inst/extdata/transit_fuel.txt → ...ndFuels-old/inst/extdata/transit_fuel.txt
diff --git a/...ta/transit_powertrain_characteristics.csv → ...ta/transit_powertrain_characteristics.csv b/...ta/transit_powertrain_characteristics.csv → ...ta/transit_powertrain_characteristics.csv
diff --git a/...ta/transit_powertrain_characteristics.txt → ...ta/transit_powertrain_characteristics.txt b/...ta/transit_powertrain_characteristics.txt → ...ta/transit_powertrain_characteristics.txt
diff --git a/.../inst/extdata/transit_powertrain_prop.csv → .../inst/extdata/transit_powertrain_prop.csv b/.../inst/extdata/transit_powertrain_prop.csv → .../inst/extdata/transit_powertrain_prop.csv
diff --git a/.../inst/extdata/transit_powertrain_prop.txt → .../inst/extdata/transit_powertrain_prop.txt b/.../inst/extdata/transit_powertrain_prop.txt → .../inst/extdata/transit_powertrain_prop.txt
diff --git a/.../module_docs/AssignHhVehiclePowertrain.md → .../module_docs/AssignHhVehiclePowertrain.md b/.../module_docs/AssignHhVehiclePowertrain.md → .../module_docs/AssignHhVehiclePowertrain.md
diff --git a/...t/module_docs/CalculateCarbonIntensity.md → ...t/module_docs/CalculateCarbonIntensity.md b/...t/module_docs/CalculateCarbonIntensity.md → ...t/module_docs/CalculateCarbonIntensity.md
diff --git a/...s-previous/inst/module_docs/Initialize.md → ...dFuels-old/inst/module_docs/Initialize.md b/...s-previous/inst/module_docs/Initialize.md → ...dFuels-old/inst/module_docs/Initialize.md
diff --git a/...ous/inst/module_docs/LoadDefaultValues.md → ...old/inst/module_docs/LoadDefaultValues.md b/...ous/inst/module_docs/LoadDefaultValues.md → ...old/inst/module_docs/LoadDefaultValues.md
diff --git a/...inst/module_docs/metro_phev_elec_prop.png → ...inst/module_docs/metro_phev_elec_prop.png b/...inst/module_docs/metro_phev_elec_prop.png → ...inst/module_docs/metro_phev_elec_prop.png
diff --git a/.../module_docs/non-metro_phev_elec_prop.png → .../module_docs/non-metro_phev_elec_prop.png b/.../module_docs/non-metro_phev_elec_prop.png → .../module_docs/non-metro_phev_elec_prop.png
diff --git a/...previous/man/AssignHhVehiclePowertrain.Rd → ...uels-old/man/AssignHhVehiclePowertrain.Rd b/...previous/man/AssignHhVehiclePowertrain.Rd → ...uels-old/man/AssignHhVehiclePowertrain.Rd
diff --git a/...ssignHhVehiclePowertrainSpecifications.Rd → ...ssignHhVehiclePowertrainSpecifications.Rd b/...ssignHhVehiclePowertrainSpecifications.Rd → ...ssignHhVehiclePowertrainSpecifications.Rd
diff --git a/...-previous/man/CalculateCarbonIntensity.Rd → ...Fuels-old/man/CalculateCarbonIntensity.Rd b/...-previous/man/CalculateCarbonIntensity.Rd → ...Fuels-old/man/CalculateCarbonIntensity.Rd
diff --git a/...CalculateCarbonIntensitySpecifications.Rd → ...CalculateCarbonIntensitySpecifications.Rd b/...CalculateCarbonIntensitySpecifications.Rd → ...CalculateCarbonIntensitySpecifications.Rd
diff --git a/...rainsAndFuels-previous/man/DataPresent.Rd → ...owertrainsAndFuels-old/man/DataPresent.Rd b/...rainsAndFuels-previous/man/DataPresent.Rd → ...owertrainsAndFuels-old/man/DataPresent.Rd
diff --git a/...trainsAndFuels-previous/man/Initialize.Rd → ...PowertrainsAndFuels-old/man/Initialize.Rd b/...trainsAndFuels-previous/man/Initialize.Rd → ...PowertrainsAndFuels-old/man/Initialize.Rd
diff --git a/...-previous/man/InitializeSpecifications.Rd → ...Fuels-old/man/InitializeSpecifications.Rd b/...-previous/man/InitializeSpecifications.Rd → ...Fuels-old/man/InitializeSpecifications.Rd
diff --git a/...sAndFuels-previous/man/PhevElecProp_ls.Rd → ...trainsAndFuels-old/man/PhevElecProp_ls.Rd b/...sAndFuels-previous/man/PhevElecProp_ls.Rd → ...trainsAndFuels-old/man/PhevElecProp_ls.Rd
diff --git a/...previous/man/PowertrainFuelDefaults_ls.Rd → ...uels-old/man/PowertrainFuelDefaults_ls.Rd b/...previous/man/PowertrainFuelDefaults_ls.Rd → ...uels-old/man/PowertrainFuelDefaults_ls.Rd
diff --git a/...ndFuels-previous/man/calcAverageFuelCI.Rd → ...ainsAndFuels-old/man/calcAverageFuelCI.Rd b/...ndFuels-previous/man/calcAverageFuelCI.Rd → ...ainsAndFuels-old/man/calcAverageFuelCI.Rd
diff --git a/...insAndFuels-previous/man/filterOnNames.Rd → ...ertrainsAndFuels-old/man/filterOnNames.Rd b/...insAndFuels-previous/man/filterOnNames.Rd → ...ertrainsAndFuels-old/man/filterOnNames.Rd
diff --git a/...rainsAndFuels-previous/man/interpolate.Rd → ...owertrainsAndFuels-old/man/interpolate.Rd b/...rainsAndFuels-previous/man/interpolate.Rd → ...owertrainsAndFuels-old/man/interpolate.Rd
diff --git a/...ndFuels-previous/man/interpolateDfVals.Rd → ...ainsAndFuels-old/man/interpolateDfVals.Rd b/...ndFuels-previous/man/interpolateDfVals.Rd → ...ainsAndFuels-old/man/interpolateDfVals.Rd
diff --git a/...AndFuels-previous/tests/scripts/analyze.R → ...rainsAndFuels-old/tests/scripts/analyze.R b/...AndFuels-previous/tests/scripts/analyze.R → ...rainsAndFuels-old/tests/scripts/analyze.R
diff --git a/...insAndFuels-previous/tests/scripts/test.R → ...ertrainsAndFuels-old/tests/scripts/test.R b/...insAndFuels-previous/tests/scripts/test.R → ...ertrainsAndFuels-old/tests/scripts/test.R
diff --git a/...s-previous/tests/scripts/test_functions.R → ...dFuels-old/tests/scripts/test_functions.R b/...s-previous/tests/scripts/test_functions.R → ...dFuels-old/tests/scripts/test_functions.R
diff --git a/...els-previous/tests/scripts/veclmpo_test.R → ...AndFuels-old/tests/scripts/veclmpo_test.R b/...els-previous/tests/scripts/veclmpo_test.R → ...AndFuels-old/tests/scripts/veclmpo_test.R
diff --git a/...uels-previous/tests/scripts/verspm_test.R → ...sAndFuels-old/tests/scripts/verspm_test.R b/...uels-previous/tests/scripts/verspm_test.R → ...sAndFuels-old/tests/scripts/verspm_test.R
diff --git a/...els-previous/tests/scripts/vestate_test.R → ...AndFuels-old/tests/scripts/vestate_test.R b/...els-previous/tests/scripts/vestate_test.R → ...AndFuels-old/tests/scripts/vestate_test.R
diff --git a/...els-previous/tests/veclmpo/ModelState.Rda → ...AndFuels-old/tests/veclmpo/ModelState.Rda b/...els-previous/tests/veclmpo/ModelState.Rda → ...AndFuels-old/tests/veclmpo/ModelState.Rda
diff --git a/...uels-previous/tests/verspm/ModelState.Rda → ...sAndFuels-old/tests/verspm/ModelState.Rda b/...uels-previous/tests/verspm/ModelState.Rda → ...sAndFuels-old/tests/verspm/ModelState.Rda
diff --git a/...els-previous/tests/vestate/ModelState.Rda → ...AndFuels-old/tests/vestate/ModelState.Rda b/...els-previous/tests/vestate/ModelState.Rda → ...AndFuels-old/tests/vestate/ModelState.Rda