qrotor 4.4.0__tar.gz → 4.4.1__tar.gz

{qrotor-4.4.0 → qrotor-4.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrotor
-Version: 4.4.0
+Version: 4.4.1
 Summary: QRotor
 Author: Pablo Gila-Herranz
 Author-email: pgila001@ikasle.ehu.eus

{qrotor-4.4.0 → qrotor-4.4.1}/qrotor/_version.py

@@ -11,5 +11,5 @@ https://semver.org/
 ---
 """
 
-__version__ = "v4.4.0"
+__version__ = "v4.4.1"
 

{qrotor-4.4.0 → qrotor-4.4.1}/qrotor/systems.py

@@ -324,11 +324,13 @@ def filter_tags(
         systems:list,
         include:str='',
         exclude:str='',
+        strict:bool=False,
         ) -> list:
     """Returns a filtered list of systems with or without specific tags.
-    
-    Tags are separated by blank spaces.
-    Include tags from `include`, exclude tags from `exclude`.
+
+    You can `include` or `exclude` any number of tags, separated by blank spaces.
+    By default, the filters are triggered if any tag is found, i.e. *tag1 OR tag2*.
+    Set `strict=True` to require all tags to match, i.e. *tag1 AND tag2*.
     """
     systems = as_list(systems)
     included_tags = include.split()
@@ -336,12 +338,16 @@ def filter_tags(
     filtered_systems = []
     for i in systems:
         tags_found = list_tags(i)
-        if excluded_tags and any(tag in excluded_tags for tag in tags_found):
-            continue
+        if excluded_tags:
+            if strict and all(tag in tags_found for tag in excluded_tags):
+                continue
+            elif not strict and any(tag in tags_found for tag in excluded_tags):
+                continue
         if included_tags:
-            if any(tag in included_tags for tag in tags_found):
-                filtered_systems.append(i)
-        else:
-            filtered_systems.append(i)
+            if strict and not all(tag in tags_found for tag in included_tags):
+                continue
+            elif not strict and not any(tag in tags_found for tag in included_tags):
+                continue
+        filtered_systems.append(i)
     return filtered_systems
 

{qrotor-4.4.0 → qrotor-4.4.1}/qrotor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrotor
-Version: 4.4.0
+Version: 4.4.1
 Summary: QRotor
 Author: Pablo Gila-Herranz
 Author-email: pgila001@ikasle.ehu.eus

{qrotor-4.4.0 → qrotor-4.4.1}/qrotor.egg-info/SOURCES.txt

@@ -15,8 +15,10 @@ qrotor.egg-info/SOURCES.txt
 qrotor.egg-info/dependency_links.txt
 qrotor.egg-info/requires.txt
 qrotor.egg-info/top_level.txt
+tests/__init__.py
 tests/test_constants.py
 tests/test_potential.py
 tests/test_rotate.py
 tests/test_solve.py
-tests/test_system.py
+tests/test_system.py
+tests/test_systems.py

{qrotor-4.4.0 → qrotor-4.4.1}/qrotor.egg-info/top_level.txt

@@ -1 +1,2 @@
 qrotor
+tests

qrotor-4.4.1/tests/test_systems.py

@@ -0,0 +1,30 @@
+import qrotor as qr
+
+
+def test_tags():
+    sys1 = qr.System(tags='tag1 tag2 tag3', comment='sys1', potential_name='zero')
+    sys2 = qr.System(tags='tag2 tag3 tag4', comment='sys2')
+    sys3 = qr.System(tags='tag4 tag5 tag6', comment='sys3')
+    sys1.solve(100)
+    test1 = qr.systems.filter_tags(sys1, include='tag4')
+    assert test1 == []
+    test2 = qr.systems.filter_tags([sys1, sys2], include='tag4 tag5', strict=False)
+    assert len(test2) == 1
+    assert test2[0].comment == 'sys2'
+    test3 = qr.systems.filter_tags([sys1, sys2], include='tag4 tag5', strict=True)
+    assert test3 == []
+    test4 = qr.systems.filter_tags([sys1, sys2, sys3], include='tag3 tag4', strict=False)
+    assert len(test4) == 3
+    test5 = qr.systems.filter_tags([sys1, sys2, sys3], include='tag3 tag4', strict=True)
+    assert len(test5) == 1
+    assert test5[0].comment == 'sys2'
+    test6 = qr.systems.filter_tags([sys1, sys2, sys3], include='tag3 tag4', exclude='tag6', strict=False)
+    assert len(test6) == 2
+    test7 = qr.systems.filter_tags([sys1, sys2, sys3], include='tag4', exclude='tag5 tag6', strict=True)
+    assert len(test7) == 1
+    assert test7[0].comment == 'sys2'
+    test8 = qr.systems.filter_tags([sys1, sys2, sys3], include='', exclude='tag1 tag2', strict=True)
+    assert len(test8) == 2
+    test9 = qr.systems.filter_tags([sys1, sys2, sys3], include='', exclude='tag1 tag2', strict=False)
+    assert test9[0].comment == 'sys3'
+