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.

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

Feature/profast fin model #355

Merged
merged 62 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
084d961
Merge branch 'develop' into dev/refactor
jaredthomas68 May 24, 2024
13e3b00
add lcoe calculations to the custom financial model using profast
jaredthomas68 Aug 23, 2024
f729937
fix logging error
jaredthomas68 Aug 24, 2024
c94c1b6
Merge remote-tracking branch 'origin/dev/refactor' into dev/refactor
jaredthomas68 Aug 29, 2024
8db9a9e
merge dev/refactor into feature/profast-fin-model
jaredthomas68 Oct 2, 2024
9accf5e
Merge remote-tracking branch 'origin/dev/refactor' into dev/refactor
jaredthomas68 Oct 2, 2024
5852b2d
address merge conflicts
jaredthomas68 Oct 2, 2024
ac73efb
fix bug where the presence of skip_financial caused the skip, rather …
jaredthomas68 Oct 3, 2024
f03bfc1
adjust battery financials to use discharged energy instead of annual …
jaredthomas68 Oct 9, 2024
f23eb54
adjust lcoe calculations so battery is based on discharge and all oth…
jaredthomas68 Oct 18, 2024
bac3a56
complete merge
jaredthomas68 Oct 21, 2024
4452fa4
update for using name= in calls to custom fin model
jaredthomas68 Oct 21, 2024
e6f1397
Merge branch 'feature/generalize-dispatch' into feature/profast-fin-m…
jaredthomas68 Oct 22, 2024
d5a318d
complete merge
jaredthomas68 Oct 22, 2024
a5ff63c
simplify battery heuristic gen sum
jaredthomas68 Oct 22, 2024
045d61b
Merge branch 'feature/generalize-dispatch' into feature/profast-fin-m…
jaredthomas68 Oct 22, 2024
3d6839c
Merge branch 'feature/generalize-dispatch' into feature/profast-fin-m…
jaredthomas68 Oct 22, 2024
8f81f7f
Merge branch 'feature/generalize-dispatch' into feature/profast-fin-m…
jaredthomas68 Oct 22, 2024
dc6901f
add interface to profast via the custom financial model financial par…
jaredthomas68 Oct 24, 2024
fe76e0d
Merge branch 'develop' into feature/profast-fin-model
jaredthomas68 Oct 24, 2024
0e634f8
add ProFAST to ci.yaml
jaredthomas68 Oct 24, 2024
100f3b4
make all tests using the custom financial model use the DEFAULT_FIN_C…
jaredthomas68 Oct 25, 2024
29253ab
fix typos
jaredthomas68 Oct 25, 2024
3b6c7e0
add profast to docs
jaredthomas68 Oct 25, 2024
4582a87
add profast to docs build
jaredthomas68 Oct 25, 2024
8168caf
try to fix doc build
jaredthomas68 Oct 25, 2024
fd952bd
remove profast from .readthedocs and add it to dependencies
jaredthomas68 Oct 25, 2024
68b5aef
remove profast installation instructions and just have it in .toml
jaredthomas68 Oct 25, 2024
703d026
attempt update docs build to include profast
RHammond2 Oct 25, 2024
13304be
remove quotes from text file
RHammond2 Oct 25, 2024
19a7dee
re-add profast to installation ci and readme
jaredthomas68 Oct 25, 2024
bd86277
resolve conflict
jaredthomas68 Oct 25, 2024
7fae20c
fix financial model instantiation logic for wind
jaredthomas68 Oct 26, 2024
2e897bd
fix typos in tests
jaredthomas68 Oct 26, 2024
ffded62
Merge branch 'develop' into feature/profast-fin-model
jaredthomas68 Oct 28, 2024
ef52b87
Debugging ppa CI
johnjasa Oct 28, 2024
53faa47
Loosened hybrid wave test tol
johnjasa Oct 28, 2024
7f25479
Loosened hybrid wave test tol
johnjasa Oct 29, 2024
3261b1b
insert financial model dict instead of object in config
jaredthomas68 Oct 29, 2024
9317ffa
make local copy of fin config before removing revenue section in test…
jaredthomas68 Oct 29, 2024
ec52561
Merge remote-tracking branch 'myfork/feature/profast-fin-model' into …
jaredthomas68 Oct 29, 2024
2a35c1d
reset default ppa_price_input to None
jaredthomas68 Oct 29, 2024
8704afc
add artifact generation and upgrade actions versions
RHammond2 Oct 29, 2024
be79637
fix artifact naming conflict
RHammond2 Oct 29, 2024
a380f71
use python version for naming
RHammond2 Oct 29, 2024
68b3000
switch to conda build and export
RHammond2 Oct 29, 2024
2909b51
correct file output and remove pytest python flag
RHammond2 Oct 29, 2024
25a3d70
remove unsaved deleted line
RHammond2 Oct 29, 2024
3be662d
enable anaconda/bash in CI
RHammond2 Oct 29, 2024
b76a848
Merge branch 'develop' into feature/profast-fin-model
johnjasa Oct 30, 2024
271d283
Merge remote-tracking branch 'origin/develop' into feature/profast-fi…
jaredthomas68 Oct 31, 2024
57941b6
switch to profast from pypi
jaredthomas68 Oct 31, 2024
3ec04cc
Merge remote-tracking branch 'myfork/feature/profast-fin-model' into …
jaredthomas68 Oct 31, 2024
b689cf2
remove requirements.txt installation for docs
jaredthomas68 Oct 31, 2024
616ebda
remove comment after verification from benjaminkee
jaredthomas68 Oct 31, 2024
b33a512
remove unused imports
jaredthomas68 Oct 31, 2024
8fecc3b
update allowed financial model type to include str and FinancialModel…
jaredthomas68 Oct 31, 2024
9b2aca9
update financial model type dec for battery
jaredthomas68 Oct 31, 2024
d26d7a4
fix duplicate import
jaredthomas68 Oct 31, 2024
577e061
update FinancialParameters doc string
jaredthomas68 Nov 5, 2024
78c4fd6
update revenue doc strings
jaredthomas68 Nov 5, 2024
3166970
remove commented code
jaredthomas68 Nov 7, 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
164 changes: 82 additions & 82 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
---
name: Bug report
about: Report a bug to help us improve
title: 'Bug report'
labels: "Type: Bug"
---

