make dwa filtering within a dte not sorted by name by default but only if using a True argument #46

seb5g · 2025-07-15T14:29:30Z

Was creating a bug in the ordering of data plotted by bayesian and adaptive extensions

…y if using a True argument

codecov · 2025-07-15T14:31:38Z

Codecov Report

Attention: Patch coverage is 88.88889% with 1 line in your changes missing coverage. Please review.

Project coverage is 76.50%. Comparing base (fef44c6) to head (5230974).
Report is 3 commits behind head on 5.0.x_dev.

Files with missing lines	Patch %	Lines
src/pymodaq_data/data.py	88.88%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           5.0.x_dev      #46   +/-   ##
==========================================
  Coverage      76.49%   76.50%           
==========================================
  Files             17       17           
  Lines           3795     3796    +1     
==========================================
+ Hits            2903     2904    +1     
  Misses           892      892

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

see PyMoDAQ/pymodaq_data#46 for a patch on the subject

malik-irain

Lots of comments to suggest renaming sort_name with sort_by_name

malik-irain · 2025-07-16T09:26:35Z

src/pymodaq_data/data.py

        return dims

-    def get_data_from_source(self, source: DataSource, deepcopy=False) -> DataToExport:
+    def get_data_from_source(self, source: DataSource, deepcopy=False, sort_name=False) -> DataToExport:


I would have named the new parameter sort_by_name as it feels a more "boolean" name than sort_name that could seem to mean it needs a sort algorithm name

malik-irain · 2025-07-16T09:26:49Z

src/pymodaq_data/data.py

        """
        source = enum_checker(DataSource, source)
-        return self.get_data_from_attribute('source', source, deepcopy=deepcopy)
+        return self.get_data_from_attribute('source', source, deepcopy=deepcopy, sort_name=sort_name)


malik-irain · 2025-07-16T09:27:03Z

src/pymodaq_data/data.py

+    def get_data_from_attribute(self, attribute: str,
+                                attribute_value: Any,
+                                deepcopy=False,
+                                sort_name=False) -> DataToExport:


malik-irain · 2025-07-16T09:27:12Z

src/pymodaq_data/data.py

+        deepcopy: bool
+            If True, the returned data are deepcopied from the original
+        sort_name: bool
+            If True the returned data are sorted alphabetically using their name, default is False


malik-irain · 2025-07-16T09:27:23Z

src/pymodaq_data/data.py

        selection = find_objects_in_list_from_attr_name_val(self.data, attribute, attribute_value,
                                                            return_first=False)
-        selection.sort(key=lambda elt: elt[0].name)
+        if sort_name:


malik-irain · 2025-07-16T09:27:31Z

src/pymodaq_data/data.py

        return DataToExport(name=self.name, data=data)

-    def get_data_from_dim(self, dim: DataDim, deepcopy=False) -> DataToExport:
+    def get_data_from_dim(self, dim: DataDim, deepcopy=False, sort_name=False) -> DataToExport:


malik-irain · 2025-07-16T09:27:36Z

src/pymodaq_data/data.py

        """
        dim = enum_checker(DataDim, dim)
-        return self.get_data_from_attribute('dim', dim, deepcopy=deepcopy)
+        return self.get_data_from_attribute('dim', dim, deepcopy=deepcopy, sort_name=sort_name)


malik-irain · 2025-07-16T09:27:43Z

src/pymodaq_data/data.py

+        return self.get_data_from_attribute('dim', dim, deepcopy=deepcopy, sort_name=sort_name)

-    def get_data_from_dims(self, dims: List[DataDim], deepcopy=False) -> DataToExport:
+    def get_data_from_dims(self, dims: List[DataDim], deepcopy=False, sort_name=False) -> DataToExport:


malik-irain · 2025-07-16T09:27:46Z

src/pymodaq_data/data.py

        data = DataToExport(name=self.name)
        for dim in dims:
-            data.append(self.get_data_from_dim(dim, deepcopy=deepcopy))
+            data.append(self.get_data_from_dim(dim, deepcopy=deepcopy, sort_name=sort_name))


malik-irain · 2025-07-16T09:27:53Z

tests/data_test.py

        data.append(dat4)
-        assert data.get_data_from_dim(data_mod.DataDim['Data2D']).data == [dat1, dat4]
+        assert data.get_data_from_dim(data_mod.DataDim.Data2D).data == [dat1, dat4]
+        assert data.get_data_from_dim(data_mod.DataDim.Data2D, sort_name=True).data == [dat4, dat1]


ok will do!

see PyMoDAQ/pymodaq_data#46 for a patch on the subject

make dwa filtering within a dte not sorted by name by default but onl…

9339e15

…y if using a True argument

seb5g requested a review from malik-irain July 15, 2025 14:29

seb5g added a commit to PyMoDAQ/PyMoDAQ that referenced this pull request Jul 15, 2025

adding specific labels to have meaningfull plots

0fc4432

see PyMoDAQ/pymodaq_data#46 for a patch on the subject

seb5g mentioned this pull request Jul 15, 2025

Bugfix/adaptive selected actuators PyMoDAQ/PyMoDAQ#616

Merged

malik-irain reviewed Jul 16, 2025

View reviewed changes

change named attribute to sort_by_name to make it more boolean

5230974

seb5g requested a review from malik-irain July 16, 2025 09:58

malik-irain approved these changes Jul 16, 2025

View reviewed changes

seb5g merged commit 90483cd into 5.0.x_dev Jul 16, 2025
12 checks passed

seb5g deleted the bugfix/sorted_filtered_data branch July 16, 2025 12:19

seb5g added a commit to PyMoDAQ/PyMoDAQ that referenced this pull request Jul 16, 2025

adding specific labels to have meaningfull plots

c4d9194

see PyMoDAQ/pymodaq_data#46 for a patch on the subject

make dwa filtering within a dte not sorted by name by default but only if using a True argument #46

make dwa filtering within a dte not sorted by name by default but only if using a True argument #46

Uh oh!

Conversation

seb5g commented Jul 15, 2025

Uh oh!

codecov bot commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

malik-irain left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Jul 15, 2025 •

edited

Loading