Code

Eco#166

Code

Open

bam241 wants to merge 135 commits intocyclus:maincyclus/cymetric:mainfrom bam241:ecobam241/cymetric:ecoCopy head branch name to clipboard

+2,258-3

Commits

Commits on Apr 27, 2015

• testing git commands with few modifications on metrics.py

  vcloitre

  committed
  d2b68d9

  Copy full SHA for d2b68d9

• testing git commands

  vcloitre

  committed
  781c9aa

  Copy full SHA for 781c9aa

• testing git comands #3

  vcloitre

  committed
  792dabe

  Copy full SHA for 792dabe

• testing git commands #4

  vcloitre

  committed
  73302a3

  Copy full SHA for 73302a3

Commits on Apr 29, 2015

• removed changes

  vcloitre

  committed
  d7ac5ab

  Copy full SHA for d7ac5ab

Commits on Apr 30, 2015

• fco metrics

  vcloitre

  committed
  c7ab21f

  Copy full SHA for c7ab21f

Commits on Jul 1, 2015

• update

  vcloitre

  committed
  9851571

  Copy full SHA for 9851571

• fix for raw_to_series

  vcloitre

  committed
  c3e5e35

  Copy full SHA for c3e5e35

• fix for raw_to_series

  vcloitre

  committed
  ca21ca9

  Copy full SHA for ca21ca9

Commits on Aug 6, 2015

• fix for raw_to_series

  vcloitre

  committed
  376ede0

  Copy full SHA for 376ede0

• fix for raw_to_series

  vcloitre

  committed
  cf9edcf

  Copy full SHA for cf9edcf

• Merge branch 'develop' of github.com:cyclus/cymetric into develop

  Show description for a2bc133
  vcloitre

  committed
  a2bc133

  Copy full SHA for a2bc133

• Merge branch 'develop' of github.com:vcloitre/cymetric into develop

  Show description for 1a0b2f1
  vcloitre

  committed
  1a0b2f1

  Copy full SHA for 1a0b2f1

• diff with develop branch

  vcloitre

  committed
  dae3224

  Copy full SHA for dae3224

• add test file for cymetric/tools.py

  vcloitre

  committed
  09025d0

  Copy full SHA for 09025d0

• add dbtest

  vcloitre

  committed
  78269b0

  Copy full SHA for 78269b0

• add dbtest

  vcloitre

  committed
  6b1f8d8

  Copy full SHA for 6b1f8d8

• add dbtest

  vcloitre

  committed
  56c2c4f

  Copy full SHA for 56c2c4f

• add dbtest

  vcloitre

  committed
  bfc526b

  Copy full SHA for bfc526b

• eco update

  vcloitre

  committed
  1ca6955

  Copy full SHA for 1ca6955

• hashable dict

  vcloitre

  committed
  8aeeac1

  Copy full SHA for 8aeeac1

• hashable dict

  vcloitre

  committed
  a72f524

  Copy full SHA for a72f524

• hashable dict

  vcloitre

  committed
  0e04a20

  Copy full SHA for 0e04a20

Commits on Aug 10, 2015

• add prototype level to give facility costs

  vcloitre

  committed
  e12cd34

  Copy full SHA for e12cd34

• add prototype level to give facility costs

  vcloitre

  committed
  c8c4131

  Copy full SHA for c8c4131

• small fix

  vcloitre

  committed
  7b2b8c6

  Copy full SHA for 7b2b8c6

• small fix

  vcloitre

  committed
  3755dfd

  Copy full SHA for 3755dfd

• add prototype level

  vcloitre

  committed
  bf1836f

  Copy full SHA for bf1836f

Commits on Aug 12, 2015

• small fix

  vcloitre

  committed
  e4181e4

  Copy full SHA for e4181e4

• small fix

  vcloitre

  committed
  d6fde86

  Copy full SHA for d6fde86

• changed test if reactor in capital cost

  vcloitre

  committed
  7369b6b

  Copy full SHA for 7369b6b

