AOT-biomaps 2.9.222__tar.gz → 2.9.224__tar.gz

{aot_biomaps-2.9.222 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/BayesianRecon.py

@@ -100,7 +100,7 @@ class BayesianRecon(AlgebraicRecon):
                 else:
                     self.reconLaser = data
             # Essayer de charger les indices
-            base_dir, file_name = os.path.split(recon_path)
+            base_dir, _ = os.path.split(recon_path)
             indices_path = os.path.join(base_dir, 'indices.npy')
             if os.path.exists(indices_path):
                 indices_data = np.load(indices_path, allow_pickle=True)

{aot_biomaps-2.9.222 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/PrimalDualRecon.py

@@ -103,18 +103,19 @@ class PrimalDualRecon(AlgebraicRecon):
             # Determine optimizer name for path matching
             opt_name = optimizer.value if optimizer is not None else self.optimizer.value
             # Find the most recent results directory if no date is specified
+            dir_pattern = f'results_*_{opt_name}'
+            if opt_name == OptimizerType.CP_TV or opt_name == OptimizerType.CP_KL:
+                dir_pattern += f'_Alpha_{self.alpha}_Theta_{self.theta}_L_{self.L}'
             if results_date is None:
-                dirs = [
-                    d for d in os.listdir(self.saveDir)
-                    if os.path.isdir(os.path.join(self.saveDir, d))
-                    and re.match(r'results_\d{4}_' + re.escape(opt_name) + r'($|_)', d)
-                ]
+                dirs = [d for d in os.listdir(self.saveDir) if os.path.isdir(os.path.join(self.saveDir, d)) and dir_pattern in d]
                 if not dirs:
-                    raise FileNotFoundError(f"No results directory found for optimizer '{opt_name}' in {self.saveDir}.")
+                    raise FileNotFoundError(f"No matching results directory found for pattern '{dir_pattern}' in {self.saveDir}.")
                 dirs.sort(reverse=True)  # Most recent first
                 results_dir = os.path.join(self.saveDir, dirs[0])
             else:
                 results_dir = os.path.join(self.saveDir, f'results_{results_date}_{opt_name}')
+                if opt_name == OptimizerType.CP_TV or opt_name == OptimizerType.CP_KL:
+                    results_dir += f'_Alpha_{self.alpha}_Theta_{self.theta}_L_{self.L}'
                 if not os.path.exists(results_dir):
                     raise FileNotFoundError(f"Directory {results_dir} does not exist.")
             # Load reconstruction results

{aot_biomaps-2.9.222 → aot_biomaps-2.9.224}/AOT_biomaps/__init__.py

@@ -82,7 +82,7 @@ from .AOT_Recon.AOT_PotentialFunctions.RelativeDifferences import *
 from .Config import config
 from .Settings import *
 
-__version__ = '2.9.222'
+__version__ = '2.9.224'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -256,6 +256,8 @@ def initialize(process=None):
 
 
 
+
+
 
 
 

{aot_biomaps-2.9.222 → aot_biomaps-2.9.224}/AOT_biomaps.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AOT_biomaps
-Version: 2.9.222
+Version: 2.9.224
 Summary: Acousto-Optic Tomography
 Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
 Author: Lucas Duclos

{aot_biomaps-2.9.222 → aot_biomaps-2.9.224}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AOT_biomaps
-Version: 2.9.222
+Version: 2.9.224
 Summary: Acousto-Optic Tomography
 Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
 Author: Lucas Duclos

{aot_biomaps-2.9.222 → aot_biomaps-2.9.224}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='AOT_biomaps',
-    version='2.9.222',
+    version='2.9.224',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
@@ -231,6 +231,8 @@ setup(
 
 
 
+
+