<!--
IMPORTANT NOTES

Thank you for taking the time to report a bug. If you aren't certain whether an issue
is a bug, please first open a Discussion. Before submitting, please reread your
description to ensure that other readers can reasonably understand the issue
you're facing and the impact on your workflow or results.

This form is written in GitHub's Markdown format. For a reference on this type
of syntax, see GitHub's documentation:
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

This template contains guidance for your submission within the < ! - -, - - > blocks.
These are comments in HTML syntax and will not appear in the submission.
Be sure to use the "Preview" feature on GitHub to ensure your submission is formatted as intended.

When including code snippets, please paste the text itself and wrap the code block with
ticks (see the other character on the tilde ~ key in a US keyboard) to format it as code.
For example, Python code should be wrapped in ticks like this:
```python
def a_func():
return 1

a = 1
b = a_func()
print(a + b)
```
This is preferred over screen shots since it is searchable and others can copy/paste
the text to run it.
-->

# Add meaningful title here
<!--
A clear and concise description of the bug including what happened
and what you expected to happen.
-->

## How to reproduce
<!--
Describe how another person with no context can recreate this issue.
It is typically very helpful to reduce the problem as much as possible
and share a minimum working example. See the note above on including
code as text rather than screenshots.
-->

## Relevant output
<!--
Include any output, plots, or other means of communication here to add context to the problem.
-->

## HOPP version
<!--
Share your HOPP version and how you installed it. You can print the HOPP version from
a Python REPL or script with these commands:
```python
import hopp
print(hopp.__version__)
```
-->

