Skip to content

Eta rho pairs#65

Merged
JMGilbert merged 12 commits intodscim-v0.4.0from
eta_rho_pairs
Feb 6, 2023
Merged

Eta rho pairs#65
JMGilbert merged 12 commits intodscim-v0.4.0from
eta_rho_pairs

Conversation

@JMGilbert
Copy link
Copy Markdown
Contributor

@JMGilbert JMGilbert commented Jan 18, 2023

These are the local changes I made to run the latest specifications of dscim for integration. These need to accompany one minor change to dscim-cil: change the datatype of eta_rhos in run_result.py to a list of lists of the form eta_rhos = [[eta1,rho1],[eta2,rho2],...]. They were previously of the form eta_rhos = {eta1: rho1, eta2: rho2, ...}.

@JMGilbert JMGilbert marked this pull request as ready for review January 18, 2023 20:27
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (dscim-v0.4.0@57ee5eb). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff               @@
##             dscim-v0.4.0      #65   +/-   ##
===============================================
  Coverage                ?   43.03%           
===============================================
  Files                   ?       18           
  Lines                   ?     1731           
  Branches                ?        0           
===============================================
  Hits                    ?      745           
  Misses                  ?      986           
  Partials                ?        0           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

else:
w_utility = parameter ** (1 - self.eta) / (1 - self.eta)
bottom_utility = parameter ** (-self.eta) * (parameter - cc_consumption)
bottom_coded_cons = power(
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want these to be np.power instead?

@kemccusker
Copy link
Copy Markdown
Member

@JMGilbert this looks reasonable - please check the suggestion to update to np.power but otherwise I think it's ready, if tests are passing. I didn't check all the math line-by-line though. Would be good to get @davidrzhdu's review as well.

@kemccusker
Copy link
Copy Markdown
Member

These are the local changes I made to run the latest specifications of dscim for integration. These need to accompany one minor change to dscim-cil: change the datatype of eta_rhos in run_result.py to a list of lists of the form eta_rhos = [[eta1,rho1],[eta2,rho2],...].

@JMGilbert can you add to the PR description from what datatype/structure you changed eta_rhos?

@JMGilbert JMGilbert merged commit 9c336c7 into dscim-v0.4.0 Feb 6, 2023
@JMGilbert JMGilbert deleted the eta_rho_pairs branch February 6, 2023 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants