robotools 1.5.1__tar.gz → 1.5.2__tar.gz

{robotools-1.5.1/robotools.egg-info → robotools-1.5.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: robotools
-Version: 1.5.1
+Version: 1.5.2
 Summary: Pythonic in-silico liquid handling and creation of Tecan FreedomEVO worklists.
 Home-page: https://github.com/jubiotech/robotools
 Author: Michael Osthege
 Author-email: m.osthege@fz-juelich.de
 License: GNU Affero General Public License v3
-Download-URL: https://github.com/jubiotech/robotools/tarball/1.5.1
+Download-URL: https://github.com/jubiotech/robotools/tarball/1.5.2
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

{robotools-1.5.1 → robotools-1.5.2}/robotools/__init__.py

@@ -4,4 +4,4 @@ from .liquidhandling import Labware, Trough, VolumeOverflowError, VolumeUnderflo
 from .transform import WellRotator, WellShifter, make_well_array, make_well_index_dict
 from .utils import DilutionPlan, get_trough_wells
 
-__version__ = "1.5.1"
+__version__ = "1.5.2"

{robotools-1.5.1 → robotools-1.5.2}/robotools/tests.py

@@ -3446,6 +3446,16 @@ class TestWellRandomizer(unittest.TestCase):
         numpy.testing.assert_array_equal(expected, derandomized)
         return
 
+    def test_derandomize_wells_bug_29(self) -> None:
+        A = (6, 8)
+        S = 13
+        randomizer = transform.WellRandomizer(A, S)
+        original = ["A01", "F02", "A05", "A07", "B07", "D06"][::-1]
+        expected = ["A01", "A02", "A03", "A04", "A05", "A06"][::-1]
+        derandomized = randomizer.derandomize_wells(original)
+        numpy.testing.assert_array_equal(expected, derandomized)
+        return
+
 
 if __name__ == "__main__":
     unittest.main()

{robotools-1.5.1 → robotools-1.5.2}/robotools/transform.py

@@ -203,6 +203,7 @@ class WellRandomizer:
         self.original_wells = make_well_array(*self.original_shape).flatten()
         self.randomized_wells = self.rng.permutation(self.original_wells).tolist()
         self.lookup = {owell: rwell for owell, rwell in zip(self.original_wells, self.randomized_wells)}
+        self.lookup_reverse = {rwell: owell for owell, rwell in self.lookup.items()}
         super().__init__()
 
     def randomize_wells(self, wells: ArrayLike) -> numpy.ndarray:
@@ -237,9 +238,8 @@ class WellRandomizer:
         derandomized_output_wells : ndarray
             Array of well ids
         """
-        self.input_wells = numpy.array(wells)
-        self.derandomized_output_wells = [
-            key for key, value in self.lookup.items() if value in self.input_wells
-        ]
+        input_wells = numpy.array(wells)
+        wells_shape = input_wells.shape
+        derandomized_output_wells = [self.lookup_reverse.get(well) for well in input_wells]
 
-        return numpy.array(self.derandomized_output_wells)
+        return numpy.array(derandomized_output_wells).reshape(wells_shape)

{robotools-1.5.1 → robotools-1.5.2/robotools.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: robotools
-Version: 1.5.1
+Version: 1.5.2
 Summary: Pythonic in-silico liquid handling and creation of Tecan FreedomEVO worklists.
 Home-page: https://github.com/jubiotech/robotools
 Author: Michael Osthege
 Author-email: m.osthege@fz-juelich.de
 License: GNU Affero General Public License v3
-Download-URL: https://github.com/jubiotech/robotools/tarball/1.5.1
+Download-URL: https://github.com/jubiotech/robotools/tarball/1.5.2
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Programming Language :: Python