Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cosmic_dustbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Martin Glatzle
cosmic_dustbox
Commits
3459b151
Commit
3459b151
authored
Feb 22, 2019
by
Martin Glatzle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make interpolation work with len 1 arrays.
parent
745f1f71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
12 deletions
+29
-12
cosmic_dustbox/crefin.py
cosmic_dustbox/crefin.py
+14
-12
cosmic_dustbox/tests/test_crefin.py
cosmic_dustbox/tests/test_crefin.py
+15
-0
No files found.
cosmic_dustbox/crefin.py
View file @
3459b151
...
...
@@ -122,20 +122,22 @@ class Crefin(object):
if
bounds_error
and
not
a_bounds_error
:
def
f
(
aa
,
lam
):
r
=
_np
.
clip
(
aa
,
_np
.
amin
(
a
),
_np
.
amax
(
a
))
rowind_unsorted
=
_np
.
argsort
(
r
)
colind_unsorted
=
_np
.
argsort
(
lam
)
return
(
rinterpolation
(
lam
,
r
)
+
1j
*
iinterpolation
(
lam
,
r
))[
rowind_unsorted
][:,
colind_unsorted
]
n
=
rinterpolation
(
lam
,
r
)
+
1j
*
iinterpolation
(
lam
,
r
)
if
_np
.
prod
(
r
.
shape
)
*
_np
.
prod
(
lam
.
shape
)
>
1
:
rowind_unsorted
=
_np
.
argsort
(
r
)
colind_unsorted
=
_np
.
argsort
(
lam
)
return
n
[
rowind_unsorted
][:,
colind_unsorted
]
else
:
return
_np
.
atleast_2d
(
n
)
else
:
def
f
(
a
,
lam
):
rowind_unsorted
=
_np
.
argsort
(
lam
)
colind_unsorted
=
_np
.
argsort
(
r
)
return
(
rinterpolation
(
lam
,
a
)
+
1j
*
iinterpolation
(
lam
,
a
))[
rowind_unsorted
][:,
colind_unsorted
]
n
=
rinterpolation
(
lam
,
a
)
+
1j
*
iinterpolation
(
lam
,
a
)
if
_np
.
prod
(
r
.
shape
)
*
_np
.
prod
(
lam
.
shape
)
>
1
:
rowind_unsorted
=
_np
.
argsort
(
lam
)
colind_unsorted
=
_np
.
argsort
(
r
)
return
n
[
rowind_unsorted
][:,
colind_unsorted
]
else
:
return
_np
.
atleast_2d
(
n
)
return
cls
(
f
)
...
...
cosmic_dustbox/tests/test_crefin.py
View file @
3459b151
...
...
@@ -52,6 +52,21 @@ class TestFromData(TestCase):
a
=
crefin
.
Crefin
.
fromData
(
c
.
a2
,
c
.
lam2
,
c
.
n2
)
return
def
test_single_element
(
self
):
c
=
self
.
__class__
a
=
crefin
.
Crefin
.
fromData
(
c
.
a2
,
c
.
lam2
,
c
.
n2
)
n
=
a
(
np
.
array
([
1e-9
])
*
u
.
micron
,
np
.
array
([
8
])
*
u
.
micron
)
self
.
assertTrue
return
def
test_single_element_no_bounds
(
self
):
c
=
self
.
__class__
a
=
crefin
.
Crefin
.
fromData
(
c
.
a2
,
c
.
lam2
,
c
.
n2
)
return
def
test_normal_no_bounds
(
self
):
c
=
self
.
__class__
a
=
crefin
.
Crefin
.
fromData
(
c
.
a2
,
c
.
lam2
,
c
.
n2
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment