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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of AOT-biomaps might be problematic. Click here for more details.

Files changed (48) hide show
  1. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/PrimalDualRecon.py +2 -2
  2. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/__init__.py +2 -1
  3. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps.egg-info/PKG-INFO +1 -1
  4. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/PKG-INFO +1 -1
  5. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/setup.py +2 -1
  6. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/AcousticEnums.py +0 -0
  7. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/AcousticTools.py +0 -0
  8. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/FocusedWave.py +0 -0
  9. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/IrregularWave.py +0 -0
  10. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/PlaneWave.py +0 -0
  11. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/StructuredWave.py +0 -0
  12. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/__init__.py +0 -0
  13. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Acoustic/_mainAcoustic.py +0 -0
  14. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Experiment/Focus.py +0 -0
  15. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Experiment/Tomography.py +0 -0
  16. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Experiment/__init__.py +0 -0
  17. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Experiment/_mainExperiment.py +0 -0
  18. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Optic/Absorber.py +0 -0
  19. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Optic/Laser.py +0 -0
  20. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Optic/OpticEnums.py +0 -0
  21. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Optic/__init__.py +0 -0
  22. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Optic/_mainOptic.py +0 -0
  23. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_Optimizers/DEPIERRO.py +0 -0
  24. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_Optimizers/LS.py +0 -0
  25. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_Optimizers/MAPEM.py +0 -0
  26. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_Optimizers/MLEM.py +0 -0
  27. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_Optimizers/PDHG.py +0 -0
  28. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_Optimizers/__init__.py +0 -0
  29. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Huber.py +0 -0
  30. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Quadratic.py +0 -0
  31. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/RelativeDifferences.py +0 -0
  32. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/__init__.py +0 -0
  33. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AlgebraicRecon.py +0 -0
  34. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/AnalyticRecon.py +0 -0
  35. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/BayesianRecon.py +0 -0
  36. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/DeepLearningRecon.py +0 -0
  37. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/ReconEnums.py +0 -0
  38. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/ReconTools.py +0 -0
  39. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/__init__.py +0 -0
  40. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/AOT_Recon/_mainRecon.py +0 -0
  41. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/Config.py +0 -0
  42. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps/Settings.py +0 -0
  43. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps.egg-info/SOURCES.txt +0 -0
  44. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps.egg-info/dependency_links.txt +0 -0
  45. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps.egg-info/requires.txt +0 -0
  46. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/AOT_biomaps.egg-info/top_level.txt +0 -0
  47. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/README.md +0 -0
  48. {aot_biomaps-2.9.223 → aot_biomaps-2.9.224}/setup.cfg +0 -0
@@ -104,7 +104,7 @@ class PrimalDualRecon(AlgebraicRecon):
104
104
  opt_name = optimizer.value if optimizer is not None else self.optimizer.value
105
105
  # Find the most recent results directory if no date is specified
106
106
  dir_pattern = f'results_*_{opt_name}'
107
- if optimizer == OptimizerType.CP_TV or optimizer == OptimizerType.CP_KL:
107
+ if opt_name == OptimizerType.CP_TV or opt_name == OptimizerType.CP_KL:
108
108
  dir_pattern += f'_Alpha_{self.alpha}_Theta_{self.theta}_L_{self.L}'
109
109
  if results_date is None:
110
110
  dirs = [d for d in os.listdir(self.saveDir) if os.path.isdir(os.path.join(self.saveDir, d)) and dir_pattern in d]
@@ -114,7 +114,7 @@ class PrimalDualRecon(AlgebraicRecon):
114
114
  results_dir = os.path.join(self.saveDir, dirs[0])
115
115
  else:
116
116
  results_dir = os.path.join(self.saveDir, f'results_{results_date}_{opt_name}')
117
- if optimizer == OptimizerType.CP_TV or optimizer == OptimizerType.CP_KL:
117
+ if opt_name == OptimizerType.CP_TV or opt_name == OptimizerType.CP_KL:
118
118
  results_dir += f'_Alpha_{self.alpha}_Theta_{self.theta}_L_{self.L}'
119
119
  if not os.path.exists(results_dir):
120
120
  raise FileNotFoundError(f"Directory {results_dir} does not exist.")
@@ -82,7 +82,7 @@ from .AOT_Recon.AOT_PotentialFunctions.RelativeDifferences import *
82
82
  from .Config import config
83
83
  from .Settings import *
84
84
 
85
- __version__ = '2.9.223'
85
+ __version__ = '2.9.224'
86
86
  __process__ = config.get_process()
87
87
 
88
88
  def initialize(process=None):
@@ -258,5 +258,6 @@ def initialize(process=None):
258
258
 
259
259
 
260
260
 
261
+
261
262
 
262
263
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: AOT_biomaps
3
- Version: 2.9.223
3
+ Version: 2.9.224
4
4
  Summary: Acousto-Optic Tomography
5
5
  Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
6
6
  Author: Lucas Duclos
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: AOT_biomaps
3
- Version: 2.9.223
3
+ Version: 2.9.224
4
4
  Summary: Acousto-Optic Tomography
5
5
  Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
6
6
  Author: Lucas Duclos
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name='AOT_biomaps',
5
- version='2.9.223',
5
+ version='2.9.224',
6
6
  packages=find_packages(),
7
7
  include_package_data=True,
8
8
  install_requires=[
@@ -233,5 +233,6 @@ setup(
233
233
 
234
234
 
235
235
 
236
+
236
237
 
237
238
 
File without changes
File without changes