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

[WIP] Interpolation overhaul #1203

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 92 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
d4858b6
implement MultInterp
alanlujan91 Oct 4, 2022
035a5c5
generalize grids
alanlujan91 Oct 4, 2022
386b689
rename file
alanlujan91 Oct 4, 2022
6a3a395
update interps and notebooks
alanlujan91 Oct 5, 2022
911a826
rename input to values
alanlujan91 Oct 12, 2022
3f02f75
Update irregularinterp.py
alanlujan91 Oct 12, 2022
08eebf7
update notebooks
alanlujan91 Oct 12, 2022
ecc849a
new sklearn interpolators
alanlujan91 Oct 14, 2022
12635f0
implement Polynomial and Spline Interpolators
alanlujan91 Oct 21, 2022
8f9ada9
implement PiecewiseAffine interpolator 2D
alanlujan91 Oct 21, 2022
0c7be05
update notebooks
alanlujan91 Oct 21, 2022
9c650ce
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Oct 21, 2022
a5467f0
reorganize interpolation files
alanlujan91 Oct 21, 2022
ac6a8f2
clean up previous interpolation files
alanlujan91 Oct 26, 2022
6fd7796
implement experimental JaxInterp
alanlujan91 Oct 26, 2022
801ca08
Delete interpolate.py
alanlujan91 Oct 26, 2022
d591fb2
implement regularized interpolators
alanlujan91 Oct 26, 2022
72ef2b5
implement SKImagePiecewiseAffineInterp
alanlujan91 Oct 26, 2022
9108a14
implement WarpedInterpOnInterp2D
alanlujan91 Oct 26, 2022
ad9df63
clean up interpolator files
alanlujan91 Oct 26, 2022
6d86d4d
implement UnstructuredInterp
alanlujan91 Oct 26, 2022
0b4a528
implement Unstructured Regression Interpolators
alanlujan91 Oct 26, 2022
ff89084
update notebooks
alanlujan91 Oct 26, 2022
59d415a
reorganize kwargs
alanlujan91 Nov 2, 2022
36a916e
reorganize interpolation steps
alanlujan91 Nov 2, 2022
d77d567
implement RegularizedMultivariateInterp
alanlujan91 Nov 2, 2022
9948cc8
add normalization to sklearn interpolators
alanlujan91 Nov 2, 2022
c48f3dc
update skimage interpolator
alanlujan91 Nov 2, 2022
f6da82c
update RidgeCV alphas
alanlujan91 Nov 2, 2022
af3ed16
reorganize kwargs in UnstructuredInterp
alanlujan91 Nov 2, 2022
197a0cd
update notebooks
alanlujan91 Nov 2, 2022
ee2520d
remove interp2d kwargs
alanlujan91 Dec 11, 2022
82ce471
implement get and map coordinates
alanlujan91 Dec 11, 2022
74567d7
implement WarpedMultivariateInterp
alanlujan91 Dec 11, 2022
b5c92ee
update examples
alanlujan91 Dec 11, 2022
f18dba4
install my source code
alanlujan91 Dec 12, 2022
cf2b32b
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Jan 9, 2023
cae0791
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Jan 11, 2023
fd4730b
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Jan 26, 2023
0a1f68d
rename interpolation.py to harkinterp.py
alanlujan91 Jan 26, 2023
284f7af
split interpolators into different files
alanlujan91 Jan 26, 2023
1788d8b
fix skimage
alanlujan91 Jan 27, 2023
06bd770
add KernelRidge and GaussianProcessRegressor
alanlujan91 Jan 27, 2023
c389411
update notebooks
alanlujan91 Jan 27, 2023
442ab6e
rename interpolators
alanlujan91 Jan 30, 2023
59c075a
implement scipyinterp
alanlujan91 Jan 31, 2023
7d36385
Create ScipyUnstructuredInterpolation.ipynb
alanlujan91 Jan 31, 2023
88d7336
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Jan 31, 2023
bdb64bc
fix econforgeinterp bug
alanlujan91 Jan 31, 2023
e542f1e
implement sklearninterp
alanlujan91 Feb 1, 2023
157c168
update notebooks
alanlujan91 Feb 1, 2023
02d37e6
rename interp_*
alanlujan91 Feb 1, 2023
9f28ddd
implement sklnearn unstructured
alanlujan91 Feb 7, 2023
862c9f2
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Feb 7, 2023
af42d32
rename imports by scipy convention
alanlujan91 Feb 7, 2023
9837544
implement abstract grid classes
alanlujan91 Feb 8, 2023
757e31f
update notebook names
alanlujan91 Feb 8, 2023
5ce31b9
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Feb 8, 2023
834d0f3
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Feb 8, 2023
b4c51e8
update skimage
alanlujan91 Feb 8, 2023
bf16f66
update notebook
alanlujan91 Feb 8, 2023
a64ec99
remove jax interp
alanlujan91 Feb 8, 2023
530fee6
update interpolation notebooks
alanlujan91 Feb 8, 2023
84a2355
update _RegularGridInterp
alanlujan91 Feb 8, 2023
91fb31d
update notebooks
alanlujan91 Feb 8, 2023
0672801
update curvilinear and scipy unstructured notebooks
alanlujan91 Feb 9, 2023
a3f236b
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Feb 9, 2023
a7531d6
update curvilinear notebook
alanlujan91 Feb 15, 2023
b5307c2
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Feb 16, 2023
c7c42c1
update kernel
alanlujan91 Feb 22, 2023
3bdda06
update warpedinterp2d
alanlujan91 Feb 27, 2023
c08b76f
Create README.md
alanlujan91 Mar 7, 2023
da10b48
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Mar 13, 2023
2a3d308
Merge branch 'master' into map_coordinates
alanlujan91 Mar 13, 2023
906ba45
update WarpedInterpOnInterp2D
alanlujan91 Mar 14, 2023
7436866
clean up
alanlujan91 Mar 14, 2023
1adeb74
update Curvilinear notebook
alanlujan91 Mar 14, 2023
8e8d38e
remove notebook examples
alanlujan91 Mar 14, 2023
47c48bb
update readme
alanlujan91 Mar 15, 2023
dbd7564
update tests
alanlujan91 Mar 15, 2023
f0aee8c
move to multinterp
alanlujan91 Mar 15, 2023
ade0b19
update tests
alanlujan91 Mar 15, 2023
6571fea
remove superfluous models
alanlujan91 Mar 15, 2023
3ab116a
add documentation to _multi
alanlujan91 Mar 15, 2023
5d2ac2f
documentation for _scipy
alanlujan91 Mar 15, 2023
5f67688
update requirements
alanlujan91 Mar 15, 2023
f12ff68
add documentation to _sklearn
alanlujan91 Mar 15, 2023
4781f6c
update tests
alanlujan91 Mar 15, 2023
81db846
add sklearn to interpolation interface
alanlujan91 Mar 15, 2023
c0dad1b
Update test_multi.py
alanlujan91 Mar 15, 2023
0cfe6de
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Mar 23, 2023
8166598
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Apr 3, 2023
34aebab
fix MetricObject import
alanlujan91 Apr 3, 2023
0950193
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Apr 13, 2023
6898828
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 May 16, 2023
52c7b8a
Merge branch 'econ-ark:master' into map_coordinates
alanlujan91 Jun 8, 2023
18f4329
Merge remote-tracking branch 'upstream/master' into map_coordinates
alanlujan91 Jul 19, 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
2 changes: 1 addition & 1 deletion Documentation/reference/tools/econforgeinterp.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Econforgeinterp
-------------

.. automodule:: HARK.econforgeinterp
.. automodule:: HARK.interpolation.econforgeinterp
:members:
:undoc-members:
:show-inheritance:
5 changes: 5 additions & 0 deletions HARK/interpolation/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from HARK.interpolation._econforge import *
from HARK.interpolation._hark import *
from HARK.interpolation._multi import *
from HARK.interpolation._scipy import *
from HARK.interpolation._sklearn import *
File renamed without changes.
File renamed without changes.
Loading