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

Update ferc-ferc plant matching with ccai implementation. #3007

Merged
merged 89 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
6c8a86d
Update ferc-ferc plant matching with ccai implementation.
zschira Nov 2, 2023
a57810a
Update docstring
zschira Nov 2, 2023
688b577
Make distance estimator param name more descriptive
zschira Nov 2, 2023
1878348
Take only report_years to calculate ferc-ferc distance penalty
zschira Nov 9, 2023
e7686c3
Adjust PCA to use less memory
zschira Nov 9, 2023
e526516
Increase ferc-ferc dist threshold
zschira Nov 17, 2023
4b5bea4
Generalize CrossYearLinker interface.
zschira Nov 18, 2023
4ccdcc6
Merge branch 'dev' into entity_matching
zschira Nov 18, 2023
586b973
Update conda-lock.yml and rendered conda environment files.
zschira Nov 18, 2023
f5e4f14
Allow configurable column cleaning in generic inter-year linker
zschira Nov 18, 2023
3026681
Remove old classify_plants_ferc1 module
zschira Nov 18, 2023
be7f28d
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Nov 18, 2023
211ff32
Improve docstring in cross-year-linker
zschira Nov 20, 2023
a77c7d7
Add company name cleaner to ferc-ferc matching
zschira Nov 21, 2023
778d059
Add revert_filled_in_nulls back to ferc-ferc match
zschira Nov 21, 2023
44f2fd0
fix yaml/yml typo in .gitattributes
zaneselvans Nov 21, 2023
b76f2d2
Merge branch 'dev' into entity_matching
zaneselvans Nov 21, 2023
54cb3ca
Update conda-lock.yml and rendered conda environment files.
zaneselvans Nov 21, 2023
ead2c8e
Add __init__ to record_linkage module.
zschira Nov 21, 2023
fdfe1c2
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Nov 21, 2023
4190361
Add integration to perform ferc-ferc matching on synthetic data.
zschira Nov 22, 2023
ecd84ca
Merge dev
zschira Nov 22, 2023
0921557
Fix classify_plants_ferc1 integration test
zschira Nov 22, 2023
305411e
Add comments to ferc-ferc matching test
zschira Nov 22, 2023
8694279
Fix docstring spacing
zschira Nov 22, 2023
43c51e1
Fix import path
zschira Nov 22, 2023
e6df48e
Don't modify utility names during ferc-ferc matching.
zschira Nov 25, 2023
ffcdc1e
Merge branch 'dev' into entity_matching
zschira Nov 27, 2023
fd58293
Make attribute comments compatible with pydantic class
zschira Nov 27, 2023
361162c
Update conda-lock.yml and rendered conda environment files.
zschira Nov 27, 2023
7026784
Merge branch 'dev' into ferc-eia-ccai
zschira Nov 30, 2023
1e6e8e8
Refactor new record linkage interface.
zschira Nov 30, 2023
ab95188
Minor change to ferc-ferc integration test
zschira Nov 30, 2023
8aba02b
Update conda-lock.yml and rendered conda environment files.
zschira Nov 30, 2023
50d1f98
Add more memory efficient PCA option for record linkage models
zschira Dec 1, 2023
6190584
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Dec 1, 2023
7abd6bd
Merge branch 'dev' into entity_matching
zaneselvans Dec 1, 2023
25a533d
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zaneselvans Dec 1, 2023
5e109f6
Add more test records to ferc-ferc matching simulation.
zschira Dec 1, 2023
152e776
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zaneselvans Dec 1, 2023
ea643bd
Fix bad docstring formatting that was breaking docs build
zaneselvans Dec 1, 2023
99ec8ee
Merge branch 'dev' into entity_matching
zaneselvans Dec 1, 2023
7e7affc
Merge branch 'dev' into entity_matching
zaneselvans Dec 1, 2023
5757f44
Add missing combined cycle plant type strings.
zaneselvans Dec 1, 2023
7b356e8
Add more test records to ferc-ferc matching simulation.
zschira Dec 4, 2023
6f2b787
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Dec 5, 2023
c2ea24a
Merge branch 'dev' into entity_matching
zschira Dec 5, 2023
3ec367d
Update conda-lock.yml and rendered conda environment files.
zschira Dec 5, 2023
8647517
Merge branch 'dev' into entity_matching
zaneselvans Dec 6, 2023
61a3c01
Integrate ferc-ferc model with dagster ops
zschira Dec 7, 2023
772c582
Update record linkage integration test.
zschira Dec 7, 2023
50d6126
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Dec 7, 2023
dbe48d2
Fix column name in validate steam ids
zschira Dec 7, 2023
43e7f5f
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zaneselvans Dec 7, 2023
9c6616f
Merge branch 'dev' into entity_matching
zaneselvans Dec 7, 2023
71347c9
Merge branch 'dev' into entity_matching
zaneselvans Dec 8, 2023
dfa163c
Update conda-lock.yml and rendered conda environment files.
zaneselvans Dec 8, 2023
cced81d
Remove redundant logs
zschira Dec 8, 2023
4b11198
Remove files from wrong branch
zschira Dec 8, 2023
c2869c3
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Dec 8, 2023
49cf1a8
Add factory function for creating dataframe embedder
zschira Dec 10, 2023
6bd9a55
Improve comments in cross year record linkage model
zschira Dec 11, 2023
eafb9cb
Remove plant_id_ferc1 form plants_steam_ferc1
zschira Dec 11, 2023
82592b6
Make ferc plant assignment a stand alone intermediate asset
zschira Dec 12, 2023
4ad4813
Improve name in record linkage dataframe embedding
zschira Dec 12, 2023
f435204
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 12, 2023
98e86d9
Merge branch 'dev' into entity_matching
zschira Dec 12, 2023
e1bbea5
Update conda-lock.yml and rendered conda environment files.
zschira Dec 12, 2023
67151b8
Fix name to not clobber import
zschira Dec 12, 2023
b8cf219
Merge branch 'entity_matching' of github.com:catalyst-cooperative/pud…
zschira Dec 12, 2023
96aaa36
Use numba to speed up ferc-ferc model
zschira Dec 13, 2023
52b9adb
Merge branch 'dev' into entity_matching
katie-lamb Dec 19, 2023
7edc408
create new migration
katie-lamb Dec 20, 2023
dc9f0bd
Improve fuel fraction test generation
zschira Dec 20, 2023
0faf725
Merge branch 'entity_matching' of https://github.com/catalyst-coopera…
zschira Dec 20, 2023
ec34f1e
Fix typo
zschira Dec 20, 2023
95bb1ca
Refine ferc-ferc model parameters
zschira Dec 20, 2023
b844f80
Add improved docstring
zschira Dec 20, 2023
7c1d6c3
Remove inaccurate docstring
zschira Dec 20, 2023
c6a9496
Add dedicated module for fuel by plant
zschira Dec 20, 2023
9e64c30
Add options to all dataframe embedding steps
zschira Dec 20, 2023
12472bc
Change dict access to get()
zschira Dec 20, 2023
90bdc59
Simplify ferc plant id verification
zschira Dec 20, 2023
171504f
Merge branch 'dev' into entity_matching
zaneselvans Dec 22, 2023
665a805
Add missing module imports.
zaneselvans Dec 22, 2023
39d05ec
Merge branch 'dev' into entity_matching
zaneselvans Dec 24, 2023
1cae6bb
Merge branch 'dev' into entity_matching
zaneselvans Dec 25, 2023
09b7c7b
Merge branch 'dev' into entity_matching
zaneselvans Dec 25, 2023
962fc3d
Rename record linkage test module so pytest actually runs it.
zaneselvans Dec 26, 2023
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
20 changes: 10 additions & 10 deletions environments/conda-linux-64.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading