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

Mga #72

Merged
merged 40 commits into from
Jan 21, 2025
Merged

Mga #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ebb2e08
first commit for nmga algorithm
samgdotson Feb 27, 2024
0f5fabf
adds get_objective_names to utils
samgdotson Feb 27, 2024
0b8f602
fixes merge conf
samgdotson Feb 27, 2024
1042d30
moves mga functions to utils
samgdotson Feb 27, 2024
03f59ed
finishes apply slack function and adds tests
samgdotson Feb 27, 2024
f04547d
fixes typos in apply slack tests
samgdotson Feb 27, 2024
c7a3ce4
reintroduces the apply slack function to nmga
samgdotson Feb 27, 2024
e00351d
implements n-dimensional mga
samgdotson Feb 28, 2024
6cc014f
Merge branch 'docs-examples' of github.com:samgdotson/osier into mga
samgdotson Feb 29, 2024
143093e
updates documentation for n_mga
samgdotson Mar 1, 2024
b40b636
adds mga tutorial
samgdotson Mar 2, 2024
525a754
updates mga algorithm
samgdotson Mar 2, 2024
4ed9429
adds return value documentation
samgdotson Mar 4, 2024
681cf89
adds break condition and documentation.
samgdotson Mar 4, 2024
dea81d6
Merge branch 'main' of github.com:samgdotson/osier into mga
samgdotson Mar 7, 2024
670faa6
removes breakpoint and adds a problem to mga example
samgdotson Mar 7, 2024
6ecb20d
adds function to check points
samgdotson Mar 8, 2024
da47eba
completes the n-mga algorithm
samgdotson Mar 12, 2024
7b49c51
bug fixes in n_mga
samgdotson Mar 12, 2024
ea97695
adds tests for check interior and improves docstring
samgdotson Mar 13, 2024
4f7d359
adds warning about false negatives to doc string
samgdotson Apr 4, 2024
2a09dbb
updates mga tutorial
samgdotson Apr 25, 2024
c72437a
merge conf
samgdotson Sep 14, 2024
9c69524
adds scipy to requirements
samgdotson Sep 14, 2024
86ce6c7
merge conf
samgdotson Oct 19, 2024
a385aac
reruns notebooks
samgdotson Dec 5, 2024
195fddb
merge logical_flow
samgdotson Dec 23, 2024
18740c1
updates tests and utils
samgdotson Dec 23, 2024
31b0122
adds integration test file
samgdotson Dec 25, 2024
24fb278
fixes error
samgdotson Dec 25, 2024
56812a6
updates integration test
samgdotson Jan 7, 2025
7f7562c
minor docstring update
Jan 14, 2025
fce5c1e
Merge branch 'logical_flow' into mga
samgdotson Jan 14, 2025
4346219
Merge branch 'logical_flow' into mga
samgdotson Jan 15, 2025
86f9dfd
updates mga tests and example
samgdotson Jan 15, 2025
fc37eb2
Merge branch 'logical_flow' into mga
samgdotson Jan 15, 2025
76c6240
fixes tests
samgdotson Jan 16, 2025
e35fdfb
updates the mga tutorial
samgdotson Jan 16, 2025
88c5f80
pep8 fixes
samgdotson Jan 16, 2025
d5d902c
changes from @LukeSeifert review
samgdotson Jan 17, 2025
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
18 changes: 9 additions & 9 deletions docs/source/examples/capacity_expansion_tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 3,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -139,7 +139,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 4,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -179,7 +179,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 5,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -217,7 +217,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 6,
"metadata": {},
"outputs": [
{
Expand All @@ -226,7 +226,7 @@
"[Battery: 815.3412599999999 MW, WindTurbine: 0.0 MW]"
]
},
"execution_count": 5,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -252,7 +252,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -261,7 +261,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -287,7 +287,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 9,
"metadata": {},
"outputs": [
{
Expand All @@ -307,7 +307,7 @@
" 8 | 160 | 1 | 0.0027592007 | ideal\n",
" 9 | 180 | 1 | 0.0032212526 | ideal\n",
" 10 | 200 | 1 | 0.000000E+00 | f\n",
"The simulation took 4.005 minutes.\n"
"The simulation took 3.759 minutes.\n"
]
}
],
Expand Down
3 changes: 2 additions & 1 deletion docs/source/examples/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
This section has examples that guide users from basic usage to more advanced topics.


## Guides
## Tutorials
```{toctree}
:maxdepth: 3

getting_started
tech_tutorial
dispatch_tutorial
capacity_expansion_tutorial
mga_tutorial
```
362 changes: 362 additions & 0 deletions docs/source/examples/mga_tutorial.ipynb

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/source/reference/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

```


## General Functions
```{eval-rst}
.. autosummary::
Expand Down
Loading
Loading