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

Structure #90

Merged
merged 72 commits into from
May 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
3662e69
changed to poetry
rwijtvliet Sep 5, 2023
7a235a1
fixed pint problem (groups in unitdef.txt) and pint-pandas dependency…
rwijtvliet Sep 5, 2023
6d1117d
ci pipeline
rwijtvliet Sep 5, 2023
5bce0c3
ci pipeline
rwijtvliet Sep 5, 2023
44fffbc
Merge branch 'develop' into poetry
rwijtvliet Sep 5, 2023
af97c21
ci with poetry
rwijtvliet Sep 5, 2023
81df6f4
solve dependency problems between pandas and pint-pandas
rwijtvliet Sep 8, 2023
0a941bb
workaround pint-pandas bug
rwijtvliet Sep 8, 2023
67ad1b4
typo
rwijtvliet Sep 15, 2023
01b6666
seaborn pinned version to 0.8
rwijtvliet Nov 3, 2023
41f1ec4
fixed to_excel function, updated version of pint
Nov 10, 2023
8ee0658
fixed arithmatic on pflines without overlap
rwijtvliet Nov 13, 2023
f9b63cc
Merge remote-tracking branch 'refs/remotes/origin/poetry' into poetry
rwijtvliet Nov 13, 2023
150f3c1
small changes
Nov 13, 2023
3b12095
Merge remote-tracking branch 'refs/remotes/origin/poetry' into poetry
Nov 13, 2023
90bf90f
more consistent functions to get random pfline
rwijtvliet Nov 13, 2023
65dd175
deleted comment
Nov 13, 2023
b932758
Merge remote-tracking branch 'refs/remotes/origin/poetry' into poetry
Nov 13, 2023
d120b03
change the python version for push request to 3.11
Nov 15, 2023
657b6bf
test
rwijtvliet Nov 15, 2023
6871b2c
Removed unused dependency
Nov 15, 2023
85ec27c
updated toml
Nov 15, 2023
a7322b6
added exception if no clipboard available
rwijtvliet Nov 15, 2023
49d4e95
Merge remote-tracking branch 'refs/remotes/origin/poetry' into poetry
rwijtvliet Nov 15, 2023
1cac21e
updated toml
Nov 15, 2023
81aa5a4
Merge remote-tracking branch 'refs/remotes/origin/poetry' into poetry
Nov 15, 2023
047807b
fixed pfline_excelclipboad.py
Nov 17, 2023
8b46ec6
changed lock file for pre-commit
Nov 17, 2023
af19246
install poetry libraries in pre-commit step
Nov 17, 2023
7c106c8
use black on all files in pre-commit
Nov 17, 2023
f325b75
updated flake8 version in pre-commit.yaml
Nov 17, 2023
4cb6bc8
exclude .venv folder from flake8
Nov 17, 2023
cbef5e7
changed setup.cfg to ignore flake8 error messages
Nov 17, 2023
5ce6839
initial commit
Nov 21, 2023
545879b
first try at plotting children
rwijtvliet Nov 21, 2023
106e13c
Merge branch 'develop' into plot_children
Nov 21, 2023
420b530
bar plot with children
Dec 1, 2023
9f6e0d1
Merge branch 'develop' into plot_children
Dec 4, 2023
4e68c33
created plot_children(),fixed bug with darken
Dec 12, 2023
6416b13
area plots for children stacked on top of each other. for daily it pl…
Dec 20, 2023
b3c2d49
Merge branch 'develop' into plot_children
Dec 28, 2023
8f958c5
changed the logic of all plot_timeseries_as functions, now based on f…
Jan 2, 2024
96ca68a
created a function to test plotting pfline
Jan 3, 2024
53affbc
created slice attr, wrote tests for it
Jan 11, 2024
c1c9f5b
more flexible intersec function with ignore freq, tz, start_of_day + …
Jan 22, 2024
ffa4dad
small changes to intersect
Jan 23, 2024
5a7d3f2
intersect_flex function is finished, more testing with frames needed
Feb 5, 2024
a99e4fc
finished intersect_flex, more testing with frames needed
Feb 5, 2024
8957d9f
added children bool to plot pfstate
Mar 5, 2024
faab40e
added hash function for colors for children
Mar 8, 2024
1cad372
deleted unnecessary test
Mar 11, 2024
818019a
changed hash function, and width of hline
Mar 20, 2024
a94b6dc
deleted unnecessary test
Mar 22, 2024
35d4d20
Merge branch 'develop' into plot_children
Apr 10, 2024
3a1975a
plot with children
rwijtvliet Apr 17, 2024
285b79e
Merge branch 'develop' into plot_children
Apr 22, 2024
0335779
Merge branch 'develop' into plot_children
Apr 22, 2024
0b274ac
changed plot_pfstate to work with new logic
Apr 22, 2024
22a81fb
tests for plot function
Apr 24, 2024
e5ed4f6
Merge branch 'develop' into structure
Apr 30, 2024
730bf7e
error with refactoring :3
May 10, 2024
3e6cccc
refactoring
rwijtvliet May 12, 2024
e26ed4d
deleted unnecessary files
May 13, 2024
8ac55fd
more powerful peak/offpeak functions
rwijtvliet May 15, 2024
27d541c
removed longer_or_shorter from frequency tools
rwijtvliet May 21, 2024
5a0fb5a
tests for peakfn and peakconvert
rwijtvliet May 22, 2024
04a123b
removed nonexisting import
rwijtvliet May 22, 2024
98b12ef
fixed test
rwijtvliet May 22, 2024
152016e
removed all Union and replaced with |
rwijtvliet May 22, 2024
aa972de
minor things
rwijtvliet May 23, 2024
5f2974b
fixed po-method
rwijtvliet May 24, 2024
c91f12b
fixed typo
rwijtvliet May 24, 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
Prev Previous commit
Next Next commit
Merge branch 'develop' into plot_children
Alina Voilova committed Dec 4, 2023
commit 9f6e0d1fa23823c183b5831e9c74e64c76c1c347

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.