Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
a805e20
test commit
Aug 19, 2013
5f531ce
Merge branch 'develop' of https://github.com/PCBhagwat/emlab-generati…
Nov 1, 2013
a8642c4
update1
Nov 6, 2013
b87e2db
Dismantling Alogrithm initial coding
Nov 12, 2013
b0275ce
Dismantling V1.01
Nov 12, 2013
42fb844
JUnit Test for dismantling algorithm and update
Nov 13, 2013
a318a90
updates
Nov 13, 2013
add7c10
update
Nov 13, 2013
97de092
Junit
Nov 18, 2013
dc9e436
Commit
Nov 19, 2013
7cd428f
updated dismantling algorithm
Feb 18, 2014
54e5978
done!..for now
Feb 20, 2014
3e7bb61
debugging
Feb 24, 2014
1bcf096
updated
Feb 25, 2014
909f4e0
debug
Feb 27, 2014
cb37646
update
Feb 27, 2014
3c9364a
rconfig
Feb 27, 2014
26df423
data
Feb 27, 2014
70edfc3
data
Feb 27, 2014
d06bab1
update
Feb 27, 2014
96e8551
Merged from develop.
Mar 6, 2014
6ad38af
forecasting interconnector use in two country system
Mar 14, 2014
a7f9cb5
update
Mar 14, 2014
02eb303
EconomicDismantling
May 1, 2014
94cedc6
Merge branch 'develop' into feature/economicDismantling
May 1, 2014
1b919b3
commit
May 1, 2014
cb6dad2
Delete .DS_Store
May 7, 2014
1c2a3f5
Delete .DS_Store
May 7, 2014
dd89dae
Economic Dismantling Update
May 7, 2014
30e9dd4
Merge branch 'feature/economicDismantling' of
May 7, 2014
b69142e
new dismantling commit
Oct 2, 2014
ba4d39b
commit
Oct 3, 2014
9da954c
Delete .DS_Store
Oct 3, 2014
83248cd
Delete .DS_Store
Oct 3, 2014
f061921
Delete .DS_Store
Oct 3, 2014
30346dc
Delete .DS_Store
Oct 3, 2014
80d7674
Delete .DS_Store
Oct 3, 2014
fa152a5
Delete .DS_Store
Oct 3, 2014
c75a687
Delete .DS_Store
Oct 3, 2014
1cb7ee2
Delete .DS_Store
Oct 3, 2014
9f289e6
Delete .DS_Store
Oct 3, 2014
8668b7e
MSR Update
Jan 27, 2015
2c18a31
Merged economic dismantling to current develop.
JCRichstein Jan 27, 2015
670c0b5
Merged also capacity markets. Merge not completed.
JCRichstein Jan 27, 2015
3cc340f
Preliminary finished capacity market merge
JCRichstein Jan 27, 2015
4a73094
Debugged new CM and ED merge
Jan 28, 2015
0f0e5ae
Added FinancialPowerPlantReport.java
JCRichstein Jan 30, 2015
2e69900
Merge branch 'develop' into feature/financialReport
JCRichstein Feb 2, 2015
2a65edf
Started with draft function for financial reports.
JCRichstein Feb 2, 2015
9fb9dcf
Worked on financial reports function.
JCRichstein Feb 3, 2015
3b75d68
Continued work on financial reports.
JCRichstein Feb 5, 2015
ba9bd1f
Merge branch 'develop' into feature/financialReport
JCRichstein Feb 5, 2015
8a64b9d
worked and removed loggers.
JCRichstein Feb 6, 2015
3ea8fe2
updated queries-Ranalysis.properties.
JCRichstein Feb 10, 2015
54b29a1
Merge branch 'develop' into feature/financialReport
JCRichstein Feb 10, 2015
4f2e0a2
reworked financialreport query.
JCRichstein Feb 10, 2015
43f2751
reworked financialreport query.
JCRichstein Feb 10, 2015
d8fc7f4
Worked on adaptive CO2 cap policy.
JCRichstein Feb 24, 2015
aed624d
Merge branch 'develop' into feature/financialReport
JCRichstein Mar 9, 2015
85e0161
Worked on financialreport scripts. Added PredictionAnalysis (overlap …
JCRichstein Mar 13, 2015
f68a767
First prototype of historical CVAR
JCRichstein Mar 19, 2015
8c8f281
Worked on historical CVar.
JCRichstein Mar 20, 2015
c085b5b
Removed hard-coding from HistoricalCVar.
JCRichstein Mar 23, 2015
5fd17d5
Merge branch 'develop' into feature/historicalCVar
JCRichstein Mar 25, 2015
1daf5eb
completed bug fix from develop.
JCRichstein Mar 25, 2015
f4ec3a6
Worked on historical cvar. Added WACC markup for unknown tech.
JCRichstein Mar 28, 2015
6925629
Merge branch 'develop' into feature/adaptiveCO2
JCRichstein Mar 28, 2015
cd1f04a
Merged adaptiveCO2 update to historical cvar.
JCRichstein Mar 28, 2015
2ba970c
Updated the market stability reserve to also accept one year delays.
JCRichstein Mar 29, 2015
189b304
Added new scenarios for CM Paper
Kaveri3012 May 27, 2015
0647d86
Added a new class RenewableSupportScheme. :)
Kaveri3012 Jun 6, 2015
f6478f5
created new class RenewableSupportScheme and edited Role Regulator to
Kaveri3012 Jun 7, 2015
d7a2908
created new class as a generic support price, SupportPriceContract,
Kaveri3012 Jun 7, 2015
57be334
package info for renewablesupportrole
Kaveri3012 Jun 7, 2015
5ec45a7
extended feed in premium role
Kaveri3012 Jun 8, 2015
edeffe4
Finished FeedInPremiumRole, implemented it in DecarbonizationModelRole
Kaveri3012 Jun 10, 2015
b370dca
modified investment role to accommodate the feed in tariff
Kaveri3012 Jun 11, 2015
cba0a15
debugged FeedInPremium Role
Kaveri3012 Jun 16, 2015
069310d
Merge remote-tracking branch 'Jorn/feature/historicalCVar' into
Kaveri3012 Jun 18, 2015
7cdd291
merged jorn's historical Cvar branch
Kaveri3012 Jun 18, 2015
a933714
Added Rob's Tender Package
Kaveri3012 Jun 18, 2015
9e8c32a
Added Renewable Target Role for Tender
Kaveri3012 Jun 19, 2015
b39b073
Added RelativeRenewableTarget Class and its repository
Kaveri3012 Jun 24, 2015
9b7cd17
Completed CalculateTenderRenewableTargetRole
Kaveri3012 Jun 25, 2015
896c747
tender bid and other things updated
rjjdejeu Jun 25, 2015
a18c63c
debugges calculate renewable target role
Kaveri3012 Jun 25, 2015
1b6e210
Merge remote-tracking branch 'Rob/feature/mergedBranchForTender' into…
Kaveri3012 Jun 25, 2015
62971a8
tender clearing finished (hopefully)
rjjdejeu Jun 25, 2015
2b2655f
tender clearing finished (hopefully)
rjjdejeu Jun 25, 2015
8390718
tender clearing finished (hopefully)
rjjdejeu Jun 25, 2015
b72795b
tender clearing updated & payment role started
rjjdejeu Jun 25, 2015
17d0523
little updates to tender algorithm, and changing back capacity market
Kaveri3012 Jun 29, 2015
45e2b3e
updated the role names
rjjdejeu Jul 8, 2015
8781756
Tender Role names updated
rjjdejeu Jul 10, 2015
be4f656
clearing Role updated
rjjdejeu Jul 10, 2015
ac42193
Completed SubmitTenderBidRole, and modified Calculate target role.
Kaveri3012 Jul 10, 2015
387b38c
TenderClearingRole improved (still errors at line69/70)
rjjdejeu Jul 11, 2015
e0208ff
Clearing Role improved
rjjdejeu Jul 11, 2015
050e624
Clearing Role and OrganizePayments
rjjdejeu Jul 12, 2015
94dc565
Merged version of Kaveri and Rob Tender code
rjjdejeu Jul 13, 2015
9b0058e
ClearingRole updated but mistake in line 106..
rjjdejeu Jul 14, 2015
bf16d69
some edits to tender bid role, changed back forecastDemandRoleTest to
Kaveri3012 Jul 14, 2015
3bbfd09
Organize Tender payments updated
rjjdejeu Jul 14, 2015
5e0b318
Organize Tender payments finished
rjjdejeu Jul 15, 2015
89c876b
Merge remote-tracking branch 'Rob/feature/mergedBranchForTender' into
Kaveri3012 Jul 16, 2015
91c2849
Merge remote-tracking branch 'Rob/feature/TenderRob' into feature/Tender
Kaveri3012 Jul 17, 2015
ca17ba9
Have completed Rob's two roles, and created a new role which puts all
Kaveri3012 Jul 17, 2015
4e21764
Added tender main role
Kaveri3012 Jul 27, 2015
24bc454
Query in tenderBidRepository updated
rjjdejeu Jul 27, 2015
c585bd4
TenderMainRole added in decarbon role
rjjdejeu Jul 27, 2015
9a74648
Query accepted bids updated
rjjdejeu Jul 28, 2015
74c31b9
TenderMainRole added in decarbonization role
rjjdejeu Jul 31, 2015
280e5a6
Scenario Renewable Tender 1 country added
rjjdejeu Aug 5, 2015
198fd20
Annotations added in tender domain
rjjdejeu Aug 5, 2015
f04cc02
Annotations added in tender role
rjjdejeu Aug 5, 2015
21b47b2
@NodeEntity removed in submitTenderBidRole
rjjdejeu Aug 5, 2015
7bd7da7
@NodeEntity added again in submitTenderBidRole
rjjdejeu Aug 5, 2015
5ef927d
@NodeEntity removed in submitTenderBidRole
rjjdejeu Aug 5, 2015
4027734
@NodeEntity added again in submitTenderBidRole
rjjdejeu Aug 5, 2015
47e77a8
interconnector switched off in scenario file
rjjdejeu Aug 7, 2015
66319aa
interconnector capacity set to zero
rjjdejeu Aug 7, 2015
584a3ae
> added in line 78 of scenario file
rjjdejeu Aug 7, 2015
8b1b85e
bean in line 89 and investmentStandard adjusted in scenario file
rjjdejeu Aug 7, 2015
970bde8
double quotes added line 91 in tender scenario file
rjjdejeu Aug 7, 2015
c7e346c
Debugged errors related to PowerPlant class, and RDJ onecountry scenario
Kaveri3012 Aug 7, 2015
800e4b1
> added in scenario file line 68
rjjdejeu Aug 7, 2015
f45e4a5
biogasPGT added
rjjdejeu Aug 7, 2015
fc0615a
biogasPGT added
rjjdejeu Aug 7, 2015
cecadc2
biogasPGT removed
rjjdejeu Aug 7, 2015
ea54efd
scenario file updated
rjjdejeu Aug 8, 2015
dcbe465
variable in line 84 of tender scenario file updated
rjjdejeu Aug 10, 2015
1b3fe59
variable in line 84 of tender scenario file updated
rjjdejeu Aug 10, 2015
69037dd
isTechnologySpecificityEnabled removed in scenario file
rjjdejeu Aug 10, 2015
9ce4e4b
changed double to TimeSeriesImpl of yearlyTenderDemandTarget
rjjdejeu Aug 10, 2015
59ab148
loggers added in tender calculate target role
rjjdejeu Aug 10, 2015
7190f13
loggers added in tender calculate target role
rjjdejeu Aug 10, 2015
d01289c
If statement added in line 128 so AnnualRenewableTarget cannot be low…
rjjdejeu Aug 11, 2015
79944e5
actualLeadtime changed to finishedConstruction in submitTenderBidRole
rjjdejeu Aug 11, 2015
d41e98a
changed double into long of variable finishedConstruction
rjjdejeu Aug 11, 2015
da108b6
Debugged TimeSeriesCSVReader related error
Kaveri3012 Aug 11, 2015
7ea5896
Merge branch 'feature/TenderRob5' of https://github.com/rjjdejeu/emla…
Kaveri3012 Aug 11, 2015
00059a2
Changed data type of trend to timeSeriesCSVReader
Kaveri3012 Aug 11, 2015
054efc2
reset back to two versions earlier and made small changes
Kaveri3012 Aug 13, 2015
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
Empty file added .bashrc
Empty file.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
*/.project
*/.settings
facedb.lck
doxygenDoc
doxygenDoc
*/.Rapp.history
1 change: 1 addition & 0 deletions emlab-generation/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.log
log.roo
facedb.properties
/target/
4 changes: 4 additions & 0 deletions emlab-generation/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Expand Down
10 changes: 8 additions & 2 deletions emlab-generation/.settings/org.eclipse.jdt.ui.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,28 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=true
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=true
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=true
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.on_save_use_additional_actions=false
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
Expand All @@ -110,10 +113,13 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false
15 changes: 15 additions & 0 deletions emlab-generation/.springBeans
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[3.6.4.201503051146-RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
</configs>
<autoconfigs>
</autoconfigs>
<configSets>
</configSets>
</beansProjectDescription>
14 changes: 13 additions & 1 deletion emlab-generation/queries-Ranalysis.properties
Original file line number Diff line number Diff line change
Expand Up @@ -831,4 +831,16 @@ segmentID=s.out('SEGMENTLOAD_SEGMENT').collect{it.segmentID}[0]
hours=s.out('SEGMENTLOAD_SEGMENT').collect{it.lengthInHours}[0]
finalResult.add([tick, s.baseLoad*growthfactor, market, segmentID, hours])
}
return finalResult",
return finalResult",

