diff --git a/demos/__init__.py b/demos/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/demos/critical_filtering.py b/demos/critical_filtering.py index 9a9e2103fc63e75c3c449d943852cb446fc0d94a..acc270d5b1002b83d6d929bbb04b1ccce8a1f713 100644 --- a/demos/critical_filtering.py +++ b/demos/critical_filtering.py @@ -1,4 +1,3 @@ - from nifty import * from nifty.library.wiener_filter import WienerFilterEnergy from nifty.library.critical_filter import CriticalPowerEnergy @@ -113,7 +112,7 @@ if __name__ == "__main__": print (x, iteration) - minimizer1 = RelaxedNewton(convergence_tolerance=10e-2, + minimizer1 = RelaxedNewton(convergence_tolerance=1e-2, convergence_level=2, iteration_limit=3, callback=convergence_measure) @@ -124,7 +123,7 @@ if __name__ == "__main__": max_history_length=3) # Setting starting position - flat_power = Field(p_space,val=10e-8) + flat_power = Field(p_space,val=1e-8) m0 = flat_power.power_synthesize(real_signal=True) t0 = Field(p_space, val=log(1./(1+p_space.kindex)**2)) @@ -136,7 +135,7 @@ if __name__ == "__main__": distribution_strategy=distribution_strategy) # Initializing the nonlinear Wiener Filter energy - map_energy = WienerFilterEnergy(position=m0, d=d, R=R, N=N, S=S0, inverter=inverter) + map_energy = WienerFilterEnergy(position=m0, d=d, R=R, N=N, S=S0) # Solving the Wiener Filter analytically D0 = map_energy.curvature m0 = D0.inverse_times(j) diff --git a/demos/wiener_filter_advanced.py b/demos/wiener_filter_advanced.py index 95c282ec6aa5f17271e91241dec494ef3bbb3489..70f6a3d0608175f7733cc3fb7f6888504df9e434 100644 --- a/demos/wiener_filter_advanced.py +++ b/demos/wiener_filter_advanced.py @@ -1,8 +1,8 @@ - from nifty import * import plotly.offline as pl import plotly.graph_objs as go +from nifty.library.wiener_filter import * from mpi4py import MPI comm = MPI.COMM_WORLD @@ -103,7 +103,7 @@ if __name__ == "__main__": # inverter = ConjugateGradient(convergence_level=3, - convergence_tolerance=10e-5, + convergence_tolerance=1e-5, preconditioner=None) # Setting starting position m0 = Field(h_space, val=.0)