Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
remind
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jerome Hilaire
remind
Commits
a1940d46
Commit
a1940d46
authored
4 years ago
by
Marianna Rottoli
Browse files
Options
Downloads
Patches
Plain Diff
Iterative EDGE uses purchase costs for LDVs.
parent
239d765e
No related branches found
No related tags found
1 merge request
!194
Updates to EDGE-Transport
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/iterative/EDGE_transport.R
+6
-2
6 additions, 2 deletions
scripts/iterative/EDGE_transport.R
with
6 additions
and
2 deletions
scripts/iterative/EDGE_transport.R
+
6
−
2
View file @
a1940d46
...
...
@@ -81,6 +81,7 @@ vot_data = inputdata$vot_data
logit_params
=
inputdata
$
logit_params
int_dat
=
inputdata
$
int_dat
nonfuel_costs
=
inputdata
$
nonfuel_costs
capcost4W
=
inputdata
$
capcost4W
price_nonmot
=
inputdata
$
price_nonmot
pref_data
=
inputdata
$
pref_data
...
...
@@ -131,8 +132,11 @@ if (file.exists(datapath("demand_previousiter.RDS"))) {
rebates_febatesBEV
=
FALSE
}
nonfuel_costs
=
applylearning
(
nonfuel_costs
,
gdx
,
REMINDmapping
,
EDGE2teESmap
,
demand_learntmp
,
ES_demandpr
,
ES_demand
,
rebates_febatesBEV
=
rebates_febatesBEV
,
rebates_febatesFCEV
=
rebates_febatesFCEV
)
saveRDS
(
nonfuel_costs
,
"nonfuel_costs_learning.RDS"
)}
else
{
nonfuel_costs_list
=
applylearning
(
nonfuel_costs
,
capcost4W
,
gdx
,
REMINDmapping
,
EDGE2teESmap
,
demand_learntmp
,
ES_demandpr
,
ES_demand
,
rebates_febatesBEV
=
rebates_febatesBEV
,
rebates_febatesFCEV
=
rebates_febatesFCEV
)
nonfuel_costs
=
nonfuel_costs_list
$
nonfuel_costs
capcost4W
=
nonfuel_costs_list
$
capcost4W
saveRDS
(
nonfuel_costs
,
"nonfuel_costs_learning.RDS"
)
saveRDS
(
capcost4W
,
"capcost_learning.RDS"
)}
else
{
stations
=
NULL
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment