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

Eco #166

Open
wants to merge 135 commits into
base: main
Choose a base branch
from
Open

Eco #166

wants to merge 135 commits into from

Conversation

bam241
Copy link
Member

@bam241 bam241 commented Apr 23, 2020

Attempt to put this work from @vcloitre up to date.

@vcloitre
testing git commands with few modifications on metrics.py
d2b68d9
@vcloitre
testing git commands
781c9aa
@vcloitre
testing git comands #3
792dabe
@vcloitre
testing git commands #4
73302a3
@vcloitre
removed changes
d7ac5ab
@vcloitre
fco metrics
c7ab21f
@vcloitre
update
9851571
@vcloitre
fix for raw_to_series
c3e5e35
@vcloitre
fix for raw_to_series
ca21ca9
@vcloitre
fix for raw_to_series
376ede0
@vcloitre
fix for raw_to_series
cf9edcf
@vcloitre
Merge branch 'develop' of github.com:cyclus/cymetric into develop
a2bc133 
update
@vcloitre
Merge branch 'develop' of github.com:vcloitre/cymetric into develop
1a0b2f1 
update
@vcloitre
diff with develop branch
dae3224
@vcloitre
add test file for cymetric/tools.py
09025d0
@vcloitre
add dbtest
78269b0
@vcloitre
add dbtest
6b1f8d8
@vcloitre
add dbtest
56c2c4f
@vcloitre
add dbtest
bfc526b
@vcloitre
eco update
1ca6955
@vcloitre
hashable dict
8aeeac1
@vcloitre
hashable dict
a72f524
@vcloitre
hashable dict
0e04a20
@vcloitre
add prototype level to give facility costs
e12cd34
@vcloitre
add prototype level to give facility costs
c8c4131
@vcloitre
small fix
7b2b8c6
@vcloitre
small fix
3755dfd
@vcloitre
add prototype level
bf1836f
@vcloitre
small fix
e4181e4
@vcloitre
small fix
d6fde86
bam241 added 24 commits May 26, 2020 14:11
@bam241
Copy link
Member Author

bam241 commented Jun 12, 2020

@gonuke this should be ready for a first review.
in case you would like to look at this from what @vcloitre originally implemented I have a diff PR on my fork see

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bam241 @vcloitre