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

Valid min and valid max #168

Merged
merged 5 commits into from
Jan 17, 2025
Merged

Valid min and valid max #168

merged 5 commits into from
Jan 17, 2025

Conversation

jeandet
Copy link
Member

@jeandet jeandet commented Dec 13, 2024

closes #161

github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 13, 2024
View reviewed changes
speasy/core/data_containers.py

class DataContainerProtocol(Protocol[T]):
def select(self, indices, inplace=False) -> T:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py Fixed Show fixed Hide fixed
speasy/core/data_containers.py

@staticmethod
def from_dictionary(dictionary: Dict[str, str or Dict[str, str] or List], dtype=np.float64) -> T:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py Fixed Show fixed Hide fixed
speasy/core/data_containers.py Fixed Show fixed Hide fixed
speasy/core/data_containers.py

@property
def values(self) -> np.array:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py Fixed Show fixed Hide fixed
speasy/core/data_containers.py Fixed Show fixed Hide fixed
speasy/core/data_containers.py

@property
def nbytes(self) -> int:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
tests/test_speasy_variable.py Fixed Show fixed Hide fixed
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 15, 2024
View reviewed changes
speasy/core/data_containers.py Fixed Show fixed Hide fixed
speasy/core/data_containers.py

@staticmethod
def reserve_like(other: T, length: int = 0) -> T:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py
...

def __getitem__(self, key) -> T:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py
...

def __setitem__(self, k, v: Union[T, float, int]):
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py
...

def __len__(self) -> int:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py

@property
def shape(self):
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py

@property
def name(self) -> str:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
speasy/core/data_containers.py

@property
def nbytes(self) -> int:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
tests/test_speasy_variable.py Fixed Show fixed Hide fixed
@jeandet jeandet mentioned this pull request Dec 15, 2024
Closed
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 15, 2024
View reviewed changes
speasy/core/data_containers.py
...

def to_dictionary(self, array_to_list=False) -> Dict[str, object]:
...

Check notice

Code scanning / CodeQL

Statement has no effect Note

This statement has no effect.
@jeandet jeandet force-pushed the valid_min_and_valid_max branch from 9ebf798 to 8bd20df Compare December 15, 2024 17:14
@jeandet jeandet force-pushed the valid_min_and_valid_max branch 2 times, most recently from e0c2f14 to 6fbed5b Compare January 9, 2025 10:29
@jeandet jeandet marked this pull request as ready for review January 9, 2025 10:36
@jeandet jeandet requested a review from brenard-irap January 9, 2025 10:36
@jeandet jeandet added bug Something isn't working enhancement New feature or request labels Jan 9, 2025
@jeandet jeandet added this to the 1.5 milestone Jan 9, 2025
brenard-irap
brenard-irap reviewed Jan 16, 2025
View reviewed changes
Copy link
Collaborator

@brenard-irap brenard-irap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very usefull!

But I detect a problem when I apply a condition on a vector:

import speasy as spz
data = spz.get_data(spz.inventories.tree.cda.ACE.MAG.AC_H0_MFI.BGSM, '2008-01-01T00:00:00', '2008-01-01T00:10:00')
print(data[data<0].time)
['2008-01-01T00:00:08.000000000' '2008-01-01T00:00:08.000000000'
 '2008-01-01T00:00:24.000000000' '2008-01-01T00:00:24.000000000'
 '2008-01-01T00:00:40.000000000' '2008-01-01T00:00:40.000000000'
 '2008-01-01T00:00:56.000000000' '2008-01-01T00:00:56.000000000'
 '2008-01-01T00:01:12.000000000' '2008-01-01T00:01:12.000000000'
 '2008-01-01T00:01:28.000000000' '2008-01-01T00:01:28.000000000'
 '2008-01-01T00:01:44.000000000' '2008-01-01T00:01:44.000000000'
 '2008-01-01T00:02:00.000000000' '2008-01-01T00:02:00.000000000'
 '2008-01-01T00:02:16.000000000' '2008-01-01T00:02:16.000000000'
 '2008-01-01T00:02:32.000000000' '2008-01-01T00:02:32.000000000'
 '2008-01-01T00:02:48.000000000' '2008-01-01T00:02:48.000000000'
 '2008-01-01T00:03:04.000000000' '2008-01-01T00:03:04.000000000'
 '2008-01-01T00:03:20.000000000' '2008-01-01T00:03:20.000000000'
 '2008-01-01T00:03:36.000000000' '2008-01-01T00:03:36.000000000'
 '2008-01-01T00:03:52.000000000' '2008-01-01T00:03:52.000000000'
 '2008-01-01T00:04:08.000000000' '2008-01-01T00:04:08.000000000'
 '2008-01-01T00:04:24.000000000' '2008-01-01T00:04:24.000000000'
 '2008-01-01T00:04:40.000000000' '2008-01-01T00:04:40.000000000'
 '2008-01-01T00:04:56.000000000' '2008-01-01T00:04:56.000000000'
 '2008-01-01T00:05:12.000000000' '2008-01-01T00:05:12.000000000'
 '2008-01-01T00:05:28.000000000' '2008-01-01T00:05:28.000000000'
 '2008-01-01T00:05:44.000000000' '2008-01-01T00:05:44.000000000'
 '2008-01-01T00:06:00.000000000' '2008-01-01T00:06:00.000000000'
 '2008-01-01T00:06:16.000000000' '2008-01-01T00:06:16.000000000'
 '2008-01-01T00:06:32.000000000' '2008-01-01T00:06:32.000000000'
 '2008-01-01T00:06:48.000000000' '2008-01-01T00:07:04.000000000'
 '2008-01-01T00:07:20.000000000' '2008-01-01T00:07:36.000000000'
 '2008-01-01T00:07:52.000000000' '2008-01-01T00:08:08.000000000'
 '2008-01-01T00:08:24.000000000' '2008-01-01T00:08:40.000000000'
 '2008-01-01T00:08:56.000000000' '2008-01-01T00:09:12.000000000'
 '2008-01-01T00:09:12.000000000' '2008-01-01T00:09:28.000000000'
 '2008-01-01T00:09:28.000000000' '2008-01-01T00:09:44.000000000']

It seems that a record is duplicated each time that the condition is satisfied on a component

I have something similar with sanitized method:

import speasy as spz

data = spz.get_data(spz.inventories.tree.cda.ACE.MAG.AC_H0_MFI.BGSM, '2008-01-16T15:23:00', '2008-01-16T15:25:00')

print(data.time)
print(data.sanitized().time)
>>> print(data.time)
['2008-01-16T15:23:01.000000000' '2008-01-16T15:23:17.000000000'
 '2008-01-16T15:23:33.000000000' '2008-01-16T15:23:49.000000000'
 '2008-01-16T15:24:05.000000000' '2008-01-16T15:24:21.000000000'
 '2008-01-16T15:24:37.000000000' '2008-01-16T15:24:53.000000000']
>>> print(data.sanitized().time)
['2008-01-16T15:23:01.000000000' '2008-01-16T15:23:01.000000000'
 '2008-01-16T15:23:01.000000000' '2008-01-16T15:23:17.000000000'
 '2008-01-16T15:23:17.000000000' '2008-01-16T15:23:17.000000000'
 '2008-01-16T15:23:33.000000000' '2008-01-16T15:23:33.000000000'
 '2008-01-16T15:23:33.000000000' '2008-01-16T15:24:05.000000000'
 '2008-01-16T15:24:05.000000000' '2008-01-16T15:24:05.000000000'
 '2008-01-16T15:24:21.000000000' '2008-01-16T15:24:21.000000000'
 '2008-01-16T15:24:21.000000000' '2008-01-16T15:24:37.000000000'
 '2008-01-16T15:24:37.000000000' '2008-01-16T15:24:37.000000000'
 '2008-01-16T15:24:53.000000000' '2008-01-16T15:24:53.000000000'
 '2008-01-16T15:24:53.000000000']

@jeandet
[SpeasyVariable] Adds clamping, sanitizing and some refactoring
4c5d26c 
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
@jeandet
[SpeasyVariable] refac clamp and clean with numpy comparison support
feda329 
It is now possible to do something like var[var>10]=52

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
@jeandet
Sonar/CodeQL/bugs cleanups
2452c3d 
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
@jeandet
Handles numpy functions that returns arrays of bool
fc9b28d 
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
@jeandet jeandet force-pushed the valid_min_and_valid_max branch from 6fbed5b to 2f4e13d Compare January 16, 2025 15:20
@jeandet
Correct ND bolean slicing and ensure all variable axes are coherent
924c97a 
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
@jeandet jeandet force-pushed the valid_min_and_valid_max branch from 2f4e13d to 924c97a Compare January 16, 2025 15:28
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

brenard-irap
brenard-irap approved these changes Jan 17, 2025
View reviewed changes
Copy link
Collaborator

@brenard-irap brenard-irap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

@jeandet jeandet merged commit 9d8bb19 into SciQLop:main Jan 17, 2025
21 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brenard-irap brenard-irap brenard-irap approved these changes

Assignees
No one assigned
Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Milestone
1.5
Development

Successfully merging this pull request may close these issues.

SpeasyVariable does not check VALIDMIN and VALIDMAX
2 participants
@jeandet @brenard-irap