## System Information
<!-- Add your information here. -->
- OS: <e.g. Ubuntu 20.04 or macOS 10.12>
- Python version: <Result of `python --version`>
- Library versions
- Results of `pip freeze`, for example
- FLORIS
- matplotlib
- NREL-PySAM
- numpy
- numexpr
- orbit-nrel
- pandas
- scipy
- shapely
---
name: Bug report
about: Report a bug to help us improve
title: 'Bug report'
labels: "Type: Bug"
---
<!--
IMPORTANT NOTES
Thank you for taking the time to report a bug. If you aren't certain whether an issue
is a bug, please first open a Discussion. Before submitting, please reread your
description to ensure that other readers can reasonably understand the issue
you're facing and the impact on your workflow or results.
This form is written in GitHub's Markdown format. For a reference on this type
of syntax, see GitHub's documentation:
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
This template contains guidance for your submission within the < ! - -, - - > blocks.
These are comments in HTML syntax and will not appear in the submission.
Be sure to use the "Preview" feature on GitHub to ensure your submission is formatted as intended.
When including code snippets, please paste the text itself and wrap the code block with
ticks (see the other character on the tilde ~ key in a US keyboard) to format it as code.
For example, Python code should be wrapped in ticks like this:
```python
def a_func():
return 1
a = 1
b = a_func()
print(a + b)
```
This is preferred over screen shots since it is searchable and others can copy/paste
the text to run it.
-->
# Add meaningful title here
<!--
A clear and concise description of the bug including what happened
and what you expected to happen.
-->
## How to reproduce
<!--
Describe how another person with no context can recreate this issue.
It is typically very helpful to reduce the problem as much as possible
and share a minimum working example. See the note above on including
code as text rather than screenshots.
-->
## Relevant output
<!--
Include any output, plots, or other means of communication here to add context to the problem.
-->
## HOPP version
<!--
Share your HOPP version and how you installed it. You can print the HOPP version from
a Python REPL or script with these commands:
```python
import hopp
print(hopp.__version__)
```
-->
## System Information
<!-- Add your information here. -->
- OS: <e.g. Ubuntu 20.04 or macOS 10.12>
- Python version: <Result of `python --version`>
- Library versions
- Results of `pip freeze`, for example
- FLORIS
- matplotlib
- NREL-PySAM
- numpy
- numexpr
- orbit-nrel
- pandas
- scipy
- shapely
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Usage question
url: https://github.com/NREL/hopp/discussions
about: Have any questions about using HOPP? Post in Discussions to engage with the NREL team and HOPP community.
blank_issues_enabled: false
contact_links:
- name: Usage question
url: https://github.com/NREL/hopp/discussions
about: Have any questions about using HOPP? Post in Discussions to engage with the NREL team and HOPP community.
114 changes: 57 additions & 57 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
---
name: Feature request
about: Suggest an idea for this project
title: 'Feature request'
labels: 'Type: Enhancement'
---

<!--
IMPORTANT NOTES

Thank you for taking the time to suggest a feature. Before submitting,
please reread your description to ensure that other readers can reasonably
understand the motivation and proposed solution.

This form is written in GitHub's Markdown format. For a reference on this type
of syntax, see GitHub's documentation:
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

This template contains guidance for your submission within the < ! - -, - - > blocks.
These are comments in HTML syntax and will not appear in the submission.
Be sure to use the "Preview" feature on GitHub to ensure your submission is formatted as intended.

When including code snippets, please paste the text itself and wrap the code block with
ticks (see the other character on the tilde ~ key in a US keyboard) to format it as code.
For example, Python code should be wrapped in ticks like this:
```python
def a_func():
return 1

a = 1
b = a_func()
print(a + b)
```
This is preferred over screen shots since it is searchable and others can copy/paste
the text to run it.
-->

# Add meaningful title here
<!--
High level description of the feature request including motivation and background.
-->

## Proposed solution
<!--
Here's an opportunity to prototype a feature. Please include pseudocode, images, or
any other visual aids to communicate the idea.
-->

## Alternatives considered
<!--
Describe workarounds or alternatives even if hacky or incomplete.
-->

## Additional context
<!--
Optional. Provide anything else that helps to communicate the idea here.
-->
---
name: Feature request
about: Suggest an idea for this project
title: 'Feature request'
labels: 'Type: Enhancement'
---
<!--
IMPORTANT NOTES
Thank you for taking the time to suggest a feature. Before submitting,
please reread your description to ensure that other readers can reasonably
understand the motivation and proposed solution.
This form is written in GitHub's Markdown format. For a reference on this type
of syntax, see GitHub's documentation:
https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
This template contains guidance for your submission within the < ! - -, - - > blocks.
These are comments in HTML syntax and will not appear in the submission.
Be sure to use the "Preview" feature on GitHub to ensure your submission is formatted as intended.
When including code snippets, please paste the text itself and wrap the code block with
ticks (see the other character on the tilde ~ key in a US keyboard) to format it as code.
For example, Python code should be wrapped in ticks like this:
```python
def a_func():
return 1
a = 1
b = a_func()
print(a + b)
```
This is preferred over screen shots since it is searchable and others can copy/paste
the text to run it.
-->
# Add meaningful title here
<!--
High level description of the feature request including motivation and background.
-->
## Proposed solution
<!--
Here's an opportunity to prototype a feature. Please include pseudocode, images, or
any other visual aids to communicate the idea.
-->
## Alternatives considered
<!--
Describe workarounds or alternatives even if hacky or incomplete.
-->
## Additional context
<!--
Optional. Provide anything else that helps to communicate the idea here.
-->
Loading
Loading