"TABLE_FinancialReports", "DecarbonizationModel", "financialReports=g.idx('__types__')[[className:'emlab.gen.domain.market.electricity.FinancialPowerPlantReport']].filter{it.time==tick};
finalResult = [];
columnNames=['tick', 'spotMarketRevenue', 'capacityMarketRevenue', 'strategicReserveRevenue', 'co2HedgingRevenue', 'overallRevenue','commodityCosts','co2Costs','variableCosts','fixedCosts','fullLoadHours','production','powerPlantName','technology','location','powerPlantOwner','operationalStatus','firstYearOfPowerPlantOperation','nominalCapacity','investedCapital'];
finalResult.add(columnNames);
for(v in financialReports){
firstYearOfOperation=v.out('FINANCIALREPORT_POWERPLANT').constructionStartTime.next()+v.out('FINANCIALREPORT_POWERPLANT').actualPermittime.next()+v.out('FINANCIALREPORT_POWERPLANT').actualLeadtime.next()
powerPlantSize=v.out('FINANCIALREPORT_POWERPLANT').actualNominalCapacity.next()
actualInvestedCapital=v.out('FINANCIALREPORT_POWERPLANT').actualInvestedCapital.next()
finalResult.add([v.time, v.spotMarketRevenue, v.capacityMarketRevenue, v.strategicReserveRevenue, v.co2HedgingRevenue, v.overallRevenue, v.commodityCosts, v.co2Costs, v.variableCosts, v.fixedCosts, v.fullLoadHours, v.production, v.out('FINANCIALREPORT_POWERPLANT').name.next(),v.out('FINANCIALREPORT_POWERPLANT').out('TECHNOLOGY').name.next(),v.out('FINANCIALREPORT_POWERPLANT').out('LOCATION').name.next(),v.out('FINANCIALREPORT_POWERPLANT').out('POWERPLANT_OWNER').name.next(),v.powerPlantStatus,firstYearOfOperation,powerPlantSize,actualInvestedCapital]);
};
return finalResult;",
Loading