Merge pull request #3 from SyneRBI/SAGA_final-bugfix

Bugfix fof SAGA_final
SyneRBI · Oct 17, 2024 · cc53e86 · cc53e86
2 parents 74d8929 + a131cd9
commit cc53e86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 266 deletions.
diff --git a/main.py b/main.py
@@ -8,11 +8,11 @@
 >>> algorithm.run(np.inf, callbacks=metrics + submission_callbacks)
 """
 #%%
-import partitioner
 from cil.optimisation.algorithms import ISTA, Algorithm
 from cil.optimisation.functions import IndicatorBox, SAGAFunction
 from cil.optimisation.utilities import (Preconditioner, Sampler,
                                         StepSizeRule)
+from sirf.contrib.partitioner import partitioner
 from petric import Dataset
 import numpy as np
 
@@ -246,7 +246,7 @@ def __init__(self, data: Dataset, update_objective_interval=10):
         f = -FullGradientInitialiserFunction(obj_funs, sampler=sampler, init_steps=5)
 
         preconditioner = BSREMPreconditioner(obj_funs, epsilon=data.OSEM_image.max()/1e6, freeze_iter=10*update_interval+5)
-        g = IndicatorBox(lower=0, accelerated=True) # non-negativity constraint
+        g = IndicatorBox(lower=0, accelerated=False) # non-negativity constraint
 
         step_size_rule = ArmijoStepSearchRule(0.08, beta, decay, max_iter=100, tol=0.2, init_steps=5, update_interval=10*update_interval+5)
 

diff --git a/partitioner.py b/partitioner.py