Philipp Glaum
c8b67776fa
Merge branch 'master' into exclude_carrier_clustering
2022-09-19 16:34:21 +02:00
Philipp Glaum
d51ca8695b
update Fabians comments
2022-09-19 11:46:58 +02:00
pre-commit-ci[bot]
5d1ef8a640
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian
1536cc2787
codespell: fix typos
...
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
2022-09-16 14:36:43 +02:00
Philipp Glaum
24e008a98e
add feature: aggregate carrier exclusion
2022-09-16 14:25:15 +02:00
Fabian Neumann
d2b8e3c3d2
Merge pull request #389 from PyPSA/meta
...
store config and wildcards in n.meta
2022-07-27 10:01:51 +02:00
Fabian Neumann
a1507124f6
Merge branch 'release-v0.5' into meta
2022-07-27 09:43:36 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering
2022-07-27 09:04:39 +02:00
Fabian Neumann
cdd063d3b0
scripts: remove deprecated clustering methods, remove unused imports
2022-07-27 09:02:34 +02:00
Fabian Neumann
8fc0c57ed6
update copyright years
2022-07-26 15:05:59 +02:00
Fabian Neumann
31bc87adba
Merge branch 'master' into meta
2022-07-26 14:02:26 +02:00
Martha Frysztacki
b63385444c
Merge branch 'master' into introduce_modularity_clustering
2022-07-19 09:51:06 +02:00
Fabian Neumann
a860643dd8
reduce number of columns for simplified and clustered regions
2022-07-18 17:28:09 +02:00
martacki
387271b03b
new spatial clustering method: modularity
2022-07-13 14:51:48 +02:00
Fabian Neumann
217780263d
store config and wildcards in n.meta
2022-06-30 08:39:03 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security
2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative
2022-06-28 07:47:13 +02:00
martacki
29fe0fb7fb
hierarchical clustering: account for changes from merging master
2022-06-27 21:02:45 +02:00
Martha Frysztacki
50a518a155
Merge branch 'master' into introduce_hac_clustering
2022-06-27 20:45:40 +02:00
martacki
a3af137b74
clustering strats to configurables: move duplicate code to _helpers script & import
2022-06-27 14:18:47 +02:00
martacki
c9c738e96b
clustering strats to configurables: set defaults for yaml-incompatible strats + include in stubaggregation
2022-06-24 20:57:53 +02:00
Fabian Neumann
4c5ec8e5f1
Merge branch 'master' into introduce_hac_clustering
2022-06-24 20:22:47 +02:00
Fabian
c42d2bd97d
refactor save to geojson file functionality to allow import/export of empty geodfs
2022-06-24 15:11:21 +02:00
Fabian Hofmann
d6930b878a
Update scripts/cluster_network.py
...
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-23 16:14:20 +02:00
martacki
bdd0cc3aa1
clustering strats to configurables: review suggestions
2022-06-21 18:42:49 +02:00
Fabian Hofmann
6fb3520fc1
Merge branch 'master' into eu-energy-security
2022-06-21 14:12:43 +02:00
martacki
bef4967e84
clustering strategies moved to configurables
2022-06-20 18:58:23 +02:00
Fabian
c2413aeef4
cluster-network: add strategies for conventionals
2022-06-20 18:20:28 +02:00
Fabian
13992125bd
cluster_network: adjust generator strategy for new columns
2022-06-10 11:23:26 +02:00
martacki
7f29c31abe
.copy() shortcut
2022-03-24 13:17:01 +01:00
Martha Frysztacki
69c0341145
Merge branch 'master' into introduce_hac_clustering
2022-03-17 17:40:46 +01:00
martacki
4c1c5e3a4e
suggestions by coroa and fneum
2022-03-17 17:38:30 +01:00
Fabian
1f788e0d5b
cluster_network: replace np.sum/np.min by pandas.Series.sum/min
2022-03-16 16:16:15 +01:00
Martha Frysztacki
3e07fdfd54
Merge branch 'master' into introduce_hac_clustering
2022-03-07 11:44:29 +01:00
Fabian
752ff28538
cluster_network.py: allow cluster wildcard to be 'all'
2022-03-02 14:43:04 +01:00
Fabian Neumann
8dafb7bc83
fix custom clustering by checking explicitly for series ( #318 )
2022-02-27 08:07:11 +01:00
Koen van Greevenbroek
f7ee47238a
Fix random state for kmean clustering
...
When the kmeans algorithm is used to cluster networks, this is not
deterministic by default. The result is that repeated runs of the
`simplify_network` and `cluster_network` rules can and usually do
produce different results that vary somewhat randomly. This makes
results less reproducible when given only a pypsa-eur configuration
file.
The fix is to supply a fixed random state to the k-means algorithm.
2022-02-10 15:57:16 +01:00
martacki
82a0338e9f
treatment of outliers and small feature-bugfix
2022-02-04 20:27:18 +01:00
martacki
b5dbf4eb32
overwrite country of isolated buses
2022-02-04 17:19:23 +01:00
martacki
256ac48b47
resolve merging master bugs
2022-02-04 16:45:00 +01:00
Martha Frysztacki
25b3245923
Merge branch 'master' into introduce_hac_clustering
2022-02-04 14:35:14 +01:00
martacki
6cdf3a2879
use snakemake keywords directly without extracting them beforehand
2022-01-24 19:48:26 +01:00
martacki
f28a088ea3
arguments in function calls instead of kwarg-style
2022-01-14 11:30:15 +01:00
Martha Frysztacki
7067d924cc
Merge branch 'master' into snakemake_dependencies_in_functions
2022-01-14 11:05:54 +01:00
martacki
deac9f32e7
move snakemake keys (input, output, config, ...) to own variables
2022-01-14 11:05:15 +01:00
Fabian Neumann
72e277a007
update environment and address deprecations ( #291 )
...
* update environment and address deprecations
* check pandas<1.3
* limit snakemake due to ascii encoding error, address review comments
* remove version restriction on snakemake
2022-01-14 07:43:21 +00:00
Fabian Hofmann
94364cbeeb
Update scripts/cluster_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-01-11 10:31:49 +01:00
martacki
6c4ea69e95
clustering: own config for clustering settings
2021-12-10 17:53:40 +01:00
Max Parzen
f1243c3e0c
Fix distribute clustering with cbc/glpk/ipopt
...
Assume you have 10 nodes that need to be distributed between 2 countries.
What can happen with some of the open source solvers is that one country
gets assigned to 9.01 (float) nodes, and the other one to 0.99.
Now using .astype(int) would lead to a node distribution of 0 and 9, as
the `astype(int)` function round down by default (0.99 -> 0). This assigned
zero value breaks the code in case open source solvers are used.
Gurobi somehow does deal with it.
2021-11-24 14:16:24 +01:00
martacki
299e71e2b3
introduce hierarchical agglomeratice clustering (hac)
2021-11-17 13:46:33 +01:00
