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.

Sign up for GitHub

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

Generalize spline tax functions to 2D #839

Merged
merged 25 commits into from
Apr 22, 2023
Merged

Generalize spline tax functions to 2D #839

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ed0c680
add monotone spline for 2d
prrathi Dec 27, 2022
297f96d
Merge branch 'master' of https://github.com/prrathi/OG-Core
prrathi Dec 27, 2022
7efa261
restore original eilers method code
prrathi Dec 27, 2022
7f3a865
Update txfunc.py
prrathi Dec 27, 2022
0c9c48e
update environment + other small changes
prrathi Dec 28, 2022
1857336
uncommitted files
prrathi Dec 28, 2022
9193e28
black formatted files
prrathi Dec 29, 2022
ffc1617
Merge remote-tracking branch 'upstream/master'
prrathi Jan 3, 2023
bf9cdba
Merge branch 'master' into master
jdebacker Jan 16, 2023
7105099
Merge pull request #2 from PSLmodels/master
prrathi Jan 21, 2023
30cb743
remove my local path
prrathi Mar 2, 2023
6887d02
suggested file read changes
prrathi Mar 3, 2023
3de3c81
add 2dmono option
prrathi Mar 4, 2023
f96dae5
small bug
prrathi Mar 4, 2023
ed3ec31
return obs
jdebacker Mar 10, 2023
5171b3d
use cloudpickle
jdebacker Mar 10, 2023
d28ac5f
Merge pull request #3 from jdebacker/pr-839
prrathi Mar 16, 2023
71e354d
Update txfunc.py
prrathi Mar 20, 2023
f8302d4
Update txfunc.py
prrathi Mar 20, 2023
6ec0507
merged changes
prrathi Apr 10, 2023
310670f
black formatting + txfunc update
prrathi Apr 16, 2023
fa23622
black
prrathi Apr 16, 2023
3ca2f4a
Made jdebacker updates to txfunc.py
rickecon Apr 21, 2023
1c93aff
Updated version number in __init__.py and setup.py
rickecon Apr 21, 2023
fc2e081
Merge pull request #4 from rickecon/prrathi-master
prrathi Apr 22, 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
4 changes: 4 additions & 0 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ dependencies:
- requests
- openpyxl
- black
- pip
- pip:
- pygam

3 changes: 2 additions & 1 deletion ogcore/default_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3146,7 +3146,8 @@
"DEP_totalinc",
"GS",
"linear",
"mono"
"mono",
"mono2D"
]
}
}
Expand Down
Loading