• small fix in period costs

  vcloitre

  committed
  ac6c316

  Copy full SHA for ac6c316

• small fix in period costs

  vcloitre

  committed
  4fa4843

  Copy full SHA for 4fa4843

• small fix

  vcloitre

  committed
  e9cdc86

  Copy full SHA for e9cdc86

• simulation lcoe fix

  vcloitre

  committed
  a6fcbae

  Copy full SHA for a6fcbae

Commits on Aug 13, 2015

• length of simulation annual costs

  vcloitre

  committed
  98d1cdb

  Copy full SHA for 98d1cdb

• fuel costs not as a dict in EconomicInfo metric

  vcloitre

  committed
  14087b5

  Copy full SHA for 14087b5

• small fix

  vcloitre

  committed
  801a489

  Copy full SHA for 801a489

• small fix

  vcloitre

  committed
  95a0398

  Copy full SHA for 95a0398

• small fix

  vcloitre

  committed
  72d3eb2

  Copy full SHA for 72d3eb2

• small fix

  vcloitre

  committed
  2c9f352

  Copy full SHA for 2c9f352

• small fix

  vcloitre

  committed
  9f39096

  Copy full SHA for 9f39096

• minor fix

  vcloitre

  committed
  a23a260

  Copy full SHA for a23a260

• minor fix

  vcloitre

  committed
  d2b8a68

  Copy full SHA for d2b8a68

• minor fix

  vcloitre

  committed
  e679f91

  Copy full SHA for e679f91

• debugging

  vcloitre

  committed
  78eb7bd

  Copy full SHA for 78eb7bd

Commits on Aug 14, 2015

• bugs at institution level

  vcloitre

  committed
  dd0671b

  Copy full SHA for dd0671b

• bugs at institution level

  vcloitre

  committed
  615f9d1

  Copy full SHA for 615f9d1

• error institution pow gen

  vcloitre

  committed
  9b23553

  Copy full SHA for 9b23553

• error institution pow gen

  vcloitre

  committed
  1d32788

  Copy full SHA for 1d32788

• add 'deviation' parameter for OM and fuel costs for random prices

  vcloitre

  committed
  635d961

  Copy full SHA for 635d961

• add 'deviation' parameter for OM and fuel costs for random prices

  vcloitre

  committed
  996a8da

  Copy full SHA for 996a8da

• add 'deviation' parameter for OM and fuel costs for random prices

  vcloitre

  committed
  58afa80

  Copy full SHA for 58afa80

• add 'deviation' parameter for OM and fuel costs for random prices

  vcloitre

  committed
  da094d5

  Copy full SHA for da094d5

• change from poisson to gaussian for deviation

  vcloitre

  committed
  7b9dd7c

  Copy full SHA for 7b9dd7c

• change from poisson to gaussian for deviation

  vcloitre

  committed
  fd3895a

  Copy full SHA for fd3895a

Commits on Aug 16, 2015

• simpler calculations for lcoe

  vcloitre

  committed
  a772ac8

  Copy full SHA for a772ac8

• simpler calculations for lcoe

  vcloitre

  committed
  a4272cf

  Copy full SHA for a4272cf

• simpler calculations for lcoe

  vcloitre

  committed
  610bce4

  Copy full SHA for 610bce4

Commits on Aug 19, 2015

• minor modifications

  vcloitre

  committed
  2a0b826

  Copy full SHA for 2a0b826

Commits on Aug 20, 2015

• some file name changes

  vcloitre

  committed
  82ce939

  Copy full SHA for 82ce939

• changes in files organisation

  vcloitre

  committed
  d81536b

  Copy full SHA for d81536b

• minor fix

  vcloitre

  committed
  b2ecb7c

  Copy full SHA for b2ecb7c

• minor fix

  vcloitre

  committed
  e05ff39

  Copy full SHA for e05ff39

• minor fix

  vcloitre

  committed
  4f28917

  Copy full SHA for 4f28917

Commits on Sep 3, 2015

• some documentation

  vcloitre

  committed
  7fd45bf

  Copy full SHA for 7fd45bf

Commits on Sep 6, 2015

• tests updates

  vcloitre

  committed
  fef913a

  Copy full SHA for fef913a

• tests updates

  vcloitre

  committed
  e0d2916

  Copy full SHA for e0d2916

• tests updates

  vcloitre

  committed
  88fefc1

  Copy full SHA for 88fefc1

Commits on Apr 20, 2020

• merging

  bam241

  committed
  aeecb94

  Copy full SHA for aeecb94

Commits on Apr 23, 2020

• add back test-input

  bam241

  committed
  134fff5

  Copy full SHA for 134fff5

• adding matplotlib in CI

  bam241

  committed
  a26aa5d

  Copy full SHA for a26aa5d

• adding matplotlib in CI

  bam241

  committed
  4b20628

  Copy full SHA for 4b20628

• change eco_inputs for eco_tools

  bam241

  committed
  470171e

  Copy full SHA for 470171e

• cleaning

  bam241

  committed
  dea0aba

  Copy full SHA for dea0aba

• not need of matplotlib

  bam241

  committed
  574d133

  Copy full SHA for 574d133

• any better?

  bam241

  committed
  25a65fb

  Copy full SHA for 25a65fb

• fix schema

  bam241

  committed
  4d141b6

  Copy full SHA for 4d141b6

• fix schema (bis)

  bam241

  committed
  9f818d9

  Copy full SHA for 9f818d9

• fix syntax

  bam241

  committed
  ad2f328

  Copy full SHA for ad2f328

• removing import cyclus

  bam241

  committed
  1630940

  Copy full SHA for 1630940

• fix schema

  bam241

  committed
  33d4336

  Copy full SHA for 33d4336

• fix schema

  bam241

  committed
  df7f3c5

  Copy full SHA for df7f3c5

• fix schema

  bam241

  committed
  5a78b95

  Copy full SHA for 5a78b95

• fix schema

  bam241

  committed
  f3e8303

  Copy full SHA for f3e8303

• add missing column header

  bam241

  committed
  c4678a6

  Copy full SHA for c4678a6

• fixing syntax

  bam241

  committed
  ca8d1a5

  Copy full SHA for ca8d1a5

• fixing syntax

  bam241

  committed
  180b102

  Copy full SHA for 180b102

Commits on Apr 24, 2020

• syntax fix

  bam241

  committed
  882851c

  Copy full SHA for 882851c

• syntax fix

  bam241

  committed
  22952c0

  Copy full SHA for 22952c0

• extend table

  bam241

  committed
  8a919b6

  Copy full SHA for 8a919b6

• replacing None per 0

  bam241

  committed
  aa8c375

  Copy full SHA for aa8c375

• syntax

  bam241

  committed
  2289361

  Copy full SHA for 2289361

• fixing table

  bam241

  committed
  4715f26

  Copy full SHA for 4715f26

Commits on Apr 28, 2020

• working simplified version of capital_cost

  bam241

  committed
  3792db8

  Copy full SHA for 3792db8

• fuel_cost

  bam241

  committed
  24ea521

  Copy full SHA for 24ea521

Commits on Apr 29, 2020

• working decomissionning cost

  bam241

  committed
  20ba917

  Copy full SHA for 20ba917

Commits on May 1, 2020

• formating

  bam241

  committed
  3f36ca8

  Copy full SHA for 3f36ca8

• operation maintenance

  bam241

  committed
  e6386e8

  Copy full SHA for e6386e8

Commits on May 4, 2020

• syntax fixes

  bam241

  committed
  73b1b50

  Copy full SHA for 73b1b50

• clean and fixed (again) CapitalCost

  bam241

  committed
  a6d7a5e

  Copy full SHA for a6d7a5e

