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

Jump to bottom

remove deltaCap time split for vm_capCum #1258

Merged
merged 8 commits into from
Jan 12, 2024
Merged

remove deltaCap time split for vm_capCum #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48f2377
remove deltaCap time split for vm_capCum
tabeado Mar 17, 2023
c7b0bcd
Merge branch 'remindmodel:develop' into deltaCap_for_capCum
tabeado Apr 2, 2023
bd7b6bd
no deltaCap split in marg benefit spillover calc
tabeado Apr 6, 2023
712a263
fix missing factor in vm_capCum
tabeado Apr 6, 2023
e509977
Merge branch 'remindmodel:develop' into deltaCap_for_capCum
tabeado Sep 26, 2023
c694415
Merge branch 'remindmodel:develop' into deltaCap_for_capCum
tabeado Oct 18, 2023
f8ce5a9
Merge branch 'remindmodel:develop' into deltaCap_for_capCum
tabeado Jan 9, 2024
754e3ca
Merge branch 'remindmodel:develop' into deltaCap_for_capCum
tabeado Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions core/equations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,7 @@ qm_deltaCapCumNet(ttot,regi,teLearn)$(ord(ttot) lt card(ttot) AND pm_ttot_val(tt
vm_capCum(ttot+1,regi,teLearn)
=e=
sum(te2rlf(teLearn,rlf),
(pm_ts(ttot) / 2 * vm_deltaCap(ttot,regi,teLearn,rlf)) + (pm_ts(ttot+1) / 2 * vm_deltaCap(ttot+1,regi,teLearn,rlf))
)
pm_ts(ttot+1)* vm_deltaCap(ttot+1,regi,teLearn,rlf))
+
vm_capCum(ttot,regi,teLearn);

Expand Down
4 changes: 1 addition & 3 deletions modules/22_subsidizeLearning/globallyOptimal/presolve.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ display pm_capCumForeign;
* calculate marginal benefit of spillovers in each region. This expression for the subsidy can be derived analytically.
loop(regi$(pm_SolNonInfes(regi) eq 1),
p22_marginalCapcumBenefit(ttot,regi,teLearn) =
pm_ts(ttot)/2 * (abs(qm_deltaCapCumNet.m(ttot,regi,teLearn)) / max(abs(qm_budget.m(ttot,regi)),1E-9))
+ pm_ts(ttot)/2 * (abs(qm_deltaCapCumNet.m(ttot -1,regi,teLearn)) / max(abs(qm_budget.m(ttot,regi)),1E-9))

pm_ts(ttot) * (abs(qm_deltaCapCumNet.m(ttot,regi,teLearn)) / max(abs(qm_budget.m(ttot,regi)),1E-9))
);


Expand Down