inpaint 1D Lambda last iter

jstarck · sfarrens · commit 97c79a9bcf9c · 2024-11-13T15:13:34.000+01:00
diff --git a/src/mga/libmga1d/MCA1D.cc b/src/mga/libmga1d/MCA1D.cc
@@ -418,13 +418,14 @@ void MCA1D::decomposition (fltarray& Signal)
        
     // if (LambdaTV > 0)   LambdaTV *= sqrt((double) 2.) / Nbr_Iter;
   
-   for (int Iter=0; Iter < Nbr_Iter; Iter++) 
+   for (int Iter=0; Iter < Nbr_Iter; Iter++)
    {
        if (Iter>0) 
        {
-          if (Linear == True) Lambda -= StepL; 
-          else Lambda =  LastSoftThreshold 
-                          + DeltaThreshold  *(1.-erf(2.8*Iter/ Nbr_Iter));
+          if (Linear == True)
+               Lambda =  LastSoftThreshold + (FirstSoftThreshold - LastSoftThreshold ) *  (Nbr_Iter-1-Iter) / (float) (Nbr_Iter-1);
+          else Lambda =  LastSoftThreshold
+                          + DeltaThreshold  *(1.-erf(2.8*(Iter-1)/ (double)(Nbr_Iter-1))) * cos((double)Iter /(double)(Nbr_Iter-1)*PI/2.);
           if (Lambda < LastSoftThreshold) Lambda = LastSoftThreshold;
        }
         

Original file line number	Diff line number	Diff line change
`@@ -418,13 +418,14 @@ void MCA1D::decomposition (fltarray& Signal)`
`418`	`418`
`419`	`419`	`// if (LambdaTV > 0) LambdaTV *= sqrt((double) 2.) / Nbr_Iter;`
`420`	`420`
`421`		`- for (int Iter=0; Iter < Nbr_Iter; Iter++)`
	`421`	`+ for (int Iter=0; Iter < Nbr_Iter; Iter++)`
`422`	`422`	`{`
`423`	`423`	`if (Iter>0)`
`424`	`424`	`{`
`425`		`- if (Linear == True) Lambda -= StepL;`
`426`		`- else Lambda = LastSoftThreshold`
`427`		`- + DeltaThreshold (1.-erf(2.8Iter/ Nbr_Iter));`
	`425`	`+ if (Linear == True)`
	`426`	`+ Lambda = LastSoftThreshold + (FirstSoftThreshold - LastSoftThreshold ) * (Nbr_Iter-1-Iter) / (float) (Nbr_Iter-1);`
	`427`	`+ else Lambda = LastSoftThreshold`
	`428`	`+ + DeltaThreshold (1.-erf(2.8(Iter-1)/ (double)(Nbr_Iter-1))) * cos((double)Iter /(double)(Nbr_Iter-1)*PI/2.);`
`428`	`429`	`if (Lambda < LastSoftThreshold) Lambda = LastSoftThreshold;`
`429`	`430`	`}`
`430`	`431`