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

Add regularized costs #244

Merged
merged 20 commits into from
Feb 9, 2023
Merged

Conversation

michalk8
Copy link
Collaborator

@michalk8 michalk8 commented Feb 9, 2023

Add costs.ElasticL1, costs.ElasticSTVS, costs.ElasticSqKOverlap.

@michalk8 michalk8 self-assigned this Feb 9, 2023
@michalk8 michalk8 added the enhancement New feature or request label Feb 9, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 9, 2023

Codecov Report

Merging #244 (64ab7e7) into main (013ee6f) will increase coverage by 0.23%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #244      +/-   ##
==========================================
+ Coverage   86.96%   87.19%   +0.23%     
==========================================
  Files          50       50              
  Lines        5238     5335      +97     
  Branches      797      806       +9     
==========================================
+ Hits         4555     4652      +97     
  Misses        563      563              
  Partials      120      120              
Impacted Files Coverage Δ
src/ott/geometry/costs.py 99.04% <100.00%> (+0.42%) ⬆️

@michalk8 michalk8 merged commit a836f4b into ott-jax:main Feb 9, 2023
@michalk8 michalk8 deleted the feature/regularized-costs branch February 9, 2023 17:02
michalk8 added a commit that referenced this pull request Jun 27, 2024
* Add new cost functions

* Polish docstrings

* Remove `jaxopt` dependency

* Add test

* Polish `ElasticSqKOverlap`

* Fix indexing error

* Remove k-overlap from Legendre test

* Test correlation for `ElasticSqKOverlap`

* Test sparse displacements

* Add sparsity test

* Fix docs

* Simplify `reg` in `ElasticSqKOverlap`

* Rename `ElasticNet` -> `ElasticL1`

* Change `frac_sparse` in test

* Try removing jax pin in CI

* Try pinning jax/flax in GPU tests

* Fix pins in CI

* Fix indentation in docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants