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

Jump to bottom

Fix bug in include_first_basis #10

Merged
merged 2 commits into from
Feb 26, 2021
Merged

Fix bug in include_first_basis #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73abdb9
fix bug in include_first_basis
zhengp0 Feb 26, 2021
b25c94b
Merge branch 'main' into feature/include-first-basis
zhengp0 Feb 26, 2021
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 src/xspline/__about__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
__summary__ = "xspline: Advanced spline tools"
__uri__ = "https://github.com/zhengp0/xspline"

__version__ = "0.0.6"
__version__ = "0.0.7"

__author__ = "Peng Zheng"
__email__ = "zhengp@uw.edu"
Expand Down
6 changes: 3 additions & 3 deletions src/xspline/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ def design_mat(self, x, l_extra=False, r_extra=False):
"""
mat = np.vstack([
self.fun(x, idx, l_extra=l_extra, r_extra=r_extra)
for idx in range(self.basis_start, self.num_spline_bases)
for idx in range(self.basis_start, self.num_spline_bases + self.basis_start)
]).T
return mat

Expand Down Expand Up @@ -679,7 +679,7 @@ def design_dmat(self, x, order, l_extra=False, r_extra=False):
"""
dmat = np.vstack([
self.dfun(x, order, idx, l_extra=l_extra, r_extra=r_extra)
for idx in range(self.basis_start, self.num_spline_bases)
for idx in range(self.basis_start, self.num_spline_bases + self.basis_start)
]).T
return dmat

Expand Down Expand Up @@ -712,7 +712,7 @@ def design_imat(self, a, x, order, l_extra=False, r_extra=False):
"""
imat = np.vstack([
self.ifun(a, x, order, idx, l_extra=l_extra, r_extra=r_extra)
for idx in range(self.basis_start, self.num_spline_bases)
for idx in range(self.basis_start, self.num_spline_bases + self.basis_start)
]).T
return imat

Expand Down