Commits on May 21, 2020

• starting xml parsing

  bam241

  committed
  64909dc

  Copy full SHA for 64909dc

• swtiching to yml parsing

  bam241

  committed
  6a32026

  Copy full SHA for 6a32026

• adding a sample of the yaml file

  bam241

  committed
  bcfb2b7

  Copy full SHA for bcfb2b7

Commits on May 22, 2020

• yaml reader working

  bam241

  committed
  0c6fe19

  Copy full SHA for 0c6fe19

Commits on May 26, 2020

• capital_cost uses the new eco datas

  bam241

  committed
  347a2e1

  Copy full SHA for 347a2e1

• inbetween

  bam241

  committed
  ffde2af

  Copy full SHA for ffde2af

• temp commit

  bam241

  committed
  100404c

  Copy full SHA for 100404c

• temp commit

  bam241

  committed
  9af8620

  Copy full SHA for 9af8620

• almost building a df with facility properties

  bam241

  committed
  4164ef3

  Copy full SHA for 4164ef3

Commits on May 27, 2020

• formating

  bam241

  committed
  0d9dfaa

  Copy full SHA for 0d9dfaa

• add vsvode to gitignore

  bam241

  committed
  1444672

  Copy full SHA for 1444672

• some addition formating

  bam241

  committed
  3c2a8b3

  Copy full SHA for 3c2a8b3

• Capital cost working with the new layout

  bam241

  committed
  bf30820

  Copy full SHA for bf30820

Commits on May 29, 2020

• some formating and function fixing

  bam241

  committed
  3b34132

  Copy full SHA for 3b34132

• fix line length

  bam241

  committed
  00da475

  Copy full SHA for 00da475

Commits on Jun 1, 2020

• fuel cost test working

  bam241

  committed
  80fced2

  Copy full SHA for 80fced2

• decommision working

  bam241

  committed
  aec936a

  Copy full SHA for aec936a

Commits on Jun 2, 2020

• fixing operation maintenance

  bam241

  committed
  2cadcca

  Copy full SHA for 2cadcca

• fixing yml parsing

  bam241

  committed
  fd020a4

  Copy full SHA for fd020a4

Commits on Jun 3, 2020

• some improvement in annual costs calculation

  bam241

  committed
  7a83ab3

  Copy full SHA for 7a83ab3

• working annual cost test

  bam241

  committed
  0812b94

  Copy full SHA for 0812b94

Commits on Jun 8, 2020

• various annual cost working and tested

  bam241

  committed
  467bbda

  Copy full SHA for 467bbda

Commits on Jun 9, 2020

• Merge remote-tracking branch 'upstream/master' into eco

  bam241

  committed
  c798d50

  Copy full SHA for c798d50

• adding actualized costs

  bam241

  committed
  13cb5e2

  Copy full SHA for 13cb5e2

Commits on Jun 10, 2020

• average cost

  bam241

  committed
  c953e44

  Copy full SHA for c953e44

Commits on Jun 12, 2020

• some progress

  bam241

  committed
  c09af94

  Copy full SHA for c09af94

• lcoe working

  bam241

  committed
  446516a

  Copy full SHA for 446516a

• some cleaning

  bam241

  committed
  9ba52c0

  Copy full SHA for 9ba52c0

• this is working

  bam241

  committed
  87fdb9d

  Copy full SHA for 87fdb9d

• remove unsused vars

  bam241

  committed
  677a1d6

  Copy full SHA for 677a1d6

• pyyaml is required for eco

  bam241

  committed
  c8c0625

  Copy full SHA for c8c0625

• reset metric.py formating

  bam241

  committed
  6c0c1cc

  Copy full SHA for 6c0c1cc

• cleaning and adding pyyaml for nosetest

  bam241

  committed
  e438886

  Copy full SHA for e438886

• installing pyyaml after cache checkout

  bam241

  committed
  e2a3208

  Copy full SHA for e2a3208