Skip to content

Descriptor array #104

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
Closed
Parent: Preparation for 2.0.0 release
wants to merge 53 commits into from
Closed

Descriptor array #104

wants to merge 53 commits into from

Conversation

@elindgren
Copy link
Collaborator

Implements the DescriptorArray type, defined in #95 and #103

Fixes #103.

andped10 and others added 30 commits September 18, 2024 15:18
@andped10
Merge pull request #76 from EasyScience/develop
3a3738f 
Version 1.1.0
@AndrewSazonov
Merge pull request #83 from EasyScience/develop
59c4a90 
Release 1.1.1
@AndrewSazonov
Merge pull request #86 from EasyScience/develop
23f4ced
@andped10
Merge pull request #87 from EasyScience/develop
a6d9379 
Develop to master
@AndrewSazonov
Merge pull request #90 from EasyScience/develop
5fdd558 
Release 1.2.1
@henrikjacobsenfys @elindgren
Numpy2 (#93)
7141fc2 
Added support for Numpy 2, dropped support for Python 3.9, added support for Python 3.13
@henrikjacobsenfys @elindgren
Remove old parameter (#94)
2ea1bcc
@henrikjacobsenfys @elindgren
Remove virtual (#98)
d087e07
@henrikjacobsenfys @elindgren
make descriptor_array
5e63988
@henrikjacobsenfys @elindgren
update from_scipp method
69cd6bd
@henrikjacobsenfys @elindgren
Update value (not finished)
4b51382
@henrikjacobsenfys @elindgren
change _scalar to _array
755fc91
@henrikjacobsenfys @elindgren
outcomment error for now
3073d78
@henrikjacobsenfys @elindgren
outcommented add, radd etc.
4921185
@henrikjacobsenfys @elindgren
identify TODOs
865c2da
@henrikjacobsenfys @elindgren
Update __init__
527ae1d
@henrikjacobsenfys @elindgren
update variance
8619a1e
@henrikjacobsenfys @elindgren
update error
710a555
@henrikjacobsenfys @elindgren
add repr
bd6d12d
@henrikjacobsenfys @elindgren
add __add__
7287ebd
@henrikjacobsenfys @elindgren
update __init__ of variable
222bd4e
@henrikjacobsenfys @elindgren
Add addition of DescriptorNumber
34d08bb
@henrikjacobsenfys @elindgren
add neg and abs
baf35fc
@henrikjacobsenfys @elindgren
update __radd__ to handle DescriptorNumber
19cdf78
@henrikjacobsenfys @elindgren
fix __add__
2ecbb0a
@henrikjacobsenfys @elindgren
fixed add and radd
94fad5f
@henrikjacobsenfys @elindgren
autogenerated tests
ee215dc
@henrikjacobsenfys @elindgren
start over with tests
9320b9a
@henrikjacobsenfys @elindgren
adapted some tests from descriptor_number
ea62449
@henrikjacobsenfys @elindgren
more tests
964e8cf
henrikjacobsenfys and others added 23 commits March 3, 2025 16:07
@henrikjacobsenfys @elindgren
update __repr__ and more tests
c9436d0
@henrikjacobsenfys @elindgren
update tests more
1ca4049
@elindgren
minor spelling fixup
1edf993
@elindgren
work on tests for array addition
9f17ef0
@elindgren
manually perform broadcasting without considering correlations, and r…
54f4524 
…aise a warning
@elindgren
investigate issue where a DescriptorArray is converted to a set of nu…
7a19de5 
…mpy arrays and then broadcast, somehow
@elindgren
manually implement numpy __add__ ufunc compatibility
a6f02b1
@elindgren
add wrapper function for handling type conversions for basic operations
2d9978e
@elindgren
drop support for operations with Numpy arrays
bc93a90
@elindgren
let scipp handle array multiplication for uncertainty propagation
75483ef
@elindgren
add division; revorked unit handling to make division work
e5a1574
@elindgren
add pow
cfeaaa9
@elindgren
apply linter changes
0bdbb3f
@elindgren
add tests for abs and neg
997d5f9
@elindgren
allow for multiplication and division with dimensionless lists and nu…
c84fd9e 
…mbers
@elindgren
fix scipp error
0e007a1
@elindgren
add sum function
dbc72e1
@elindgren
start working on trace and slicing
063e632
@elindgren
add trace operation
e71f21f
@elindgren
add exception test for trace
4cef1d5
@elindgren
try implementing set item and realize we need views
972779c
@elindgren
do not allow __setitem__
a526530
@elindgren
add some docstrings and cleanup
bed71a9
@elindgren elindgren added the feature PR label label Mar 3, 2025
@elindgren elindgren self-assigned this Mar 3, 2025
@elindgren elindgren changed the base branch from master to develop March 3, 2025 15:16
@elindgren
Copy link
Collaborator Author

elindgren commented Mar 3, 2025 •
edited
Loading

I screwed up the git history, created a new PR here: #105

@elindgren elindgren closed this Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees

@elindgren elindgren

Labels

feature PR label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ADR Suggestion: DescriptorArray

4 participants

@elindgren @andped10 @AndrewSazonov @henrikjacobsenfys